commit samba for openSUSE:Factory

21 Mar 2011

Hello community,

here is the log from the commit of package samba for openSUSE:Factory
checked in at Mon Mar 21 09:28:55 CET 2011.



--------

--- samba/samba.changes	2011-03-07 14:06:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/samba/samba.changes	2011-03-18 17:25:03.000000000 +0100
@@ -1,0 +2,20 @@
+Fri Mar 18 15:53:07 UTC 2011 - lmuelle@suse.de
+
+- Replace jobs by _smp_mflags macro while calling make on post-11.4 systems.
+
+-------------------------------------------------------------------
+Thu Mar 17 10:24:31 CET 2011 - ddiss@suse.de
+
+- Don't crash when publishing a single printer; (bnc#643119).
+
+-------------------------------------------------------------------
+Wed Mar  9 10:46:20 UTC 2011 - lmuelle@suse.de
+
+- Define the libwbclient packages ahead of packages with a different version.
+
+-------------------------------------------------------------------
+Wed Mar  9 00:48:12 UTC 2011 - jengelh@medozas.de
+
+- Use %_smp_mflags for parallel building.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.g7kX82/_old	2011-03-21 09:27:29.000000000 +0100
+++ /var/tmp/diff_new_pack.g7kX82/_new	2011-03-21 09:27:29.000000000 +0100
@@ -75,9 +75,14 @@
 %define	libtdb_ver %{version}
 %define	libtevent_ver %{version}
 %endif
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
+%define	build_make_smp_mflags %{?_smp_mflags}
+%else
+%define	build_make_smp_mflags %{?jobs:-j%jobs}
+%endif
 Url:            http://www.samba.org/
 Version:        3.5.8
-Release:        1
+Release:        2
 License:        GPLv3+
 Summary:        Samba Documentation
 Group:          Documentation/Other
@@ -420,7 +425,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %changelog

++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.g7kX82/_old	2011-03-21 09:27:29.000000000 +0100
+++ /var/tmp/diff_new_pack.g7kX82/_new	2011-03-21 09:27:29.000000000 +0100
@@ -75,6 +75,11 @@
 %define	libtdb_ver %{version}
 %define	libtevent_ver %{version}
 %endif
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
+%define	build_make_smp_mflags %{?_smp_mflags}
+%else
+%define	build_make_smp_mflags %{?jobs:-j%jobs}
+%endif
 %define	vscan_ver 0.3.6b
 %define	ldapsmb_ver 1.34b
 License:        GPLv3+
@@ -82,7 +87,7 @@
 Url:            http://www.samba.org/
 AutoReqProv:    on
 Version:        3.5.8
-Release:        1
+Release:        2
 Provides:       samba-gplv3 = %{version}-%{release}
 Obsoletes:      samba-gplv3 < %{version}
 %ifarch ppc64
@@ -184,7 +189,7 @@
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %package client
@@ -230,7 +235,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -257,7 +262,7 @@
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %endif
@@ -287,7 +292,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %endif
@@ -314,7 +319,7 @@
 --------
     Jeremy Allison <jra at samba dot org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %if %{make_utils}
@@ -365,7 +370,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -390,7 +395,7 @@
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
 %description -n libsmbclient
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %else
@@ -435,7 +440,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %package -n libnetapi0
@@ -454,7 +459,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %package -n libnetapi-devel
@@ -474,7 +479,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -494,7 +499,7 @@
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
 
 %description -n libsmbsharemodes
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %else
@@ -530,20 +535,18 @@
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
-%package -n libtalloc2
-License:        LGPLv3+
-Summary:        Samba talloc Library
+%package -n libwbclient0
+License:        GPLv3+
+Summary:        Samba libwbclient Library
 Group:          System/Libraries
 AutoReqProv:    on
-Version:        %{libtalloc_ver}
-Release:        5
 PreReq:         /sbin/ldconfig
 
-%description -n libtalloc2
-This package includes the talloc library.
+%description -n libwbclient0
+This package includes the wbclient library.
 
 
 
@@ -551,21 +554,19 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
-%package -n libtalloc-devel
-License:        LGPLv3+
-Summary:        Libraries and Header Files to Develop Programs with talloc Support
+%package -n libwbclient-devel
+License:        GPLv3+
+Summary:        Libraries and Header Files to Develop Programs with wbclient Support
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
-Version:        %{libtalloc_ver}
-Release:        5
-Requires:       libtalloc2  = %{version}
+Requires:       libwbclient0  = %{version}
 
