From 854dd23c47e3fa0c03e81d1591c8d7461eb2a5f7ed3ef18c4a22a685b4d9a45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 14 Jan 2011 18:26:07 +0000 Subject: [PATCH] - 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. - Fix error paths in cups_async_callback(), an empty cups printer list should not be treated as an error; (bnc#661842). - Abide by printcap cache time, reload parent smbd pcap cache on expiry; (bso#7836); (bnc#625936). - Fix race in cups async printer services reload; (bso#7836); (bnc#625936). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=150 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 4 +-- samba.changes | 25 +++++++++++++++++++ samba.spec | 56 ++++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 +-- 6 files changed, 62 insertions(+), 33 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index ba1d7d3..3dd1391 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2481 +2485 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 0240d97..95462c1 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -1,5 +1,5 @@ # -# spec file for package samba-doc (Version 3.5.6) +# spec file for package samba-doc # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -396,7 +396,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index fe5e09e..c00c205 100644 --- a/samba.changes +++ b/samba.changes @@ -1,9 +1,34 @@ +------------------------------------------------------------------- +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 diff --git a/samba.spec b/samba.spec index afd5996..e7c2d53 100644 --- a/samba.spec +++ b/samba.spec @@ -1,5 +1,5 @@ # -# spec file for package samba (Version 3.5.6) +# spec file for package samba # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -173,7 +173,7 @@ Authors: The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package client @@ -219,7 +219,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -246,7 +246,7 @@ Authors: The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %endif @@ -276,7 +276,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %endif @@ -303,7 +303,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %if %{make_utils} @@ -353,7 +353,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -379,7 +379,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %else @@ -424,7 +424,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libnetapi0 @@ -443,7 +443,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libnetapi-devel @@ -463,7 +463,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -484,7 +484,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %else @@ -520,7 +520,7 @@ Authors: The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libtalloc2 @@ -539,7 +539,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libtalloc-devel @@ -559,7 +559,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libtdb1 @@ -578,7 +578,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libtdb-devel @@ -598,7 +598,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libwbclient0 @@ -617,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libwbclient-devel @@ -637,7 +637,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libtevent0 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libtevent-devel @@ -677,7 +677,7 @@ Authors: The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libldb0 @@ -697,7 +697,7 @@ Authors: The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %package -n libldb-devel @@ -717,7 +717,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %if %{make_ldapsmb} @@ -741,7 +741,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %endif @@ -764,7 +764,7 @@ Authors: -------- Steve French -Source Timestamp: 2481 +Source Timestamp: 2485 Branch : 3.5.6 %endif @@ -1104,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}" @@ -1345,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} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 89490c8..3c8ebca 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:0c1eec617aa987736b28b54fcbad59afa36b38c00bed189ef31940ebc02df013 -size 24539 +oid sha256:7b4ccf1d67fd459f8ed0405052189b85fa4d171ae315e9f5a6f5821d0cbb4cd3 +size 24783