From 736c8942e1aa0385781afd3a8c57e3e1ba17ac33370008f269df0840c5ab712e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 27 Oct 2008 16:14:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=26 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +- samba-doc.spec | 8 ++-- samba.changes | 31 ++++++++++++++ samba.spec | 92 ++++++++++++++++++++++++------------------ vendor-files.tar.bz2 | 4 +- 6 files changed, 93 insertions(+), 48 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index afde2ff5..099be26 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -1931 +1971 Branch : 3.2.4 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 360a66a..3ab8a6a 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a89d352402dd86d4ee99aff1e1b4066c60cfa9cb43ae29faff810d61dbb73ee3 -size 59711 +oid sha256:ceaa7b3a8bf2c388bd776aea638b18e7d98a2d14a8683e42aad49bd213990814 +size 60094 diff --git a/samba-doc.spec b/samba-doc.spec index 63b6c2a..2fb9c2d 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -26,7 +26,7 @@ BuildRequires: ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5 License: GPL v3 or later Url: http://www.samba.org/ Version: 3.2.4 -Release: 2 +Release: 3 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -127,8 +127,8 @@ if test "%{VENDOR}" != "UL"; then else product_suffix="-OBS" fi - case "0%{?suse_version}" in - 1010) product_suffix="-CODE${major_version}" ;; + case "%{?suse_version}" in + 1010|1110) product_suffix="-CODE${major_version}" ;; esac fi # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file @@ -319,7 +319,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %changelog diff --git a/samba.changes b/samba.changes index c65a31d..fb03d83 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Oct 24 13:18:53 CEST 2008 - anschneider@suse.de + +- Fix the pam_winbind build. + +------------------------------------------------------------------- +Tue Oct 21 16:32:56 CEST 2008 - anschneider@suse.de + +- Delete the krb5 ccname variable from the PAM environment if set. + +------------------------------------------------------------------- +Thu Oct 16 14:49:16 CEST 2008 - anschneider@suse.de + +- Move the nss_info modules to the samba-winbind package. + +------------------------------------------------------------------- +Thu Oct 16 11:40:17 CEST 2008 - anschneider@suse.de + +- Add version branding for CODE 11. + +------------------------------------------------------------------- +Wed Oct 15 17:24:25 CEST 2008 - anschneider@suse.de + +- Restart smbfs even with the traditional network setup; (bnc#425058); + ------------------------------------------------------------------- Fri Oct 3 16:48:31 CEST 2008 - lmuelle@suse.de @@ -610,6 +635,12 @@ Fri May 16 13:28:53 CEST 2008 - lmuelle@suse.de - Set CODEPAGEDIR while make to fit the install location. +------------------------------------------------------------------- +Fri May 16 13:20:11 CEST 2008 - hhetter@suse.de + +- Prevent errors during the cache validation when ua keys reach a size larger + than 1024; [bnc#372558]. + ------------------------------------------------------------------- Thu May 15 00:16:13 CEST 2008 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 778329d..8355338 100644 --- a/samba.spec +++ b/samba.spec @@ -51,7 +51,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.4 -Release: 2 +Release: 3 Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron logrotate @@ -128,7 +128,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package client @@ -165,7 +165,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -186,7 +186,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -216,7 +216,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -243,7 +243,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if %{make_utils} @@ -289,7 +289,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -324,7 +324,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %else @@ -338,7 +338,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -372,7 +372,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libnetapi0 @@ -391,7 +391,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libnetapi-devel @@ -411,7 +411,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -438,7 +438,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %else @@ -452,7 +452,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -483,7 +483,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if %{make_ldapsmb} @@ -504,7 +504,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libtalloc-devel @@ -524,7 +524,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libtdb1 @@ -543,7 +543,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libtdb-devel @@ -563,7 +563,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libwbclient0 @@ -582,7 +582,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libwbclient-devel @@ -602,7 +602,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n ldapsmb @@ -611,7 +611,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 241 +Release: 242 Requires: perl-ldap %description -n ldapsmb @@ -624,7 +624,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -646,7 +646,7 @@ Authors: -------- Steve French -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -658,7 +658,7 @@ Summary: On-Access Virus Scanning with Samba Group: Productivity/Networking/Samba AutoReqProv: on Version: 0.3.6b -Release: 245 +Release: 246 Provides: samba3-vscan = 0.3.6b Obsoletes: samba3-vscan Requires: samba = %{samba_ver} @@ -676,7 +676,7 @@ Authors: -------- Rainer Link -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -744,8 +744,8 @@ if test "%{VENDOR}" != "UL"; then else product_suffix="-OBS" fi - case "0%{?suse_version}" in - 1010) product_suffix="-CODE${major_version}" ;; + case "%{?suse_version}" in + 1010|1110) product_suffix="-CODE${major_version}" ;; esac fi # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file @@ -943,8 +943,6 @@ cp -p tools/smbprngenpdf ${RPM_BUILD_ROOT}/%{_bindir}/ touch ${RPM_BUILD_ROOT}/var/lock/subsys/smbfs cp -p config/swat.xinetd ${RPM_BUILD_ROOT}/%{_sysconfdir}/xinetd.d/swat cp -p config/samba.reg ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d/ -install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/NetworkManager/dispatcher.d/ -cp -p tools/smbfs ${RPM_BUILD_ROOT}/%{_sysconfdir}/NetworkManager/dispatcher.d/smbfs %if 0%{?suse_version} && 0%{?suse_version} < 921 cp -p config/samba.pamd ${RPM_BUILD_ROOT}/%{_sysconfdir}/pam.d/samba %else @@ -952,11 +950,11 @@ cp -p tools/smbfs ${RPM_BUILD_ROOT}/%{_sysconfdir}/NetworkManager/dispatcher.d/s %endif cp -p config/dhcp.conf ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf cp -p config/sysconfig.dhcp-samba-client ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/ -for script in dhcpcd-hook-samba samba-winbindd; do +for script in dhcpcd-hook-samba samba-winbindd smbfs; do cp -p "tools/${script}" "${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/" done # Create ghosts for the symlinks -for script in 21-dhcpcd-hook-samba 55-samba-winbindd; do +for script in 21-dhcpcd-hook-samba 21-smbfs 55-samba-winbindd; do touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} done # Add logrotate settings for nmbd and smbd only on systems newer than 8.1. @@ -1140,12 +1138,18 @@ if [ ${1:-0} -eq 1 ]; then %{?fillup_and_insserv -fy smbfs} ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba + ln -fs %{_sysconfdir}/sysconfig/network/scripts/smbfs %{_sysconfdir}/sysconfig/network/if-down.d/21-smbfs + ln -fs %{_sysconfdir}/sysconfig/network/scripts/smbfs %{_sysconfdir}/sysconfig/network/if-up.d/21-smbfs else for if_case in if-down.d if-up.d; do test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba || \ continue rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-dhcpcd-hook-samba + test -h %{_sysconfdir}/sysconfig/network/${if_case}/smbfs || \ + continue + rm -f %{_sysconfdir}/sysconfig/network/${if_case}/smbfs + ln -fs %{_sysconfdir}/sysconfig/network/scripts/smbfs %{_sysconfdir}/sysconfig/network/${if_case}/21-smbfs done fi if ! test -e %{_bindir}/get_printing_ticket; then @@ -1363,11 +1367,11 @@ exit 0 %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba -%dir %{_sysconfdir}/NetworkManager -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%{_sysconfdir}/NetworkManager/dispatcher.d/smbfs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions +%ghost %{_sysconfdir}/sysconfig/network/if-down.d/21-smbfs +%ghost %{_sysconfdir}/sysconfig/network/if-up.d/21-smbfs +%{_sysconfdir}/sysconfig/network/scripts/smbfs %{_bindir}/eventlogadm %{_bindir}/findsmb %{_bindir}/ldbadd @@ -1406,10 +1410,6 @@ exit 0 %{_libdir}/samba/lowcase.dat %{_libdir}/samba/upcase.dat %{_libdir}/samba/valid.dat -%dir %{_libdir}/samba/nss_info -%{_libdir}/samba/nss_info/rfc2307.so -%{_libdir}/samba/nss_info/sfu.so -%{_libdir}/samba/nss_info/sfu20.so %doc %{_mandir}/man1/findsmb.1.* %doc %{_mandir}/man1/ldbadd.1.* %doc %{_mandir}/man1/ldbdel.1.* @@ -1483,6 +1483,7 @@ exit 0 /%{_lib}/libnss_winbind.so.2 /%{_lib}/security/pam_winbind.so %{_libdir}/samba/idmap +%{_libdir}/samba/nss_info %doc %{_mandir}/man7/pam_winbind.7.* %doc %{_mandir}/man8/idmap_ad.8.* %doc %{_mandir}/man8/idmap_ldap.8.* @@ -1647,6 +1648,16 @@ exit 0 %endif %changelog +* Fri Oct 24 2008 anschneider@suse.de +- Fix the pam_winbind build. +* Tue Oct 21 2008 anschneider@suse.de +- Delete the krb5 ccname variable from the PAM environment if set. +* Thu Oct 16 2008 anschneider@suse.de +- Move the nss_info modules to the samba-winbind package. +* Thu Oct 16 2008 anschneider@suse.de +- Add version branding for CODE 11. +* Wed Oct 15 2008 anschneider@suse.de +- Restart smbfs even with the traditional network setup; (bnc#425058); * Fri Oct 03 2008 lmuelle@suse.de - Only call the stop_on_removal, restart_on_update, or insserv_cleanup macro if available. @@ -2079,6 +2090,9 @@ exit 0 - Cleanup the use of the suse_version macro to achieve consistent defaults. * Fri May 16 2008 lmuelle@suse.de - Set CODEPAGEDIR while make to fit the install location. +* Fri May 16 2008 hhetter@suse.de +- Prevent errors during the cache validation when ua keys reach a size larger + than 1024; [bnc#372558]. * Thu May 15 2008 lmuelle@suse.de - Package man page files independent of the used compression method (gz,lzma). * Wed May 14 2008 lmuelle@suse.de diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 6c771f1..754683b 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:94f8367c3e21f8cf50d8cff18596c0161b43f326405ee5c4d351dba700624bfe -size 22554 +oid sha256:48649ae3f9b0185fb91a48089bf6735af650172ca09fffe3931bc370f04fbbb0 +size 22630