diff --git a/build-source-timestamp b/build-source-timestamp index 24fa1b2..8d8764d 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2761 +2767 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 5eb2eff..1deb6cd 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9a2d18906c63cbf3b422aabfec73c100e6d307cb5e2079db2649dabfcfddae2 -size 38468 +oid sha256:0d738398eadd16bd1829c44b1f35aa9bd4015dc79d019dd959dac6f4f327087e +size 38667 diff --git a/samba-doc.spec b/samba-doc.spec index c619705..bfc0a35 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -26,6 +26,9 @@ BuildRequires: cups-devel BuildRequires: e2fsprogs-devel BuildRequires: fam-devel BuildRequires: libacl-devel +%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 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 @@ BuildRequires: ccache %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 @@ pushd source3 %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%{?rhel_version} > 599 || 0%{?suse_version} > 0 ./autogen.sh +%endif CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --localstatedir=%{LOCKDIR} \ @@ -437,7 +448,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 38853fa..a0dd6d9 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Feb 27 15:57:07 UTC 2012 - lmuelle@suse.de + +- 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 of fillup_prereq and insserv_prereq on SUSE systems. +- Always use cifstab instead of smbfstab on non SUSE systems. + +------------------------------------------------------------------- +Mon Feb 20 22:17:17 UTC 2012 - lmuelle@suse.de + +- Ensure AndX offsets are increasing strictly monotonically in pre-3.4 + versions; CVE-2012-0870; (bnc#747934). + ------------------------------------------------------------------- Fri Feb 17 13:34:23 CET 2012 - ddiss@suse.de diff --git a/samba.spec b/samba.spec index 28faba1..d20af50 100644 --- a/samba.spec +++ b/samba.spec @@ -26,6 +26,9 @@ BuildRequires: cups-devel BuildRequires: e2fsprogs-devel BuildRequires: fam-devel BuildRequires: libacl-devel +%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 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 @@ BuildRequires: ccache %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 @@ Authors: The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package client @@ -223,8 +232,10 @@ Obsoletes: samba-client-gplv2 < %{version} %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 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -278,7 +289,7 @@ Authors: The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %endif @@ -308,7 +319,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %endif @@ -335,7 +346,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %if %{make_utils} @@ -356,7 +367,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %endif @@ -377,7 +388,9 @@ Recommends: cron 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 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -417,14 +430,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %endif @@ -472,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libnetapi0 @@ -490,7 +503,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libnetapi-devel @@ -514,7 +527,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -535,14 +548,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %endif @@ -578,7 +591,7 @@ Authors: The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libwbclient0 @@ -596,7 +609,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libwbclient-devel @@ -620,7 +633,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libtalloc2 @@ -640,7 +653,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libtalloc-devel @@ -666,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libtdb1 @@ -686,7 +699,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libtdb-devel @@ -708,7 +721,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libtevent0 @@ -728,7 +741,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libtevent-devel @@ -756,7 +769,7 @@ Authors: The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libldb1 @@ -778,7 +791,7 @@ Authors: The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %package -n libldb-devel @@ -805,7 +818,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %if %{make_ldapsmb} @@ -828,7 +841,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2761 +Source Timestamp: 2767 Branch : trunk %endif @@ -931,7 +944,9 @@ pushd source3 %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%{?rhel_version} > 599 || 0%{?suse_version} > 0 ./autogen.sh +%endif CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --localstatedir=%{LOCKDIR} \ @@ -1128,7 +1143,7 @@ install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} 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) diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index d92da2c..7f1cac2 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:41c3406aa40c98db627b86be9ea402824d5f758889ca0ded33bd3270d1653575 -size 52611 +oid sha256:837618605c708d37d6bb53e7986734c01ff62a10122df40ca0f6fea91fa6a396 +size 52759