diff --git a/build-source-timestamp b/build-source-timestamp index 4f7dc75..199fc52 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2323 +2332 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index ef539d9..6379cad 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -63,7 +63,7 @@ BuildRequires: pkgconfig %endif Url: http://www.samba.org/ Version: 3.5.1 -Release: 1 +Release: 2 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -89,15 +89,15 @@ BuildRequires: ccache %define make_utils 0 %define make_vscan 0 %define make_ldapsmb 1 -%if 0%{?suse_version} > 1000 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500 +%if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1121 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500 %define make_cifsupcall 1 %else %define make_cifsupcall 0 %endif -%if 0%{?suse_version} < 1121 -%define cifs_init_script smbfs -%else +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs +%else +%define cifs_init_script smbfs %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define link_static_libs 1 @@ -241,10 +241,16 @@ CONFIGURE_OPTIONS="\ --with-utmp \ --with-winbind \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \ -%if %{make_cifsupcall} +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 + --without-cifsmount \ +%else + --with-cifsumount \ +%endif +%if %{make_cifsupcall} == 0 + --without-cifsupcall \ +%else --with-cifsupcall \ %endif - --with-cifsumount \ %if %{make_devel} --enable-developer \ --enable-krb5developer \ @@ -394,19 +400,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index c133c35..170915b 100644 --- a/samba.changes +++ b/samba.changes @@ -1,10 +1,16 @@ +------------------------------------------------------------------- +Sun Mar 14 21:08:44 UTC 2010 - lmuelle@suse.de + +- Remove cifs-mount subpackage for post-11.2 systems as the tools are now part + of the independent cifs-utils package. + ------------------------------------------------------------------- Mon Mar 8 21:03:25 UTC 2010 - lmuelle@suse.de -- Update to 3.5.1. +- Update to 3.5.1 and 3.4.7. + Fix security flaw on Linux platforms if built with libcap support allowing file system access even when permissions should have denied it; - CVE-2010-0728; (bso#7222). + CVE-2010-0728; (bso#7222); (bnc#586683). ------------------------------------------------------------------- Mon Mar 8 09:12:07 UTC 2010 - rhafer@novell.com @@ -1645,7 +1651,7 @@ Wed Dec 10 23:14:12 CET 2008 - lmuelle@suse.de + Fix timeouts when calling 'getgrent'. + BUG 1254: Fix "write list" in setups using "security = share". + BUG 5080: Fix access to cups-printers with cups 1.3.4. - + BUG 5737: Fix Winbind crash in an unusual failure mode. + + BUG 5737: Fix Winbind crash in an unusual failure mode; (bnc#416598). + BUG 5783: Fix FindFirst where search pattern equals the mangled filename. + BUG 5790: Fix returning of STATUS_OBJECT_NAME_NOT_FOUND on set file disposition. @@ -1916,7 +1922,7 @@ Thu Oct 2 18:03:21 CEST 2008 - lmuelle@suse.de - Update to 3.3.0pre2. + BUG 5729: Explicitly allow "-valid". - + BUG 5737: Fix winbindd crash in an unusual failure mode. + + BUG 5737: Fix winbindd crash in an unusual failure mode; (bnc#416598). + BUG 5751: Fix showing of ACLs on DFS in (lib)smbclient. + BUG 5762: Fix opening of mangled directory name (resulted 'is a stream name'). @@ -1966,7 +1972,7 @@ Thu Oct 2 18:03:21 CEST 2008 - lmuelle@suse.de only setups using "security = ads". + Fix cut and paste error in quota code. + Fix display of POSIX ACLs. - + Fix permissions of group_mapping.ldb (CVE-2008-3789). + + Fix permissions of group_mapping.ldb (CVE-2008-3789); (bnc#420634). + Avoid a race condition in glibc between AIO and setresuid(). + Add missing become root for AIO operations. + Fix an errno handling bug that could lead to an infinite loop. @@ -2039,6 +2045,13 @@ Wed Aug 27 23:29:09 CEST 2008 - lmuelle@suse.de including nmbd and winbindd. + New 'net rpc vampire keytab' and 'net rpc vampire ldif' commands. +------------------------------------------------------------------- +Wed Aug 27 18:33:40 CEST 2008 - lmuelle@suse.de + +- Update to 3.2.3. + + Force the permissions on group_mapping.ldb to 0600; CVE-2008-3789; + (bnc#420634). + ------------------------------------------------------------------- Tue Aug 19 14:55:16 CEST 2008 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index f70b8e1..e502c77 100644 --- a/samba.spec +++ b/samba.spec @@ -68,7 +68,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.1 -Release: 1 +Release: 2 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -97,15 +97,15 @@ BuildRequires: ccache %define make_utils 0 %define make_vscan 0 %define make_ldapsmb 1 -%if 0%{?suse_version} > 1000 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500 +%if 0%{?suse_version} > 1000 && 0%{?suse_version} < 1121 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500 %define make_cifsupcall 1 %else %define make_cifsupcall 0 %endif -%if 0%{?suse_version} < 1121 -%define cifs_init_script smbfs -%else +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %define cifs_init_script cifs +%else +%define cifs_init_script smbfs %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define link_static_libs 1 @@ -163,19 +163,7 @@ Authors: The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package client @@ -189,9 +177,13 @@ Obsoletes: samba3-client < %{version} Obsoletes: samba-client-64bit %endif PreReq: %{?insserv_prereq} %{?fillup_prereq} coreutils /sbin/chkconfig /sbin/ldconfig -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 +Requires: cifs-utils +%else +%if 0%{?suse_version} > 920 Requires: cifs-mount %endif +%endif %description client Samba is a suite of programs that allows SMB/CIFS clients to use the @@ -215,19 +207,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -252,19 +232,7 @@ Authors: The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %endif @@ -292,19 +260,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %endif @@ -331,19 +287,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %if %{make_utils} @@ -393,19 +337,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -430,19 +362,7 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %else @@ -487,19 +407,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libnetapi0 @@ -518,19 +426,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libnetapi-devel @@ -550,19 +446,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -582,19 +466,7 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %else @@ -629,19 +501,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %if %{make_ldapsmb} @@ -662,19 +522,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libtalloc-devel @@ -694,19 +542,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libtdb1 @@ -725,19 +561,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libtdb-devel @@ -757,19 +581,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libwbclient0 @@ -788,19 +600,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libwbclient-devel @@ -820,19 +620,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libtevent0 @@ -851,19 +639,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libtevent-devel @@ -884,19 +660,7 @@ Authors: The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libldb0 @@ -916,19 +680,7 @@ Authors: The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n libldb-devel @@ -949,19 +701,7 @@ Authors: The Samba Team -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %package -n ldapsmb @@ -970,7 +710,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 282 +Release: 283 Requires: perl-ldap %description -n ldapsmb @@ -983,23 +723,11 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %endif -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 +%if 0%{?suse_version} > 920 && 0%{?suse_version} < 1121 %package -n cifs-mount License: GPLv3+ @@ -1018,19 +746,7 @@ Authors: -------- Steve French -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 -Branch : trunk - -Source Timestamp: 2323 +Source Timestamp: 2332 Branch : trunk %endif @@ -1187,10 +903,16 @@ CONFIGURE_OPTIONS="\ --with-utmp \ --with-winbind \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \ -%if %{make_cifsupcall} +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 + --without-cifsmount \ +%else + --with-cifsumount \ +%endif +%if %{make_cifsupcall} == 0 + --without-cifsupcall \ +%else --with-cifsupcall \ %endif - --with-cifsumount \ %if %{make_devel} --enable-developer \ --enable-krb5developer \ @@ -1423,7 +1145,7 @@ for file in ${LOGROTATE_FILES}; do done %__install -m 0644 docu/README.vendor ${RPM_BUILD_ROOT}/%{DOCDIR}/README.%{VENDOR} # Install mkinitrd scripts for boot process -%if 0%{?suse_version} > 1100 +%if 0%{?suse_version} > 1100 && 0%{?suse_version} < 1121 %__install -d -m 0755 %{buildroot}/lib/mkinitrd/scripts %__install -m 0755 mkinitrd/mkinitrd-boot.sh %{buildroot}/lib/mkinitrd/scripts/boot-cifs.sh %__install -m 0755 mkinitrd/mkinitrd-setup.sh %{buildroot}/lib/mkinitrd/scripts/setup-cifs.sh @@ -1564,6 +1286,10 @@ mv ${RPM_BUILD_ROOT}/sbin/{,u}mount.cifs ${RPM_BUILD_ROOT}/usr/sbin/ ln -fs /usr/sbin/mount.cifs ${RPM_BUILD_ROOT}/sbin/ ln -fs /usr/sbin/umount.cifs ${RPM_BUILD_ROOT}/sbin/ %endif +# Remove unwanted mount.cifs man pages +%if 0%{?suse_version} && 0%{?suse_version} > 1120 +rm ${RPM_BUILD_ROOT}/%{_mandir}/man8/{,u}mount.cifs.8 +%endif # Hardlink duplicate files %if 0%{?suse_version} > 1110 %fdupes ${RPM_BUILD_ROOT} @@ -1724,7 +1450,7 @@ fi /sbin/ldconfig %{?restart_on_update:%{restart_on_update nscd winbind}} %{?insserv_cleanup:%{insserv_cleanup}} -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 +%if 0%{?suse_version} > 920 && 0%{?suse_version} < 1121 %post -n cifs-mount [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -2186,7 +1912,7 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf %{_sbindir}/ldapsmb %{_mandir}/man5/ldapsmb.5.* %endif -%if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 +%if 0%{?suse_version} > 920 && 0%{?suse_version} < 1121 %files -n cifs-mount %defattr(-,root,root) diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 163e421..df0460b 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:3903939c4b91abaf1596c27d61c9efbd572b0388808e7338652e52edec55481f -size 24554 +oid sha256:c6b0c612c824ed7e1845baf7c6cfc3a63ecfd6da69e9d2782873cee5eb0952fb +size 24553