From 0dd3875f72a0fcc68048dc917048a3b9807d2aea61bd8a9ee735d4ed24bb6901 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 5 Sep 2008 18:40:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=22 --- build-source-timestamp | 4 +- patches.tar.bz2 | 4 +- samba-3.2.1.tar.bz2 | 3 - samba-3.2.3.tar.bz2 | 3 + samba-doc.spec | 29 +++--- samba.changes | 57 ++++++++++++ samba.spec | 194 +++++++++++++++++++++++++++-------------- vendor-files.tar.bz2 | 4 +- 8 files changed, 213 insertions(+), 85 deletions(-) delete mode 100644 samba-3.2.1.tar.bz2 create mode 100644 samba-3.2.3.tar.bz2 diff --git a/build-source-timestamp b/build-source-timestamp index 60f3fb5..9f83f94 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -1870 -Branch : trunk +1882 +Branch : 3.2.3 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 7b339d9..4d1a257 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:252b847e589d3bea616c2f2528805150efb32e2214515ee1e099e4eed9815266 -size 72927 +oid sha256:96ea42599768f4642bd3d252842cea93d2a2475fb328133092b34ad90edcb724 +size 72919 diff --git a/samba-3.2.1.tar.bz2 b/samba-3.2.1.tar.bz2 deleted file mode 100644 index f3ee388..0000000 --- a/samba-3.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d02ed51930611653c4c9158922ce5a60759570b2770a142d59b26159a82a24ae -size 21474020 diff --git a/samba-3.2.3.tar.bz2 b/samba-3.2.3.tar.bz2 new file mode 100644 index 0000000..a025199 --- /dev/null +++ b/samba-3.2.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3cbd9c428170dfaf5acc904ad87a1b023689d12da0e5b0c97a3a1c5f35ee900 +size 21478668 diff --git a/samba-doc.spec b/samba-doc.spec index 8dcf5eb..4d1b776 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -1,5 +1,5 @@ # -# spec file for package samba-doc (Version 3.2.1) +# spec file for package samba-doc (Version 3.2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Name: samba-doc BuildRequires: ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5-devel libacl-devel libiniparser-devel libnscd-devel openldap2-devel pam-devel popt-devel pwdutils python-devel readline-devel -%define samba_ver 3.2.1 +%define samba_ver 3.2.3 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} License: GPL v3 or later Url: http://www.samba.org/ -Version: 3.2.1 +Version: 3.2.3 Release: 1 Summary: Samba Documentation Group: Documentation/Other @@ -47,6 +47,11 @@ Source3: build-source-timestamp %define make_utils 0 %define make_vscan 0 %define make_ldapsmb 1 +%if 0%{?suse_version} > 1020 +%define make_cifsupcall 1 +%else +%define make_cifsupcall 0 +%endif # Define some global directories ################################ %define DOCDIR %{_defaultdocdir}/samba @@ -152,6 +157,7 @@ CONFIGURE_OPTIONS="\ --with-rootsbindir=/sbin \ --enable-cups \ --enable-debug \ + --enable-static \ --with-acl-support \ --with-automount \ --with-dnsupdate \ @@ -172,6 +178,9 @@ CONFIGURE_OPTIONS="\ --with-vfs \ --with-winbind \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \ +%if %{make_cifsupcall} + --with-cifsupcall \ +%endif %if %{make_devel} --enable-developer \ --enable-krb5developer \ @@ -250,11 +259,11 @@ done popd # finally build filelist-samba-doc for file in $( find ${RPM_BUILD_ROOT}%{DOCDIR} -maxdepth 1); do - # exclude %{DOCDIR}, README, and docbook - case "${file#${RPM_BUILD_ROOT}}" in - %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; - esac - echo "%doc ${file#${RPM_BUILD_ROOT}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" + # exclude %{DOCDIR}, README, and docbook + case "${file#${RPM_BUILD_ROOT}}" in + %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; + esac + echo "%doc ${file#${RPM_BUILD_ROOT}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" done %if ! %{make_utils} # delete manpages if not packaged in utils-package @@ -303,8 +312,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %changelog * Thu Jan 24 2008 lmuelle@suse.de diff --git a/samba.changes b/samba.changes index 512428f..6d8010e 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Wed Sep 3 11:09:34 CEST 2008 - hare@suse.de + +- Call mkinitrd_setup during %post and %postun for package + cifs-mount (bnc#413709) + +------------------------------------------------------------------- +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 + +- Update to 3.2.2. + + BUG 5592: Fix creation and installation of shared libraries. + + Fix replacement of random seed generator. + + Fix a race condition in idmap_tdb2_allocate_id(). + + Fix unix_convert() for "*" after changing map_nt_error_from_unix(). + + Make sure to always set errno on error path in OpenDir. + + BUG 5675: Fix smbspool program assuming Kerberos authentication by + mistake. + + BUG 5686: Fix segfaults in libsmbclient. + + BUG 5692: Fix coredump in full_audit.so. + + BUG 5696: Fix "force group" in setups using Winbind. + + Rename cifs.spnego to cifs.upcall. + + Fix segfault in cifs.upcall when it is called without any arguments. + + Fix coverity ID 594 (resource leak on error path). + + Fix assigning of primary group memberships when authenticating via + Winbind. + + BUG #5617: Fix freezing Windows Explorer on WinXP while browsing Samba + shares. + + Include stdlib.h to get a prototype for free(). + + Solve an IBM XL C/C++ compiler error encountered in get_exit_code() + auth_errors array initialization in client/smbspool.c. + + Use NGROUPS_MAX instead of 32 for the max group value in + rep_initgroups(). + + Add add c++ guard to netapi. + + Fix compile warning in cifs.upcall. + + Add "dns_resolver" key type to cifs.upcall. + + BUG 5688: Fix orphaned LPQ processes if socket address is invalid. + + BUG 5684: Fix removal of dead records in tdb files. + + Fix coverity IDs 595, 596. + + Fix smb_len calculation for chained requests. + + Fix output of test status. + + Fix smbclient connections to older servers. + + Fix a fd leak when trying to regain contact to a domain controller in + Winbind. + + Fix permissions on ctdb databases. + + Fix passing back success when a function had in fact failed in two + places. +- Add --enable-static to the configure options to get the statical libraries + installed by the install Makefile target. +- Add --with-cifsupcall to build the cifs.upcall binary for post 10.2 systems. + ------------------------------------------------------------------- Thu Aug 14 14:53:28 CEST 2008 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 64f245e..1b2e937 100644 --- a/samba.spec +++ b/samba.spec @@ -1,5 +1,5 @@ # -# spec file for package samba (Version 3.2.1) +# spec file for package samba (Version 3.2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,7 +41,7 @@ BuildRequires: ccache cracklib-devel %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} BuildRequires: krb5-devel openldap-devel %endif -%define samba_ver 3.2.1 +%define samba_ver 3.2.3 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %define vscan_ver 0.3.6b @@ -50,7 +50,7 @@ License: GPL v3 or later Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on -Version: 3.2.1 +Version: 3.2.3 Release: 1 Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 @@ -73,6 +73,11 @@ Source11: http://www.hhrm.de/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 %define make_utils 0 %define make_vscan 0 %define make_ldapsmb 1 +%if 0%{?suse_version} > 1020 +%define make_cifsupcall 1 +%else +%define make_cifsupcall 0 +%endif # Define some global directories ################################ %define DOCDIR %{_defaultdocdir}/samba @@ -118,8 +123,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %package client License: GPL v3 or later @@ -155,8 +160,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -176,8 +181,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 @@ -206,8 +211,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %endif @@ -232,8 +237,8 @@ Authors: -------- Jeremy Allison -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %if %{make_utils} @@ -278,8 +283,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -313,8 +318,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %else @@ -327,8 +332,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %endif This package includes the smbclient library. @@ -361,8 +366,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %package -n libnetapi0 License: GPL v3 or later @@ -380,8 +385,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %package -n libnetapi-devel License: GPL v3 or later @@ -400,8 +405,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -427,8 +432,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %else @@ -441,8 +446,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %endif This package includes the smbsharemodes library. @@ -472,8 +477,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %if %{make_ldapsmb} @@ -493,8 +498,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %package -n libtalloc-devel License: LGPL v3 or later @@ -513,8 +518,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %package -n libtdb1 License: LGPL v3 or later @@ -532,8 +537,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %package -n libtdb-devel License: LGPL v3 or later @@ -552,8 +557,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %package -n libwbclient0 License: GPL v3 or later @@ -571,8 +576,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %package -n libwbclient-devel License: GPL v3 or later @@ -591,8 +596,8 @@ Authors: -------- The Samba Team -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %package -n ldapsmb License: GPL v2 or later @@ -600,7 +605,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 219 +Release: 233 Requires: perl-ldap %description -n ldapsmb @@ -613,8 +618,8 @@ Authors: -------- Guenther Deschner -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 @@ -635,8 +640,8 @@ Authors: -------- Steve French -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %endif %if %{make_vscan} @@ -665,8 +670,8 @@ Authors: -------- Rainer Link -Source Timestamp: 1870 -Branch : trunk +Source Timestamp: 1882 +Branch : 3.2.3 %endif @@ -768,6 +773,7 @@ CONFIGURE_OPTIONS="\ --with-rootsbindir=/sbin \ --enable-cups \ --enable-debug \ + --enable-static \ --with-acl-support \ --with-automount \ --with-dnsupdate \ @@ -788,6 +794,9 @@ CONFIGURE_OPTIONS="\ --with-vfs \ --with-winbind \ --with-shared-modules=%{vfs_modules},%{idmap_modules} \ +%if %{make_cifsupcall} + --with-cifsupcall \ +%endif %if %{make_devel} --enable-developer \ --enable-krb5developer \ @@ -979,17 +988,10 @@ install -m 0755 source/nsswitch/libnss_winbind.so ${RPM_BUILD_ROOT}/%{_lib}/libn cp -p source/bin/smbfilter ${RPM_BUILD_ROOT}/%{_bindir}/ # smbget cp -p source/bin/smbget ${RPM_BUILD_ROOT}/%{_bindir}/ -# workaround for broken make install target +# workaround for the common libs and modules destdir; fixed already upstream for file in libnetapi libsmbclient libsmbsharemodes libtalloc libtdb libwbclient; do - rm "${RPM_BUILD_ROOT}/%{_libdir}/samba/${file}.so" - # install libs - test -e "source/bin/${file}.a" && \ - install -m 0644 "source/bin/${file}.a" "${RPM_BUILD_ROOT}/%{_libdir}" - if test -e "source/bin/${file}.so"; then - major_version=$( grep \^bin/${file}.so: source/library-versions | cut -d: -f2) - install -m 0755 $( find source/bin/ -type f -name ${file}.so*) "${RPM_BUILD_ROOT}/%{_libdir}/${file}.so.${major_version}" - ln -s "${file}.so.${major_version}" "${RPM_BUILD_ROOT}/%{_libdir}/${file}.so" - fi + mv ${RPM_BUILD_ROOT}/%{_libdir}/samba/${file}* \ + ${RPM_BUILD_ROOT}/%{_libdir}/ done # install nsswitch-headers (for squid, etc. #FIXME) mkdir -p \ @@ -1069,11 +1071,11 @@ done popd # finally build filelist-samba-doc for file in $( find ${RPM_BUILD_ROOT}%{DOCDIR} -maxdepth 1); do - # exclude %{DOCDIR}, README, and docbook - case "${file#${RPM_BUILD_ROOT}}" in - %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; - esac - echo "%doc ${file#${RPM_BUILD_ROOT}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" + # exclude %{DOCDIR}, README, and docbook + case "${file#${RPM_BUILD_ROOT}}" in + %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; + esac + echo "%doc ${file#${RPM_BUILD_ROOT}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" done %if ! %{make_utils} # delete manpages if not packaged in utils-package @@ -1083,7 +1085,7 @@ rm -f \ %endif # sort out vscan-modules from the main filelist for file in $( find ${RPM_BUILD_ROOT}%{_libdir}/samba/vfs/ -mindepth 1 ! -iname '*vscan*' ); do - echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba + echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba done # copy the schema cp -p examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema @@ -1259,6 +1261,14 @@ fi %endif /sbin/ldconfig +%post -n cifs-mount +[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup +exit 0 + +%postun -n cifs-mount +[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup +exit 0 + %clean [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" @@ -1618,6 +1628,10 @@ fi /sbin/umount.cifs %doc %{_mandir}/man8/mount.cifs.8.* %doc %{_mandir}/man8/umount.cifs.8.* +%if 0%{?suse_version} > 1020 +%{_sbindir}/cifs.upcall +%doc %{_mandir}/man8/cifs.upcall.8.* +%endif %if 0%{?suse_version} > 1100 %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts @@ -1627,6 +1641,54 @@ fi %endif %changelog +* Wed Sep 03 2008 hare@suse.de +- Call mkinitrd_setup during %%post and %%postun for package + cifs-mount (bnc#413709) +* Wed Aug 27 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 2008 lmuelle@suse.de +- Update to 3.2.2. + + BUG 5592: Fix creation and installation of shared libraries. + + Fix replacement of random seed generator. + + Fix a race condition in idmap_tdb2_allocate_id(). + + Fix unix_convert() for "*" after changing map_nt_error_from_unix(). + + Make sure to always set errno on error path in OpenDir. + + BUG 5675: Fix smbspool program assuming Kerberos authentication by + mistake. + + BUG 5686: Fix segfaults in libsmbclient. + + BUG 5692: Fix coredump in full_audit.so. + + BUG 5696: Fix "force group" in setups using Winbind. + + Rename cifs.spnego to cifs.upcall. + + Fix segfault in cifs.upcall when it is called without any arguments. + + Fix coverity ID 594 (resource leak on error path). + + Fix assigning of primary group memberships when authenticating via + Winbind. + + BUG #5617: Fix freezing Windows Explorer on WinXP while browsing Samba + shares. + + Include stdlib.h to get a prototype for free(). + + Solve an IBM XL C/C++ compiler error encountered in get_exit_code() + auth_errors array initialization in client/smbspool.c. + + Use NGROUPS_MAX instead of 32 for the max group value in + rep_initgroups(). + + Add add c++ guard to netapi. + + Fix compile warning in cifs.upcall. + + Add "dns_resolver" key type to cifs.upcall. + + BUG 5688: Fix orphaned LPQ processes if socket address is invalid. + + BUG 5684: Fix removal of dead records in tdb files. + + Fix coverity IDs 595, 596. + + Fix smb_len calculation for chained requests. + + Fix output of test status. + + Fix smbclient connections to older servers. + + Fix a fd leak when trying to regain contact to a domain controller in + Winbind. + + Fix permissions on ctdb databases. + + Fix passing back success when a function had in fact failed in two + places. +- Add --enable-static to the configure options to get the statical libraries + installed by the install Makefile target. +- Add --with-cifsupcall to build the cifs.upcall binary for post 10.2 systems. * Thu Aug 14 2008 lmuelle@suse.de - Set Required- and Should-Stop in the init info part of all init scripts. * Thu Aug 14 2008 jmcdonough@suse.de diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index b07e646..afffb4d 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:00f87f23816c6e70ea79325097677518a8a4bec4324cdfb100d3047ec0b36eea -size 22578 +oid sha256:39a945fe13aab7e26d9da7c6d223135a5adc2e0de19653449b302acab0cdb045 +size 22533