-%description -n libtalloc-devel
+%description -n libwbclient-devel
 This package contains the static libraries and header files needed to
-develop programs which make use of the talloc programming interface.
+develop programs which make use of the wbclient programming interface.
 
 
 
@@ -573,20 +574,20 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
-%package -n libtdb1
+%package -n libtalloc2
 License:        LGPLv3+
-Summary:        Samba tdb Library
+Summary:        Samba talloc Library
 Group:          System/Libraries
 AutoReqProv:    on
-Version:        %{libtdb_ver}
-Release:        5
+Version:        %{libtalloc_ver}
+Release:        6
 PreReq:         /sbin/ldconfig
 
-%description -n libtdb1
-This package includes the tdb library.
+%description -n libtalloc2
+This package includes the talloc library.
 
 
 
@@ -594,21 +595,21 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
-%package -n libtdb-devel
+%package -n libtalloc-devel
 License:        LGPLv3+
-Summary:        Libraries and Header Files to Develop Programs with tdb Support
+Summary:        Libraries and Header Files to Develop Programs with talloc Support
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
-Version:        %{libtdb_ver}
-Release:        5
-Requires:       libtdb1  = %{version}
+Version:        %{libtalloc_ver}
+Release:        6
+Requires:       libtalloc2  = %{libtalloc_ver}
 
-%description -n libtdb-devel
+%description -n libtalloc-devel
 This package contains the static libraries and header files needed to
-develop programs which make use of the tdb programming interface.
+develop programs which make use of the talloc programming interface.
 
 
 
@@ -616,18 +617,20 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
-%package -n libwbclient0
-License:        GPLv3+
-Summary:        Samba libwbclient Library
+%package -n libtdb1
+License:        LGPLv3+
+Summary:        Samba tdb Library
 Group:          System/Libraries
 AutoReqProv:    on
+Version:        %{libtdb_ver}
+Release:        6
 PreReq:         /sbin/ldconfig
 
-%description -n libwbclient0
-This package includes the wbclient library.
+%description -n libtdb1
+This package includes the tdb library.
 
 
 
@@ -635,19 +638,21 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
-%package -n libwbclient-devel
-License:        GPLv3+
-Summary:        Libraries and Header Files to Develop Programs with wbclient Support
+%package -n libtdb-devel
+License:        LGPLv3+
+Summary:        Libraries and Header Files to Develop Programs with tdb Support
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
-Requires:       libwbclient0  = %{version}
+Version:        %{libtdb_ver}
+Release:        6
+Requires:       libtdb1  = %{libtdb_ver}
 
-%description -n libwbclient-devel
+%description -n libtdb-devel
 This package contains the static libraries and header files needed to
-develop programs which make use of the wbclient programming interface.
+develop programs which make use of the tdb programming interface.
 
 
 
@@ -655,7 +660,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %package -n libtevent0
@@ -664,7 +669,7 @@
 Group:          System/Libraries
 AutoReqProv:    on
 Version:        %{libtevent_ver}
-Release:        5
+Release:        6
 PreReq:         /sbin/ldconfig
 
 %description -n libtevent0
@@ -676,7 +681,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %package -n libtevent-devel
@@ -685,7 +690,7 @@
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
 Version:        %{libtevent_ver}
-Release:        5
+Release:        6
 Requires:       libtevent0  = %{libtevent_ver}
 
 %description -n libtevent-devel
@@ -699,7 +704,7 @@
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %package -n libldb0
@@ -708,7 +713,7 @@
 Group:          System/Libraries
 AutoReqProv:    on
 Version:        %{libldb_ver}
-Release:        5
+Release:        6
 PreReq:         /sbin/ldconfig
 
 %description -n libldb0
@@ -721,7 +726,7 @@
     The Samba Team <samba@samba.org>
 
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %package -n libldb-devel
@@ -730,7 +735,7 @@
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
 Version:        %{libldb_ver}
-Release:        5
+Release:        6
 Requires:       libldb0  = %{libldb_ver}
 
 %description -n libldb-devel
