From 53b24b11638ebd319eac181074cf96db75bf6eff8e5e3b183a5b2324be327cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 5 Feb 2011 13:43:08 +0000 Subject: [PATCH] - Remove pcap_cache_loaded asserts from (re)load_printers. pcap_cache_loaded() returns false if the pcap cache contains no printer entries. correct call ordering is already enforced. (bso#7836); (bnc#625936). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=152 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 4 ++-- samba.changes | 7 ++++++ samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 40 insertions(+), 33 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index efeff92..1704317 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2486 +2490 Branch : 3.5.6 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 3753786..cf60340 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccd3b804a741dc133df0938583b683f77376c70d3276a93c2f4f02cd6df8490d -size 78174 +oid sha256:97f9ebd640539c7536df5e412c258468ae4c059dea75f36fc644da92ea948c98 +size 78158 diff --git a/samba-doc.spec b/samba-doc.spec index 0b01820..7276bf3 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -66,7 +66,7 @@ BuildRequires: pkgconfig %endif Url: http://www.samba.org/ Version: 3.5.6 -Release: 3 +Release: 4 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -396,7 +396,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index c00c205..cb5fe4c 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 18 11:04:02 CET 2011 - ddiss@suse.de + +- Remove pcap_cache_loaded asserts from (re)load_printers. pcap_cache_loaded() + returns false if the pcap cache contains no printer entries. correct call + ordering is already enforced. (bso#7836); (bnc#625936). + ------------------------------------------------------------------- Fri Jan 14 15:22:51 CET 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 6d3e828..f96eade 100644 --- a/samba.spec +++ b/samba.spec @@ -71,7 +71,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.6 -Release: 3 +Release: 4 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -173,7 +173,7 @@ Authors: The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package client @@ -219,7 +219,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -246,7 +246,7 @@ Authors: The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %endif @@ -276,7 +276,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %endif @@ -303,7 +303,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %if %{make_utils} @@ -353,7 +353,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -379,7 +379,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %else @@ -424,7 +424,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libnetapi0 @@ -443,7 +443,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libnetapi-devel @@ -463,7 +463,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -484,7 +484,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %else @@ -520,7 +520,7 @@ Authors: The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libtalloc2 @@ -539,7 +539,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libtalloc-devel @@ -559,7 +559,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libtdb1 @@ -578,7 +578,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libtdb-devel @@ -598,7 +598,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libwbclient0 @@ -617,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libwbclient-devel @@ -637,7 +637,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libtevent0 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libtevent-devel @@ -677,7 +677,7 @@ Authors: The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libldb0 @@ -697,7 +697,7 @@ Authors: The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %package -n libldb-devel @@ -717,7 +717,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %if %{make_ldapsmb} @@ -728,7 +728,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 295 +Release: 296 Requires: perl-ldap %description -n ldapsmb @@ -741,7 +741,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %endif @@ -764,7 +764,7 @@ Authors: -------- Steve French -Source Timestamp: 2486 +Source Timestamp: 2490 Branch : 3.5.6 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index d94a9fc..4320b7e 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:2ea0d65ce7da8dafa5ef6b4689e471e6badd2369a0f335dc9804ea05ecb53db0 -size 24832 +oid sha256:d6b52dc170ce6a46575f1f236f1442c9e7a5990d1a5746d08420809ff37b84e1 +size 24812