Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2013-03-01 07:53:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2013-02-04 18:01:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2013-03-01 07:53:03.000000000 +0100 @@ -1,0 +2,28 @@ +Tue Feb 26 13:03:46 UTC 2013 - [email protected] + +- No longer use the cifs- or smbfstab named configuration file on post-12.2 + systems; (bnc#804822). + +------------------------------------------------------------------- +Mon Feb 25 13:08:58 UTC 2013 - [email protected] + +- Shift the smbfs init script nfs dependency from Required to Should. + +------------------------------------------------------------------- +Fri Feb 8 21:06:56 UTC 2013 - [email protected] + +- Point LD_LIBRARY_PATH to the just-built libraries while calling testparm to + generate the default share snippets on pre-12.2 systems. + +------------------------------------------------------------------- +Thu Feb 7 15:30:36 UTC 2013 - [email protected] + +- Fix smbclient recursive mget EPERM handling; (bso#9633); (bnc#786350). + +------------------------------------------------------------------- +Wed Feb 6 14:24:40 UTC 2013 - [email protected] + +- Do not restart the smbfs service on pre-11.3 systems during dhcp lease + renewal when the IP address remains the same; (bnc#800782). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.d7ZABV/_old 2013-03-01 07:53:05.000000000 +0100 +++ /var/tmp/diff_new_pack.d7ZABV/_new 2013-03-01 07:53:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package samba-doc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -126,7 +126,7 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2924 +%define SOURCE_TIMESTAMP 2956 %define BRANCH %{version} Version: 3.6.12 Release: 0 ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.d7ZABV/_old 2013-03-01 07:53:05.000000000 +0100 +++ /var/tmp/diff_new_pack.d7ZABV/_new 2013-03-01 07:53:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package samba # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -126,7 +126,7 @@ %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 2924 +%define SOURCE_TIMESTAMP 2956 %define BRANCH %{version} Version: 3.6.12 Release: 0 @@ -968,14 +968,17 @@ echo "# samba-doc package is installed." >>config/smb.conf grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} -for file in smb.conf lmhosts smbusers smbpasswd cifstab smbusers; do +for file in smb.conf lmhosts smbusers smbpasswd smbusers; do install -m 0644 "config/${file}" %{buildroot}/%{CONFIGDIR}/${file} done -%if 0%{?suse_version} && 0%{?suse_version} < 1121 - mv %{buildroot}/%{CONFIGDIR}/cifstab %{buildroot}/%{CONFIGDIR}/smbfstab +%if 0%{?suse_version} && 0%{?suse_version} < 1221 + install -m 0644 -p config/cifstab %{buildroot}/%{CONFIGDIR}/%{cifs_init_script}tab %endif section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf) for section in $section_names; do +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211 + LD_LIBRARY_PATH=../source3/bin/ \ +%endif ../source3/bin/testparm -s --section-name "${section}" config/smb.conf >"%{buildroot}/%{_datadir}/samba/templates/default-${section}" || : done for file in config/templates/*; do @@ -994,7 +997,10 @@ scriptSuffix="-1130" fi %endif -startScripts="smb nmb winbind %{cifs_init_script}" +startScripts="smb nmb winbind" +%if 0%{?suse_version} && 0%{?suse_version} < 1221 + startScripts="${startScripts} %{cifs_init_script}" +%endif for script in ${startScripts}; do install -m 0755 "init/${script}${scriptSuffix}" \ "%{buildroot}/%{INITDIR}/${script}" @@ -1014,18 +1020,29 @@ %{buildroot}/%{_datadir}/samba/ # PDF generator install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf -touch %{buildroot}/var/run/%{cifs_init_script} install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client -for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd %{cifs_init_script}; do +for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd; do install -m 0755 "tools/${script}" "%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}" done +%if 0%{?suse_version} && 0%{?suse_version} < 1221 + touch %{buildroot}/var/run/%{cifs_init_script} +%if 0%{?suse_version} < 1121 + sed -e 's/cifs/smbfs/g' tools/cifs >%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} + touch --reference=tools/cifs %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} +%else + install -m 0755 -p tools/cifs %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} +%endif +%endif # Create ghosts for the symlinks -for script in 21-dhcpcd-hook-samba 21-%{cifs_init_script} 55-samba-winbindd; do +for script in 21-dhcpcd-hook-samba 55-samba-winbindd; do touch %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} done +%if 0%{?suse_version} && 0%{?suse_version} < 1221 + touch %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/21-%{cifs_init_script} +%endif # Install SuSEfirewall2 config files %if 0%{?suse_version} && 0%{?suse_version} > 1020 install -m 0644 config/sysconfig.firewall.netbios-server \ @@ -1163,6 +1180,7 @@ %{?insserv_cleanup:%{insserv_cleanup}} %pre client +%if 0%{?suse_version} && 0%{?suse_version} < 1221 # non SUSE + 11.3 an newer, update, no cifstab, but smbfstab if [ ! 0%{?suse_version} -lt 1121 -a \ ${1:-0} -gt 1 -a \ @@ -1171,6 +1189,7 @@ cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || : fi +%endif %preun client %{?stop_on_removal:%{stop_on_removal %cifs_init_script}} @@ -1184,20 +1203,25 @@ %endif 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 +%if 0%{?suse_version} && 0%{?suse_version} < 1221 ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script} ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script} +%endif 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 +%if 0%{?suse_version} && 0%{?suse_version} < 1221 test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script} || \ continue rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script} ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-%{cifs_init_script} +%endif done fi +%if 0%{?suse_version} && 0%{?suse_version} < 1221 if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then test -f /etc/samba/cifstab && \ mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew @@ -1207,6 +1231,7 @@ rm /var/adm/backup/etc_samba_smbfs-enabled fi fi +%endif if ! test -e %{_bindir}/get_printing_ticket; then ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb fi @@ -1404,11 +1429,23 @@ %files client -f net.lang %defattr(-,root,root) +%if 0%{?suse_version} && 0%{?suse_version} < 1221 %attr(0754,root,root) %config %{INITDIR}/%{cifs_init_script} +%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/%{cifs_init_script}tab +%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script} +%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script} +%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} +%{_sbindir}/rc%{cifs_init_script} +%if 0%{?suse_version} && 0%{?suse_version} < 1100 +%dir %{_datadir}/omc +%dir %{_datadir}/omc/svcinfo.d +%endif +%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/%{cifs_init_script}.xml +%ghost %{_localstatedir}/run/%{cifs_init_script} +%endif %dir %{CONFIGDIR} %config(noreplace) %{CONFIGDIR}/lmhosts %config(noreplace) %{CONFIGDIR}/smb.conf -%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/%{cifs_init_script}tab %dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap/schema %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema @@ -1416,9 +1453,6 @@ %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions -%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script} -%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script} -%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %if 0%{?suse_version} && 0%{?suse_version} > 1100 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client %endif @@ -1455,7 +1489,6 @@ %{_bindir}/tdbrestore %{_bindir}/tdbtool %endif -%{_sbindir}/rc%{cifs_init_script} /%{_lib}/libnss_wins.so.2 %dir %{cups_lib_dir} %dir %{cups_lib_dir}/backend @@ -1491,11 +1524,6 @@ %doc %{_mandir}/man8/tdbbackup.8.* %doc %{_mandir}/man8/tdbdump.8.* %doc %{_mandir}/man8/tdbtool.8.* -%if 0%{?suse_version} && 0%{?suse_version} < 1100 -%dir %{_datadir}/omc -%dir %{_datadir}/omc/svcinfo.d -%endif -%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/%{cifs_init_script}.xml %dir %{_datadir}/samba %dir %{_datadir}/samba/LDAP %config %{_datadir}/samba/LDAP/samba-nds.schema @@ -1504,7 +1532,6 @@ %doc %{DOCDIR}/README.%{VENDOR} %{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf %{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client -%ghost %{_localstatedir}/run/%{cifs_init_script} %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/64eba0a8421bf4648f79085dd23b3e55d5a322df new/patches/samba.org/64eba0a8421bf4648f79085dd23b3e55d5a322df --- old/patches/samba.org/64eba0a8421bf4648f79085dd23b3e55d5a322df 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/64eba0a8421bf4648f79085dd23b3e55d5a322df 2013-02-07 22:29:37.000000000 +0100 @@ -0,0 +1,41 @@ +From 64eba0a8421bf4648f79085dd23b3e55d5a322df Mon Sep 17 00:00:00 2001 +From: David Disseldorp <[email protected]> +Date: Mon, 4 Feb 2013 19:04:39 +0100 +Subject: [PATCH] BUG 9633: Recursive mget should continue on EPERM. + +Regression introduced by 14ff2e8de9bd8d0064762234555260f5eea643fe. +When downloading files recursively, smbclient halts if it encounters +a folder to which it does not have permission to traverse. + +Reviewed-by: Andreas Schneider <[email protected]> + +Autobuild-User(master): Andreas Schneider <[email protected]> +Autobuild-Date(master): Thu Feb 7 15:50:36 CET 2013 on sn-devel-104 +--- + source3/client/client.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +Index: source3/client/client.c +=================================================================== +--- source3/client/client.c.orig ++++ source3/client/client.c +@@ -1307,8 +1307,17 @@ static NTSTATUS do_mget(struct cli_state + return NT_STATUS_NO_MEMORY; + } + +- status = do_list(mget_mask, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,do_mget,false, true); +- if (!NT_STATUS_IS_OK(status)) { ++ status = do_list(mget_mask, ++ (FILE_ATTRIBUTE_SYSTEM ++ | FILE_ATTRIBUTE_HIDDEN ++ | FILE_ATTRIBUTE_DIRECTORY), ++ do_mget, false, true); ++ if (!NT_STATUS_IS_OK(status) ++ && !NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) { ++ /* ++ * Ignore access denied errors to ensure all permitted files are ++ * pulled down. ++ */ + return status; + } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2013-01-31 17:40:03.000000000 +0100 +++ new/patches/series 2013-02-07 22:29:37.000000000 +0100 @@ -5,6 +5,7 @@ # allows quilt to work in the usual way (= outside of our RPM spec file). # Samba patches from upstream, git.samba.org +samba.org/64eba0a8421bf4648f79085dd23b3e55d5a322df -p0 # bso 9633, bnc 786350 # SuSE specific changes # disabled -> WIP lmuelle ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/smbfs new/vendor-files/init/smbfs --- old/vendor-files/init/smbfs 2013-01-31 17:40:03.000000000 +0100 +++ new/vendor-files/init/smbfs 2013-02-25 14:28:55.000000000 +0100 @@ -25,10 +25,10 @@ # ### BEGIN INIT INFO # Provides: smbfs -# Required-Start: $network $syslog nfs -# Should-Start: nmb -# Required-Stop: $network $syslog nfs -# Should-Stop: nmb +# Required-Start: $network $syslog +# Should-Start: nfs nmb +# Required-Stop: $network $syslog +# Should-Stop: nfs nmb # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Import remote SMB/ CIFS (MS Windows) file systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2013-01-31 18:40:19.000000000 +0100 +++ new/vendor-files/tools/package-data 2013-02-26 14:38:30.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2924" +SAMBA_PACKAGE_SVN_VERSION="2956" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/smbfs new/vendor-files/tools/smbfs --- old/vendor-files/tools/smbfs 2013-01-31 17:40:03.000000000 +0100 +++ new/vendor-files/tools/smbfs 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -#! /bin/bash -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Andreas Schneider <[email protected]> - -# smbfs -# -# Script to restart smbfs - -unset ${!LC_*} LANGUAGE -export LANG="POSIX" -export PATH="/sbin:/usr/sbin:/bin/:/usr/bin" - -numArgs=$# -configname="$1" -shift -interface="$1" -if [ $interface = "lo" ]; then - exit 0 -fi -shift -# And shift away the '-o'. -shift -options="$@" - -# Log functions -function log_dbg() -{ - case "${options}" in - *debug*) - logger -t $0 -p daemon.debug "$1" - ;; - esac -} -function log_err() -{ - logger -t $0 -p daemon.err "$1" - exit 1 -} - -source /etc/rc.status - -# Main case switch -case "$0" in - *if-up.d*) - if rc_active nmb; then - log_msg=$( rcnmb start 2>&1) - log_dbg "${log_msg}" - fi - if rc_active smbfs; then - log_msg=$( rcsmbfs restart 2>&1) - log_dbg "${log_msg}" - fi - ;; - *if-down.d*) - if rc_active smbfs; then - log_msg=$( rcsmbfs stop 2>&1) - log_dbg "${log_msg}" - fi - ;; - *) - log_err "Don't know what to do. This script used to be called from dir if-{up,down}.d/." - ;; -esac -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
