pool/samba
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- No longer use the cifs- or smbfstab named configuration file on post-12.2

Browse Source 
systems; (bnc#804822).

- Shift the smbfs init script nfs dependency from Required to Should.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=297
This commit is contained in:
Lars Müller 2013-02-26 13:39:34 +00:00 committed by Git OBS Bridge
parent 34c235a967
commit 324e80361d
5 changed files with 61 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:be3c59f33362096048a991a54a613ed31e1e12d3db83baf1a883c79901adca2a oid sha256:45dba275acb7a67f755c324c4dd2e5aa235862473c62581200c0c866b3b60d8a
size 33196 size 33147

4
samba-doc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package samba-doc # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -126,7 +126,7 @@ BuildRequires: libtevent-devel
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 2943 %define SOURCE_TIMESTAMP 2956
%define BRANCH %{version} %define BRANCH %{version}
Version: 3.6.12 Version: 3.6.12
Release: 0 Release: 0

11
samba.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Feb 26 13:03:46 UTC 2013 - lmuelle@suse.com
- 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 - lmuelle@suse.com
- Shift the smbfs init script nfs dependency from Required to Should.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 8 21:06:56 UTC 2013 - lmuelle@suse.com Fri Feb 8 21:06:56 UTC 2013 - lmuelle@suse.com

64
samba.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package samba # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -126,7 +126,7 @@ BuildRequires: libtevent-devel
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 2943 %define SOURCE_TIMESTAMP 2956
%define BRANCH %{version} %define BRANCH %{version}
Version: 3.6.12 Version: 3.6.12
Release: 0 Release: 0
@ -968,11 +968,11 @@ echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.co
echo "# samba-doc package is installed." >>config/smb.conf echo "# samba-doc package is installed." >>config/smb.conf
grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf
install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} 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} install -m 0644 "config/${file}" %{buildroot}/%{CONFIGDIR}/${file}
done done
%if 0%{?suse_version} && 0%{?suse_version} < 1121 %if 0%{?suse_version} && 0%{?suse_version} < 1221
mv %{buildroot}/%{CONFIGDIR}/cifstab %{buildroot}/%{CONFIGDIR}/smbfstab install -m 0644 -p config/cifstab %{buildroot}/%{CONFIGDIR}/%{cifs_init_script}tab
%endif %endif
section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf) section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf)
for section in $section_names; do for section in $section_names; do
@ -997,7 +997,10 @@ elif test 0%{?suse_version} -lt 1131; then
scriptSuffix="-1130" scriptSuffix="-1130"
fi fi
%endif %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 for script in ${startScripts}; do
install -m 0755 "init/${script}${scriptSuffix}" \ install -m 0755 "init/${script}${scriptSuffix}" \
"%{buildroot}/%{INITDIR}/${script}" "%{buildroot}/%{INITDIR}/${script}"
@ -1017,18 +1020,29 @@ install -m 0755 tools/update-apparmor-samba-profile \
%{buildroot}/%{_datadir}/samba/ %{buildroot}/%{_datadir}/samba/
# PDF generator # PDF generator
install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf 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.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba 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/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 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}" install -m 0755 "tools/${script}" "%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}"
done 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 # 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} touch %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script}
done 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 # Install SuSEfirewall2 config files
%if 0%{?suse_version} && 0%{?suse_version} > 1020 %if 0%{?suse_version} && 0%{?suse_version} > 1020
install -m 0644 config/sysconfig.firewall.netbios-server \ install -m 0644 config/sysconfig.firewall.netbios-server \
@ -1166,6 +1180,7 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
%{?insserv_cleanup:%{insserv_cleanup}} %{?insserv_cleanup:%{insserv_cleanup}}
%pre client %pre client
%if 0%{?suse_version} && 0%{?suse_version} < 1221
# non SUSE + 11.3 an newer, update, no cifstab, but smbfstab # non SUSE + 11.3 an newer, update, no cifstab, but smbfstab
if [ ! 0%{?suse_version} -lt 1121 -a \ if [ ! 0%{?suse_version} -lt 1121 -a \
${1:-0} -gt 1 -a \ ${1:-0} -gt 1 -a \
@ -1174,6 +1189,7 @@ if [ ! 0%{?suse_version} -lt 1121 -a \
cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move
chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || : chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || :
fi fi
%endif
%preun client %preun client
%{?stop_on_removal:%{stop_on_removal %cifs_init_script}} %{?stop_on_removal:%{stop_on_removal %cifs_init_script}}
@ -1187,20 +1203,25 @@ if [ ${1:-0} -eq 1 ]; then
%endif %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-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/%{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-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} ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script}
%endif
else else
for if_case in if-down.d if-up.d; do for if_case in if-down.d if-up.d; do
test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba || \ test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba || \
continue continue
rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba 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 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} || \ test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script} || \
continue continue
rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script} 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} ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-%{cifs_init_script}
%endif
done done
fi fi
%if 0%{?suse_version} && 0%{?suse_version} < 1221
if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
test -f /etc/samba/cifstab && \ test -f /etc/samba/cifstab && \
mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew
@ -1210,6 +1231,7 @@ if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
rm /var/adm/backup/etc_samba_smbfs-enabled rm /var/adm/backup/etc_samba_smbfs-enabled
fi fi
fi fi
%endif
if ! test -e %{_bindir}/get_printing_ticket; then if ! test -e %{_bindir}/get_printing_ticket; then
ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
fi fi
@ -1407,11 +1429,23 @@ fi
%files client -f net.lang %files client -f net.lang
%defattr(-,root,root) %defattr(-,root,root)
%if 0%{?suse_version} && 0%{?suse_version} < 1221
%attr(0754,root,root) %config %{INITDIR}/%{cifs_init_script} %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} %dir %{CONFIGDIR}
%config(noreplace) %{CONFIGDIR}/lmhosts %config(noreplace) %{CONFIGDIR}/lmhosts
%config(noreplace) %{CONFIGDIR}/smb.conf %config(noreplace) %{CONFIGDIR}/smb.conf
%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/%{cifs_init_script}tab
%dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap
%dir %{_sysconfdir}/openldap/schema %dir %{_sysconfdir}/openldap/schema
%attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema
@ -1419,9 +1453,6 @@ fi
%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba %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
%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions %{_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 %if 0%{?suse_version} && 0%{?suse_version} > 1100
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client
%endif %endif
@ -1458,7 +1489,6 @@ fi
%{_bindir}/tdbrestore %{_bindir}/tdbrestore
%{_bindir}/tdbtool %{_bindir}/tdbtool
%endif %endif
%{_sbindir}/rc%{cifs_init_script}
/%{_lib}/libnss_wins.so.2 /%{_lib}/libnss_wins.so.2
%dir %{cups_lib_dir} %dir %{cups_lib_dir}
%dir %{cups_lib_dir}/backend %dir %{cups_lib_dir}/backend
@ -1494,11 +1524,6 @@ fi
%doc %{_mandir}/man8/tdbbackup.8.* %doc %{_mandir}/man8/tdbbackup.8.*
%doc %{_mandir}/man8/tdbdump.8.* %doc %{_mandir}/man8/tdbdump.8.*
%doc %{_mandir}/man8/tdbtool.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
%dir %{_datadir}/samba/LDAP %dir %{_datadir}/samba/LDAP
%config %{_datadir}/samba/LDAP/samba-nds.schema %config %{_datadir}/samba/LDAP/samba-nds.schema
@ -1507,7 +1532,6 @@ fi
%doc %{DOCDIR}/README.%{VENDOR} %doc %{DOCDIR}/README.%{VENDOR}
%{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf %{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf
%{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client %{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client
%ghost %{_localstatedir}/run/%{cifs_init_script}
%dir %{LOCKDIR} %dir %{LOCKDIR}
%attr(0750,root,root) %dir %{LOGDIR} %attr(0750,root,root) %dir %{LOGDIR}
%ghost %dir %{PIDDIR} %ghost %dir %{PIDDIR}

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:0b56ff70959a942152592c646fd82f5a7edfaec51e6c384e3e8f55bc30341d4e oid sha256:ce5dd2194b4d9421cabf9615b817d1f9b922352d686f231be9c3f7b7a8a5fe27
size 53492 size 53283