@@ -743,7 +748,7 @@
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %if %{make_ldapsmb}
@@ -754,7 +759,7 @@
 Group:          Productivity/Networking/Samba
 AutoReqProv:    on
 Version:        1.34b
-Release:        301
+Release:        302
 Requires:       perl-ldap
 
 %description -n ldapsmb
@@ -767,7 +772,7 @@
 --------
     Guenther Deschner <guenther at deschner dot de>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %endif
@@ -790,7 +795,7 @@
 --------
     Steve French <sfrench at Samba dot org>
 
-Source Timestamp: 2509
+Source Timestamp: 2516
 Branch      : 3.5.8
 
 %endif
@@ -993,22 +998,22 @@
 %else
 %{__make} proto
 %endif
-%{__make} %{?jobs:-j%jobs} \
+%{__make} %{build_make_smp_mflags} \
 	everything
-#%{__make} %{?jobs:-j%jobs} -C tdb tdbtest tdbtorture
+#%{__make} %{build_make_smp_mflags} -C tdb tdbtest tdbtorture
 %if %{make_vscan}
 pushd ../examples/VFS/samba-vscan-%{vscan_ver}/
 %{?suse_update_config:%{suse_update_config -f}}
 autoreconf --force --install
 ./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} --with-samba-source=../../../source3/
-%{__make} %{?jobs:-j%jobs}
+%{__make} %{build_make_smp_mflags}
 popd
 %endif
 %if %{make_ldapsmb}
 pushd ../ldapsmb-%{ldapsmb_ver}
 ./autogen.sh
 rm ldapsmb
-%{__make} %{?jobs:-j%jobs} all doc
+%{__make} %{build_make_smp_mflags} all doc
 popd
 %endif
 popd

++++++ build-source-timestamp ++++++
--- /var/tmp/diff_new_pack.g7kX82/_old	2011-03-21 09:27:29.000000000 +0100
+++ /var/tmp/diff_new_pack.g7kX82/_new	2011-03-21 09:27:29.000000000 +0100
@@ -1,2 +1,2 @@
-2509
+2516
 Branch      : 3.5.8

++++++ patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a new/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a
--- old/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a	1970-01-01 01:00:00.000000000 +0100
+++ new/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a	2011-03-18 16:39:42.000000000 +0100
@@ -0,0 +1,24 @@
+commit 21576e3f8c32878910460bf9575c200ad93d682a
+Author: Günther Deschner <gd@samba.org>
+Date:   Fri Oct 1 06:08:12 2010 +0200
+
+    s3-net: make sure we dont crash when publishing a single printer.
+    
+    Guenther
+
+Index: source3/utils/net_rpc_printer.c
+===================================================================
+--- source3/utils/net_rpc_printer.c.orig
++++ source3/utils/net_rpc_printer.c
+@@ -1091,6 +1091,11 @@ static bool get_printer_info(struct rpc_
+ 					 &hnd))
+ 		return false;
+ 
++	*info_p = talloc_zero(mem_ctx, union spoolss_PrinterInfo);
++	if (*info_p == NULL) {
++		return false;
++	}
++
+ 	if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd, level, *info_p)) {
+ 		rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd, NULL);
+ 		return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series
--- old/patches/series	2011-03-07 13:35:05.000000000 +0100
+++ new/patches/series	2011-03-18 16:39:42.000000000 +0100
@@ -10,6 +10,7 @@
 samba.org/c67b4ed3a406011d0fc7e1e2cbdc27ec4822e57c -p0 # bso 6364, bnc 630812
 samba.org/0ec0095d1a40435042b8ff9e4bc7fedbeb371e5f -p0 # bnc 632055
 samba.org/9c12232f1ae36e00d04114ad73edd8ba3c2c6a5c -p0 # bnc 666460
+samba.org/21576e3f8c32878910460bf9575c200ad93d682a -p0 # bnc 643119
 
 # SuSE specific changes
 # disabled -> WIP lmuelle

++++++ 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-03-07 14:04:24.000000000 +0100
+++ new/vendor-files/tools/package-data	2011-03-18 17:23:45.000000000 +0100
@@ -1,2 +1,2 @@
 # This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="2509"
+SAMBA_PACKAGE_SVN_VERSION="2516"


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)