diff --git a/build-source-timestamp b/build-source-timestamp index 1775df1..efeff92 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2472 +2486 Branch : 3.5.6 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 7503384..3753786 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23c8364e8f94519e06837ce8b7e017f624b71c9f35d324ddc239347e3140c7c8 -size 75451 +oid sha256:ccd3b804a741dc133df0938583b683f77376c70d3276a93c2f4f02cd6df8490d +size 78174 diff --git a/samba-doc.spec b/samba-doc.spec index 1ad18c6..0b01820 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -1,7 +1,7 @@ # -# spec file for package samba-doc (Version 3.5.6) +# spec file for package samba-doc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,7 +66,7 @@ BuildRequires: pkgconfig %endif Url: http://www.samba.org/ Version: 3.5.6 -Release: 2 +Release: 3 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -396,7 +396,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index 5e25ee7..c00c205 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Fri Jan 14 15:22:51 CET 2011 - lmuelle@suse.de + +- No longer force activation of the cifs service on post-11.3 systems. +- Add X-UnitedLinux-Default-Enabled to the cifs init script on pre-11.4 + systems. +- Move the cifs init script nfs dependencies from Required to Should. + +------------------------------------------------------------------- +Tue Jan 4 16:26:37 UTC 2011 - lmuelle@suse.de + +- Recommend to install samba-krb-printing from samba-winbind on post-10.3 + systems; (bnc#661845). + +------------------------------------------------------------------- +Thu Dec 30 12:52:39 CET 2010 - ddiss@suse.de + +- Fix error paths in cups_async_callback(), an empty cups printer list should + not be treated as an error; (bnc#661842). + +------------------------------------------------------------------- +Tue Dec 21 16:31:15 CET 2010 - ddiss@suse.de + +- Abide by printcap cache time, reload parent smbd pcap cache on expiry; + (bso#7836); (bnc#625936). + +------------------------------------------------------------------- +Fri Dec 17 20:01:38 CET 2010 - ddiss@suse.de + +- Fix race in cups async printer services reload; (bso#7836); (bnc#625936). + +------------------------------------------------------------------- +Mon Dec 13 00:54:03 CET 2010 - ro@suse.de + +- Don't tweak with baselibs.conf during %post if not present; (bnc#652620). + +------------------------------------------------------------------- +Thu Dec 9 13:31:15 UTC 2010 - lmuelle@suse.de + +- Don't make use of baselibs.conf on SUSE Linux Enterprise 10; (bnc#652620). + +------------------------------------------------------------------- +Tue Dec 7 16:48:25 UTC 2010 - lmuelle@suse.de + +- Don't use --tmpdir as this option isn't known by mktemp of SUSE Linux + Enterprise 10; (bnc#652620). + ------------------------------------------------------------------- Sun Dec 5 22:28:35 UTC 2010 - lars@samba.org diff --git a/samba.spec b/samba.spec index a2de26b..6d3e828 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # -# spec file for package samba (Version 3.5.6) +# spec file for package samba # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -71,7 +71,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.6 -Release: 2 +Release: 3 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -173,7 +173,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package client @@ -219,7 +219,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -246,7 +246,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %endif @@ -276,7 +276,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %endif @@ -303,14 +303,13 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if %{make_utils} %package utils - Summary: debug tools Group: Productivity/Networking/Samba AutoReqProv: on @@ -341,7 +340,7 @@ Obsoletes: samba-winbind-64bit %endif Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 -Recommends: cron logrotate +Recommends: cron logrotate samba-krb-printing %endif PreReq: coreutils /sbin/ldconfig %{?insserv_prereq} /usr/sbin/groupadd @@ -354,7 +353,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -379,7 +378,8 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2472 + +Source Timestamp: 2486 Branch : 3.5.6 %else @@ -424,7 +424,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libnetapi0 @@ -443,7 +443,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libnetapi-devel @@ -463,7 +463,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -483,7 +483,8 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2472 + +Source Timestamp: 2486 Branch : 3.5.6 %else @@ -519,7 +520,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtalloc2 @@ -538,7 +539,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtalloc-devel @@ -558,7 +559,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtdb1 @@ -577,7 +578,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtdb-devel @@ -597,7 +598,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libwbclient0 @@ -616,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libwbclient-devel @@ -636,7 +637,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtevent0 @@ -655,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtevent-devel @@ -676,7 +677,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libldb0 @@ -696,7 +697,7 @@ Authors: The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libldb-devel @@ -716,7 +717,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if %{make_ldapsmb} @@ -727,7 +728,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 294 +Release: 295 Requires: perl-ldap %description -n ldapsmb @@ -740,7 +741,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %endif @@ -763,7 +764,7 @@ Authors: -------- Steve French -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %endif @@ -1103,6 +1104,8 @@ if test 0%{?suse_version} -lt 901; then scriptSuffix="-900" elif test 0%{?suse_version} -lt 1011; then scriptSuffix="-1010" +elif test 0%{?suse_version} -lt 1131; then + scriptSuffix="-1130" fi %endif startScripts="smb nmb winbind %{cifs_init_script}" @@ -1344,7 +1347,9 @@ fi /sbin/ldconfig if [ ${1:-0} -eq 1 ]; then # Only insserv cifs if we're not in update mode. -%{?fillup_and_insserv:%{fillup_and_insserv -fy %cifs_init_script}} +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 +%{?insserv_force_if_yast:%{insserv_force_if_yast cifs}} +%endif ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script} @@ -1521,9 +1526,9 @@ exit 0 %clean [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" -%if 0%{?suse_version} < 1110 +if [ -e ${RPM_SOURCE_DIR}/baselibs.conf -a 0%{?suse_version} -gt 0 -a 0%{?suse_version} -lt 1110 ]; then sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf -%endif +fi %files -f filelist-samba %defattr(-,root,root) @@ -1959,5 +1964,4 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf /lib/mkinitrd/scripts/boot-cifs.sh %endif %endif - %changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index db27fb6..d94a9fc 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:945a9558f39d87baf548862a8f31f4c4ee45c65e2db84e075f7c0cd58df3f302 -size 24559 +oid sha256:2ea0d65ce7da8dafa5ef6b4689e471e6badd2369a0f335dc9804ea05ecb53db0 +size 24832