Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2012-03-09 21:27:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2012-02-28 14:15:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2012-03-09 21:27:54.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 27 15:57:07 UTC 2012 - [email protected] + +- Make ldapsmb build with Fedora 15 and 16; (bso#8783). +- BuildRequire libuuid-devel for post-11.0 and other systems. +- Define missing python macros for non SUSE systems. +- PreReq to fillup_prereq and insserv_prereq only on SUSE systems. +- Always use cifstab instead of smbfstab on non SUSE systems. + +------------------------------------------------------------------- +Mon Feb 20 22:17:17 UTC 2012 - [email protected] + +- Ensure AndX offsets are increasing strictly monotonically in pre-3.4 + versions; CVE-2012-0870; (bnc#747934). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.DFM7B5/_old 2012-03-09 21:27:56.000000000 +0100 +++ /var/tmp/diff_new_pack.DFM7B5/_new 2012-03-09 21:27:56.000000000 +0100 @@ -26,6 +26,9 @@ BuildRequires: e2fsprogs-devel BuildRequires: fam-devel BuildRequires: libacl-devel +%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 +BuildRequires: libuuid-devel +%endif BuildRequires: pam-devel BuildRequires: popt-devel BuildRequires: readline-devel @@ -137,11 +140,17 @@ %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define link_static_libs 1 +%else +%define link_static_libs 0 +%endif +%if 0%{?suse_version} && 0%{?suse_version} < 1111 # pre-11.2 doesn't know the python_* macros %define python_sitelib %py_sitedir %define python_sitearch %py_sitedir -%else -%define link_static_libs 0 +%else (%if 0%{?centos_version} && 0%{?centos_version} < 600) || (0%{rhel_version} && 0%{rhel_version} < 600) +# CentOS and RHEL pre-6 don't know them either +%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())") +%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") %endif # Define some global directories ################################ @@ -264,7 +273,9 @@ %endif #ln -s m4/aclocal.m4 aclocal.m4 #autoreconf --force --install -I. -Im4 -I../lib/replace +%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 ./autogen.sh +%endif CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --localstatedir=%{LOCKDIR} \ @@ -437,7 +448,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.DFM7B5/_old 2012-03-09 21:27:56.000000000 +0100 +++ /var/tmp/diff_new_pack.DFM7B5/_new 2012-03-09 21:27:56.000000000 +0100 @@ -26,6 +26,9 @@ BuildRequires: e2fsprogs-devel BuildRequires: fam-devel BuildRequires: libacl-devel +%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100 +BuildRequires: libuuid-devel +%endif BuildRequires: pam-devel BuildRequires: popt-devel BuildRequires: readline-devel @@ -146,11 +149,17 @@ %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define link_static_libs 1 +%else +%define link_static_libs 0 +%endif +%if 0%{?suse_version} && 0%{?suse_version} < 1111 # pre-11.2 doesn't know the python_* macros %define python_sitelib %py_sitedir %define python_sitearch %py_sitedir -%else -%define link_static_libs 0 +%else (%if 0%{?centos_version} && 0%{?centos_version} < 600) || (0%{rhel_version} && 0%{rhel_version} < 600) +# CentOS and RHEL pre-6 don't know them either +%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())") +%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") %endif # Define some global directories ################################ @@ -208,7 +217,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package client @@ -223,8 +232,10 @@ %ifarch ppc64 Obsoletes: samba-client-64bit %endif +%if 0%{?suse_version} > 0 PreReq: %{?fillup_prereq} PreReq: %{?insserv_prereq} +%endif PreReq: /sbin/chkconfig PreReq: /sbin/ldconfig PreReq: coreutils @@ -252,7 +263,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -278,7 +289,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %endif @@ -308,7 +319,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %endif @@ -335,7 +346,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %if %{make_utils} @@ -356,7 +367,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %endif @@ -377,7 +388,9 @@ Recommends: logrotate Recommends: samba-krb-printing %endif +%if 0%{?suse_version} > 0 PreReq: %{?insserv_prereq} +%endif PreReq: /sbin/ldconfig PreReq: /usr/sbin/groupadd PreReq: coreutils @@ -391,7 +404,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -417,14 +430,14 @@ %description -n libsmbclient -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %endif @@ -472,7 +485,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libnetapi0 @@ -490,7 +503,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libnetapi-devel @@ -514,7 +527,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -535,14 +548,14 @@ %description -n libsmbsharemodes -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %endif @@ -578,7 +591,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libwbclient0 @@ -596,7 +609,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libwbclient-devel @@ -620,7 +633,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libtalloc2 @@ -640,7 +653,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libtalloc-devel @@ -666,7 +679,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libtdb1 @@ -686,7 +699,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libtdb-devel @@ -708,7 +721,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libtevent0 @@ -728,7 +741,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libtevent-devel @@ -756,7 +769,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libldb1 @@ -778,7 +791,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %package -n libldb-devel @@ -805,7 +818,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %if %{make_ldapsmb} @@ -828,7 +841,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2761 +Source Timestamp: 2769 Branch : trunk %endif @@ -931,7 +944,9 @@ %endif #ln -s m4/aclocal.m4 aclocal.m4 #autoreconf --force --install -I. -Im4 -I../lib/replace +%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 ./autogen.sh +%endif CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --localstatedir=%{LOCKDIR} \ @@ -1128,7 +1143,7 @@ for file in smb.conf lmhosts smbusers smbpasswd cifstab smbusers; do install -m 0644 "config/${file}" %{buildroot}/%{CONFIGDIR}/${file} done -%if 0%{?suse_version} < 1121 +%if 0%{?suse_version} && 0%{?suse_version} < 1121 mv %{buildroot}/%{CONFIGDIR}/cifstab %{buildroot}/%{CONFIGDIR}/smbfstab %endif section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf) ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.DFM7B5/_old 2012-03-09 21:27:56.000000000 +0100 +++ /var/tmp/diff_new_pack.DFM7B5/_new 2012-03-09 21:27:56.000000000 +0100 @@ -1,2 +1,2 @@ -2761 +2769 Branch : trunk ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2012-02-17 13:26:12.000000000 +0100 +++ new/patches/series 2012-02-27 19:10:22.000000000 +0100 @@ -32,6 +32,7 @@ suse/fix-pam_sm_authenticate-segv.diff -p0 # bso 8564 suse/fix-build-for-example-perfcount-daemon.diff -p0 # bnc 739258 suse/fix-incorrect-array-length-calculations.diff -p0 # bnc 739258 +suse/ldapsmb-VERSION.diff -p0 # bso 8783 # 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/ldapsmb-VERSION.diff new/patches/suse/ldapsmb-VERSION.diff --- old/patches/suse/ldapsmb-VERSION.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/suse/ldapsmb-VERSION.diff 2012-02-27 19:22:59.000000000 +0100 @@ -0,0 +1,17 @@ +Author: Lars Mueller <lmuelle at suse dot de> +Subject: ldapsmb builds fail on Fedora 15 and 16 +Bugzilla: https://bugzilla.samba.org/show_bug.cgi?id=8783 + +Index: ldapsmb-1.34b/configure.in +=================================================================== +--- ldapsmb-1.34b/configure.in.orig ++++ ldapsmb-1.34b/configure.in +@@ -148,7 +148,7 @@ AC_ARG_WITH(nscdinitscript, + + + # source version +-. VERSION ++. ./VERSION + + AC_SUBST(VERSION) + AC_SUBST(LOGFILEBASE) ++++++ 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 2012-02-17 13:51:47.000000000 +0100 +++ new/vendor-files/tools/package-data 2012-02-27 23:41:56.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2761" +SAMBA_PACKAGE_SVN_VERSION="2769" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
