Hello community,
here is the log from the commit of package samba for openSUSE:Factory
checked in at Mon Feb 7 12:17:08 CET 2011.
--------
--- samba/samba.changes 2011-01-14 19:26:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/samba/samba.changes 2011-02-05 14:43:07.000000000 +0100
@@ -1,0 +2,7 @@
+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).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.zO1Ndz/_old 2011-02-07 12:16:56.000000000 +0100
+++ /var/tmp/diff_new_pack.zO1Ndz/_new 2011-02-07 12:16:56.000000000 +0100
@@ -66,7 +66,7 @@
%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 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%changelog
++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.zO1Ndz/_old 2011-02-07 12:16:56.000000000 +0100
+++ /var/tmp/diff_new_pack.zO1Ndz/_new 2011-02-07 12:16:56.000000000 +0100
@@ -71,7 +71,7 @@
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 @@
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package client
@@ -219,7 +219,7 @@
--------
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 @@
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%endif
@@ -276,7 +276,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%endif
@@ -303,7 +303,7 @@
--------
Jeremy Allison <jra at samba dot org>
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%if %{make_utils}
@@ -354,7 +354,7 @@
--------
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 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%else
@@ -424,7 +424,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libnetapi0
@@ -443,7 +443,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libnetapi-devel
@@ -463,7 +463,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -483,7 +483,7 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%else
@@ -519,7 +519,7 @@
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libtalloc2
@@ -538,7 +538,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libtalloc-devel
@@ -558,7 +558,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libtdb1
@@ -577,7 +577,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libtdb-devel
@@ -597,7 +597,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libwbclient0
@@ -616,7 +616,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libwbclient-devel
@@ -636,7 +636,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libtevent0
@@ -655,7 +655,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libtevent-devel
@@ -676,7 +676,7 @@
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libldb0
@@ -696,7 +696,7 @@
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%package -n libldb-devel
@@ -716,7 +716,7 @@
--------
The Samba Team
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%if %{make_ldapsmb}
@@ -727,7 +727,7 @@
Group: Productivity/Networking/Samba
AutoReqProv: on
Version: 1.34b
-Release: 295
+Release: 296
Requires: perl-ldap
%description -n ldapsmb
@@ -740,7 +740,7 @@
--------
Guenther Deschner <guenther at deschner dot de>
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%endif
@@ -763,7 +763,7 @@
--------
Steve French <sfrench at Samba dot org>
-Source Timestamp: 2486
+Source Timestamp: 2490
Branch : 3.5.6
%endif
++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.zO1Ndz/_old 2011-02-07 12:16:56.000000000 +0100
+++ /var/tmp/diff_new_pack.zO1Ndz/_new 2011-02-07 12:16:56.000000000 +0100
@@ -1,2 +1,2 @@
-2486
+2490
Branch : 3.5.6
++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series 2011-01-11 22:50:34.000000000 +0100
+++ new/patches/series 2011-01-25 10:06:08.000000000 +0100
@@ -31,6 +31,7 @@
suse/async_printcap_svc_update.diff -p0 # bso 7836, bnc 625936
suse/printcap_cache_time_abide.diff -p0 # bso 7836, bnc 625936
suse/no_cups_printers_error.diff -p0 # bnc 661842
+suse/remove_pcap_cache_loaded_asserts.diff -p0 # bso 7836, bnc 625936
# this one should always live at the end and should be redone
# diabled cf. 280452
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/remove_pcap_cache_loaded_asserts.diff new/patches/suse/remove_pcap_cache_loaded_asserts.diff
--- old/patches/suse/remove_pcap_cache_loaded_asserts.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches/suse/remove_pcap_cache_loaded_asserts.diff 2011-01-25 10:06:08.000000000 +0100
@@ -0,0 +1,26 @@
+Index: source3/printing/load.c
+===================================================================
+--- source3/printing/load.c.orig
++++ source3/printing/load.c
+@@ -57,8 +57,6 @@ load automatic printer services from pre
+ ***************************************************************************/
+ void load_printers(void)
+ {
+- SMB_ASSERT(pcap_cache_loaded());
+-
+ add_auto_printers();
+
+ /* load all printcap printers */
+Index: source3/smbd/server.c
+===================================================================
+--- source3/smbd/server.c.orig
++++ source3/smbd/server.c
+@@ -760,8 +760,6 @@ void reload_printers(void)
+ int pnum = lp_servicenumber(PRINTERS_NAME);
+ const char *pname;
+
+- SMB_ASSERT(pcap_cache_loaded());
+-
+ DEBUG(10, ("reloading printer services from pcap cache\n"));
+ for (snum = 0; snum < n_services; snum++) {
+ /* avoid removing PRINTERS_NAME or non-autoloaded printers */
++++++ vendor-files.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2011-01-14 21:05:13.000000000 +0100
+++ new/vendor-files/tools/package-data 2011-02-05 14:42:14.000000000 +0100
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2486"
+SAMBA_PACKAGE_SVN_VERSION="2490"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org