diff --git a/build-source-timestamp b/build-source-timestamp index 26c9a9c..1fc60a6 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2420 -Branch : 3.5.4 +2450 +Branch : 3.5.6 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 351d7d3..667de14 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad57a27dac1304d0b8b6d7236e8a988c6af41da329f959655272ea606954a739 -size 73352 +oid sha256:726315650a68c31e6fb4863210a6156099b0ceda2d1abd711295bb59b052e45c +size 72819 diff --git a/samba-3.5.4.tar.bz2 b/samba-3.5.4.tar.bz2 deleted file mode 100644 index bc390b1..0000000 --- a/samba-3.5.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3009b546ac845937734005f08b26f7d1b709ea619df78288b1ba73d6a1cb93e3 -size 26767856 diff --git a/samba-3.5.6.tar.bz2 b/samba-3.5.6.tar.bz2 new file mode 100644 index 0000000..3c5769d --- /dev/null +++ b/samba-3.5.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf7d9977e1ba30816a7e5e1d4144312c63ec5f105c64f66e41f6366cf07435fd +size 26780169 diff --git a/samba-doc.spec b/samba-doc.spec index 61e9b37..dbc1388 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -1,5 +1,5 @@ # -# spec file for package samba-doc (Version 3.5.4) +# spec file for package samba-doc (Version 3.5.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -58,19 +58,21 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -%define samba_ver 3.5.4 +%define samba_ver 3.5.6 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif Url: http://www.samba.org/ -Version: 3.5.4 -Release: 7 +Version: 3.5.6 +Release: 1 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on +Provides: samba-gplv3-doc = %{version}-%{release} +Obsoletes: samba-gplv3-doc < %{version} PreReq: coreutils findutils BuildArch: noarch Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 @@ -193,6 +195,9 @@ if test "%{VENDOR}" != "UL"; then 1010|1110) product_suffix="-CODE${major_version}" ;; esac fi +# Add the build architecture +test "%{_build_arch}" != "" && \ + product_suffix="${product_suffix}-%{_build_arch}" # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file mv VERSION VERSION.orig sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/ VERSION.orig >VERSION @@ -389,7 +394,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index 92929dd..fcd8ffe 100644 --- a/samba.changes +++ b/samba.changes @@ -1,7 +1,69 @@ +------------------------------------------------------------------- +Thu Nov 11 12:36:36 UTC 2010 - lmuelle@suse.de + +- Add the _build_arch at the end of the vendor version suffix. + +------------------------------------------------------------------- +Thu Oct 28 15:06:20 UTC 2010 - lmuelle@suse.de + +- Provide and Obsolete samba-gplv3 to replace potentially installed packages. + +------------------------------------------------------------------- +Sat Oct 10 13:24:17 CEST 2010 - jmcdonough@suse.de + +- Update to 3.5.6 + + Fix auto printers with registry config; (bso#7280); (bnc#617153). + + Fix SPNEGO auth when contacting Win7 system using Microsoft Live + Sign-in Assistant; (bso#7577). + + Fix 'net idmap restore' setting HWM to avoid duplicates; (bso#7578). + + Fix "admin users" when using vfs_acl_xattr; (bso#7581). + + Fix using cached credentials in ntlm_auth; (bso#7589). + + Fix Winbind offline login; (bso#7590). + + Fix Winbind internal error; (bso#7636). + + Fix mknod/mkfifo failing with "No such file or directory"; (bso#7651). + + Fix smbd changing mode of files on rename; (bso#7693). + + Fix crash bug with invalid SPNEGO token; (bso#7694). + + Fix smbd panic on invalid NetBIOS session request; (bso#7698). + + Fix smbd crash caused by "%D" in "printer admin"; (bso#7541). + + Fix 'smbclient -M'; (bso#7635). + + Fix scalability problem with hundreds of printers; (bso#7656). + + Fix crash bug in rpcclient; (bso#7688). + + Fix file corruption when setting Samba "write wache wize"; (bso#7715). + +------------------------------------------------------------------- +Fri Sep 24 01:40:30 CEST 2010 - ddiss@suse.de + +- Fix smbd crash with CUPS printers and no [printers] share defined; + (bso#7297); (bnc#637755). + +------------------------------------------------------------------- +Tue Sep 21 01:18:17 CEST 2010 - jmcdonough@suse.de + +- Fix printing from 64-bit windows clients; (bso#6888); (bnc#640870). + ------------------------------------------------------------------- Sun Sep 12 15:54:14 UTC 2010 - coolo@novell.com -- fix baselibs.conf for libtalloc +- Fix baselibs.conf for libtalloc. + +------------------------------------------------------------------- +Wed Sep 8 12:09:39 UTC 2010 - lmuelle@suse.de + +- Fix buffer overflow in sid_parse() to correctly check the input lengths when + reading a binary representation of a Windows Security ID (SID); + CVE-2010-3069; (bso#7669); (bnc#637218). + +------------------------------------------------------------------- +Mon Aug 30 22:11:20 CEST 2010 - jmcdonough@suse.de + +- Use cached ntlm password in libsmbclient. Prevent lockouts + when kerberos tickets are lost; (bnc#602418); (bnc#606304). + +------------------------------------------------------------------- +Thu Aug 26 11:08:42 UTC 2010 - gber@opensuse.org + +- Add a dependency on nfs to the smbfs/ cifs init scripts as they require the + en_US locale and /usr might be on NFS. ------------------------------------------------------------------- Mon Aug 23 17:00:20 CEST 2010 - jmcdonough@suse.de @@ -19,6 +81,11 @@ Thu Aug 19 21:53:30 UTC 2010 - lmuelle@suse.de - Adjust position of conditional ldapsmb %package and %files definition. +------------------------------------------------------------------- +Thu Aug 19 20:21:50 UTC 2010 - lmuelle@suse.de + +- Create the /var/run/samba directory on the fly and package it as %ghost. + ------------------------------------------------------------------- Thu Aug 19 19:55:37 CEST 2010 - jmcdonough@suse.de diff --git a/samba.spec b/samba.spec index bd88ff9..e058a4f 100644 --- a/samba.spec +++ b/samba.spec @@ -1,5 +1,5 @@ # -# spec file for package samba (Version 3.5.4) +# spec file for package samba (Version 3.5.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -58,7 +58,7 @@ BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -%define samba_ver 3.5.4 +%define samba_ver 3.5.6 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -70,8 +70,10 @@ License: GPLv3+ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on -Version: 3.5.4 -Release: 7 +Version: 3.5.6 +Release: 1 +Provides: samba-gplv3 = %{version}-%{release} +Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -171,15 +173,16 @@ Authors: The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package client License: GPLv3+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba AutoReqProv: on -Provides: smbfs +Provides: smbfs samba-gplv3-client = %{version}-%{release} +Obsoletes: samba-gplv3-client < %{version} %ifarch ppc64 Obsoletes: samba-client-64bit %endif @@ -214,8 +217,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -224,6 +227,8 @@ License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with Samba Support Group: Development/Libraries/C and C++ AutoReqProv: on +Provides: samba-gplv3-devel = %{version}-%{release} +Obsoletes: samba-gplv3-devel < %{version} %ifarch ppc64 Obsoletes: samba-devel-64bit %endif @@ -239,8 +244,8 @@ Authors: The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -250,6 +255,8 @@ License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on +Provides: samba-gplv3-doc = %{version}-%{release} +Obsoletes: samba-gplv3-doc < %{version} PreReq: coreutils findutils %if 0%{?suse_version} > 1110 BuildArch: noarch @@ -265,8 +272,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %endif @@ -275,6 +282,8 @@ License: GPLv3+ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba AutoReqProv: on +Provides: samba-gplv3-krb-printing = %{version}-%{release} +Obsoletes: samba-gplv3-krb-printing < %{version} PreReq: coreutils %if 0%{?suse_version} > 1000 PreReq: /sbin/conf.d/SuSEconfig.permissions @@ -290,17 +299,18 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if %{make_utils} %package utils - Summary: debug tools Group: Productivity/Networking/Samba AutoReqProv: on +Provides: samba-gplv3-utils = %{version}-%{release} +Obsoletes: samba-gplv3-utils < %{version} %description utils Some of the debug-tools for developpers. @@ -318,6 +328,8 @@ License: GPLv3+ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba AutoReqProv: on +Provides: samba-gplv3-winbind = %{version}-%{release} +Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd %ifarch ppc64 Obsoletes: samba-winbind-64bit @@ -337,8 +349,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -362,8 +374,9 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2420 -Branch : 3.5.4 + +Source Timestamp: 2450 +Branch : 3.5.6 %else @@ -407,8 +420,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libnetapi0 License: GPLv3+ @@ -426,8 +439,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libnetapi-devel License: GPLv3+ @@ -446,8 +459,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -466,8 +479,9 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2420 -Branch : 3.5.4 + +Source Timestamp: 2450 +Branch : 3.5.6 %else @@ -502,8 +516,8 @@ Authors: The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtalloc2 License: LGPLv3+ @@ -521,8 +535,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtalloc-devel License: LGPLv3+ @@ -541,8 +555,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtdb1 License: LGPLv3+ @@ -560,8 +574,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtdb-devel License: LGPLv3+ @@ -580,8 +594,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libwbclient0 License: GPLv3+ @@ -599,8 +613,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libwbclient-devel License: GPLv3+ @@ -619,8 +633,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtevent0 License: LGPLv3+ @@ -638,8 +652,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtevent-devel License: LGPLv3+ @@ -659,8 +673,8 @@ Authors: The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libldb0 License: LGPLv3+ @@ -679,8 +693,8 @@ Authors: The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libldb-devel License: LGPLv3+ @@ -699,8 +713,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if %{make_ldapsmb} @@ -710,7 +724,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 292 +Release: 293 Requires: perl-ldap %description -n ldapsmb @@ -723,8 +737,8 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %endif %if 0%{?suse_version} > 920 && 0%{?suse_version} < 1121 @@ -746,8 +760,8 @@ Authors: -------- Steve French -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %endif %if %{make_vscan} @@ -847,6 +861,9 @@ if test "%{VENDOR}" != "UL"; then 1010|1110) product_suffix="-CODE${major_version}" ;; esac fi +# Add the build architecture +test "%{_build_arch}" != "" && \ + product_suffix="${product_suffix}-%{_build_arch}" # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file mv VERSION VERSION.orig sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/ VERSION.orig >VERSION @@ -1704,7 +1721,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf %ghost %{_var}/lock/subsys/%{cifs_init_script} %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} -%dir %{PIDDIR} +%ghost %dir %{PIDDIR} %if 0%{?suse_version} && 0%{?suse_version} < 921 /sbin/mount.cifs /sbin/umount.cifs @@ -1939,5 +1956,4 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf /lib/mkinitrd/scripts/boot-cifs.sh %endif %endif - %changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 31914b8..089093d 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:9603febdfe32268b51cd8a5b6d2f07fa229f26bfb4391fed06ef1eb2430038b8 -size 24479 +oid sha256:790184816e96e062b7a5bd2e61f07b62a74c31f78174952e17fa6ca3f5bf04a1 +size 24560