diff --git a/build-source-timestamp b/build-source-timestamp index aa9650b..4b35a7e 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2196 +2223 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 48d4834..2dde0a5 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7abcdd67fa112992bb7d4a0d79461a33015a26468fb63d7c131ac43757967f08 -size 60541 +oid sha256:79059e71620c5463ca9520773033256e4dc79d352f0278ed0c0089ba0f477848 +size 61359 diff --git a/samba-3.4.1.tar.bz2 b/samba-3.4.1.tar.bz2 deleted file mode 100644 index 4a602fd..0000000 --- a/samba-3.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbfa0f247740571a6a6bd3ec83e4c76b93c9654dda90f4ae0a723630005c0f45 -size 31577969 diff --git a/samba-3.4.2.tar.bz2 b/samba-3.4.2.tar.bz2 new file mode 100644 index 0000000..3c2f277 --- /dev/null +++ b/samba-3.4.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a02e804199c6f187c61e170d06903a9a80e50c6bd3ebf5b61d4941abe9e1b03 +size 31577993 diff --git a/samba-doc.spec b/samba-doc.spec index ea869e2..a8eea07 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -1,5 +1,5 @@ # -# spec file for package samba-doc (Version 3.4.1) +# spec file for package samba-doc (Version 3.4.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,14 +47,14 @@ BuildRequires: keyutils-devel %if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} BuildRequires: ctdb-devel %endif -%define samba_ver 3.4.1 +%define samba_ver 3.4.2 %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.4.1 +Version: 3.4.2 Release: 1 License: GPL v3 or later Summary: Samba Documentation @@ -361,10 +361,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index f611d7b..08eb1b9 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Thu Oct 8 21:54:16 CEST 2009 - lmuelle@suse.de + +- Update to 3.4.2. + + Fix unresolved home path; CVE-2009-2813; (bso#6763); (bnc#539517). + + Fix potential denial of service; CVE-2009-2906; (bso#6768); (bnc#543115). + + Fix potential mount.cifs password leaks; CVE-2009-2948; (bnc#542150). + +------------------------------------------------------------------ +Wed Sep 30 12:56:02 CEST 2009 - jmcdonough@suse.de + +- Fix potential denial of service; CVE-2009-2906; (bnc#543115). + +------------------------------------------------------------------ +Fri Sep 25 18:57:30 CEST 2009 - jmcdonough@suse.de + +- Fix potential mount.cifs password leaks; CVE-2009-2948; (bnc#542150). + +------------------------------------------------------------------ +Wed Sep 23 21:56:35 CEST 2009 - jmcdonough@suse.de + +- Fix unresolved home path; CVE-2009-2813; (bnc#539517). + +------------------------------------------------------------------- +Mon Sep 21 11:56:54 CEST 2009 - boyang@suse.de + +- Don't overwrite password in pam_winbind; (bnc#515444). + +------------------------------------------------------------------- +Mon Sep 14 12:56:58 UTC 2009 - chris@computersalat.de + +- mods for winbind (when used with squid - ntlm_auth) + o winbind adds group 'winbind' + o permission 0750,root,winbind LOCKDIR/winbindd_privileged + +------------------------------------------------------------------- +Thu Sep 10 22:19:57 CEST 2009 - lmuelle@suse.de + +- Merge two fixes from 3.2.8 and 3.3.1. + + Adjust regex to match variable names including underscores. + + Conditional install of the cifs.upcall man page. + +------------------------------------------------------------------- +Thu Sep 10 00:36:36 CEST 2009 - lmuelle@suse.de + +- Remove supplements from baselibs.conf while %clean for pre-11.1 systems; + (bnc#520579). + ------------------------------------------------------------------- Wed Sep 9 17:26:58 CEST 2009 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 31116b9..dd3c4c6 100644 --- a/samba.spec +++ b/samba.spec @@ -1,5 +1,5 @@ # -# spec file for package samba (Version 3.4.1) +# spec file for package samba (Version 3.4.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -47,7 +47,7 @@ BuildRequires: keyutils-devel %if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} BuildRequires: ctdb-devel %endif -%define samba_ver 3.4.1 +%define samba_ver 3.4.2 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -59,7 +59,7 @@ License: GPL v3 or later Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on -Version: 3.4.1 +Version: 3.4.2 Release: 1 %ifarch ppc64 Obsoletes: samba-64bit @@ -68,7 +68,7 @@ Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron logrotate %endif -PreReq: coreutils grep /usr/sbin/groupadd +PreReq: coreutils grep /usr/sbin/groupadd /usr/bin/getent Summary: A SMB/CIFS File, Print, and Authentication Server Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 Source1: vendor-files.tar.bz2 @@ -149,10 +149,16 @@ Authors: The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %package client @@ -192,10 +198,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -220,10 +232,16 @@ Authors: The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %endif @@ -248,10 +266,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %endif @@ -278,10 +302,16 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %if %{make_utils} @@ -330,10 +360,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -357,10 +393,16 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %else @@ -402,10 +444,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %package -n libnetapi0 @@ -424,10 +472,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %package -n libnetapi-devel @@ -447,10 +501,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -469,10 +529,16 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %else @@ -506,10 +572,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %if %{make_ldapsmb} @@ -530,10 +602,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %package -n libtalloc-devel @@ -553,10 +631,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %package -n libtdb1 @@ -575,10 +659,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %package -n libtdb-devel @@ -598,10 +688,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %package -n libwbclient0 @@ -620,10 +716,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %package -n libwbclient-devel @@ -643,10 +745,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %package -n ldapsmb @@ -655,7 +763,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 268 +Release: 269 Requires: perl-ldap %description -n ldapsmb @@ -668,10 +776,16 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %endif @@ -694,10 +808,16 @@ Authors: -------- Steve French -Source Timestamp: 2196 +Source Timestamp: 2223 Branch : trunk -Source Timestamp: 2196 +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 +Branch : trunk + +Source Timestamp: 2223 Branch : trunk %endif @@ -930,7 +1050,7 @@ popd ${RPM_BUILD_ROOT}/%{_datadir}/omc/svcinfo.d \ ${RPM_BUILD_ROOT}/%{_datadir}/samba/{LDAP,templates} \ ${RPM_BUILD_ROOT}/%{_localstatedir}/adm \ - ${RPM_BUILD_ROOT}/%{LOCKDIR}/{netlogon,drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},printing,profiles} \ + ${RPM_BUILD_ROOT}/%{LOCKDIR}/{netlogon,drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},printing,profiles,winbindd_privileged} \ ${RPM_BUILD_ROOT}/%{LOGDIR} \ ${RPM_BUILD_ROOT}/%{PIDDIR} \ ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates \ @@ -1278,6 +1398,13 @@ fi %verify_permissions -e %{_bindir}/get_printing_ticket %endif +%pre winbind +# we need this group for squid (ntlmauth) +# read access to /var/lib/samba/winbindd_privileged +if [ -z "`%{_bindir}/getent group winbind 2>/dev/null`" ]; then + %{_sbindir}/groupadd -r winbind 2>/dev/null +fi + %post winbind /sbin/ldconfig if test ${1:-0} -eq 1; then @@ -1344,6 +1471,9 @@ exit 0 %clean [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" +%if 0%{?suse_version} < 1110 +sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf +%endif %files -f filelist-samba %defattr(-,root,root) @@ -1584,6 +1714,7 @@ exit 0 %dir %{_datadir}/omc/svcinfo.d %endif %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml +%attr(0750,root,winbind) %dir %{LOCKDIR}/winbindd_privileged %if %{make_utils} %files utils diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 473a876..dbaf112 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:12dab83a56ac2505b3ed12bcb2213539ed0205894ca38366e10073f579c7461d -size 24067 +oid sha256:ef44cb6136c72c6b63d91f52f15c497194bdb55bccad3082d56a462a10750e9b +size 24083