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

Accepting request 213213 from network:samba:STABLE

Browse Source 
- Call stop_on_removal from preun and restart_on_update and insserv_cleanup
  from postun on pre-12.3 systems only; (bnc#857454).

- BuildRequire gamin-devel instead of unmaintained fam-devel package on
  post-12.1 systems.

- smbd: allow updates on directory write times on open handles; (bso#9870).
- lib/util: use proper include for struct stat; (bso#10276).
- s3:winbindd fix use of uninitialized variables; (bso#10280).
- s3-winbindd: Fix DEBUG statement in winbind_msg_offline(); (bso#10285).
- s3-lib: Fix %G substitution for domain users in smbd; (bso#10286).
- smbd: Always use UCF_PREP_CREATEFILE for filename_convert calls to resolve a
  path for open; (bso#10297).
- smb2_server processing overhead; (bso#10298).
- ldb: bad if test in ldb_comparison_fold(); (bso#10305).
- Fix AIO with SMB2 and locks; (bso#10310).
- smbd: Fix a panic when a smb2 brlock times out; (bso#10311).
- vfs_glusterfs: Enable per client log file; (bso#10337).

- Add /etc/sysconfig/samba to the main and winbind package; (bnc#857454).

- Create /var/run/samba with systemd-tmpfiles on post-12.2 systems;
  (bnc#856759).

- Fix broken rc{nmb,smb,winbind} sym links which should point to the service
  binary on post-12.2 systems; (bnc#856759).

- Add Snapper VFS module for snapshot manipulation; (fate#313347).
  + dbus-1-devel required at build time.

- Add File Server Remote VSS Protocol (FSRVP) client for SMB share
  shadow-copies; (fate#313345).

OBS-URL: https://build.opensuse.org/request/show/213213
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=150
This commit is contained in:
Stephan Kulow 2014-01-09 16:25:54 +00:00 committed by Git OBS Bridge
commit 925cd2c8f8
4 changed files with 109 additions and 13 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
oid sha256:91bc88cb89e0dca7f8ed0af75e34a1802d85485598328bc953bc0652be2e4093
size 45097
oid sha256:a648c41caa84afa1bc7a1a6e7f35f5607718e6693b6db8bbff32bff02708f577
size 86424

57
samba.changes
View File

@ -1,3 +1,60 @@
-------------------------------------------------------------------
Wed Jan 8 15:36:42 UTC 2014 - lmuelle@suse.com
- Call stop_on_removal from preun and restart_on_update and insserv_cleanup
from postun on pre-12.3 systems only; (bnc#857454).
-------------------------------------------------------------------
Wed Jan 8 13:53:33 UTC 2014 - adrian@suse.de
- BuildRequire gamin-devel instead of unmaintained fam-devel package on
post-12.1 systems.
-------------------------------------------------------------------
Mon Jan 6 21:37:37 UTC 2014 - lmuelle@suse.com
- smbd: allow updates on directory write times on open handles; (bso#9870).
- lib/util: use proper include for struct stat; (bso#10276).
- s3:winbindd fix use of uninitialized variables; (bso#10280).
- s3-winbindd: Fix DEBUG statement in winbind_msg_offline(); (bso#10285).
- s3-lib: Fix %G substitution for domain users in smbd; (bso#10286).
- smbd: Always use UCF_PREP_CREATEFILE for filename_convert calls to resolve a
path for open; (bso#10297).
- smb2_server processing overhead; (bso#10298).
- ldb: bad if test in ldb_comparison_fold(); (bso#10305).
- Fix AIO with SMB2 and locks; (bso#10310).
- smbd: Fix a panic when a smb2 brlock times out; (bso#10311).
- vfs_glusterfs: Enable per client log file; (bso#10337).
-------------------------------------------------------------------
Mon Jan 6 17:12:55 UTC 2014 - lmuelle@suse.com
- Add /etc/sysconfig/samba to the main and winbind package; (bnc#857454).
-------------------------------------------------------------------
Mon Jan 6 13:09:35 UTC 2014 - lmuelle@suse.com
- Create /var/run/samba with systemd-tmpfiles on post-12.2 systems;
(bnc#856759).
-------------------------------------------------------------------
Mon Jan 6 10:06:59 UTC 2014 - lmuelle@suse.com
- Fix broken rc{nmb,smb,winbind} sym links which should point to the service
binary on post-12.2 systems; (bnc#856759).
-------------------------------------------------------------------
Mon Jan 6 07:01:48 UTC 2014 - ddiss@suse.com
- Add Snapper VFS module for snapshot manipulation; (fate#313347).
+ dbus-1-devel required at build time.
-------------------------------------------------------------------
Mon Jan 6 06:59:01 UTC 2014 - ddiss@suse.com
- Add File Server Remote VSS Protocol (FSRVP) client for SMB share
shadow-copies; (fate#313345).
-------------------------------------------------------------------
Wed Dec 11 12:12:21 UTC 2013 - lmuelle@suse.com

57
samba.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package samba
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -25,7 +25,11 @@ BuildRequires: patch
BuildRequires: cups-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: e2fsprogs-devel
%if 0%{?suse_version} > 1210
BuildRequires: gamin-devel
%else
BuildRequires: fam-devel
%endif
BuildRequires: libacl-devel
BuildRequires: libattr-devel
%if 0%{?centos_version} > 599 ||0%{?fedora_version} > 11 || 0%{?mandriva_version} > 2009 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1100
@ -102,6 +106,7 @@ BuildRequires: libxslt1
%endif
%if 0%{?suse_version} > 1210
BuildRequires: libxslt-tools
BuildRequires: dbus-1-devel
%endif
%if 0%{?suse_version} > 1220
BuildRequires: gpg-offline
@ -134,7 +139,7 @@ BuildRequires: systemd
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 3129
%define SOURCE_TIMESTAMP 3144
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
@ -166,6 +171,9 @@ PreReq: /usr/bin/getent
PreReq: /usr/sbin/groupadd
PreReq: coreutils
PreReq: grep
%if 0%{?suse_version} > 1220
PreReq: %{fillup_prereq}
%endif
# Choose some features / extra packages here
############################################
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
@ -1354,8 +1362,20 @@ for srv_name in nmb smb winbind; do
-e 's@Type=forking@Type=forking\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' \
../packaging/systemd/${srv_name}.service \
>%{buildroot}/%{_unitdir}/${srv_name}.service
ln -s %{_unitdir}/${srv_name}.service %{buildroot}/usr/sbin/rc${srv_name}
echo -en "## Type: string
## Default: \"\"
## ServiceRestart:·${srv_name}
${srv_name^^}OPTIONS=\"\"\n" >>SUSE.sysconfig.${srv_name}
ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name}
done
head -n 2 ../packaging/systemd/samba.sysconfig > \
%{buildroot}%_var/adm/fillup-templates/sysconfig.samba
cat SUSE.sysconfig.{nmb,smb} >>\
%{buildroot}%_var/adm/fillup-templates/sysconfig.samba
cp -a SUSE.sysconfig.winbind \
%{buildroot}%_var/adm/fillup-templates/sysconfig.samba-winbind
install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d
install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}%{_prefix}/lib/tmpfiles.d/samba.conf
%else
for script in ${startScripts}; do
install -m 0755 "init/${script}${scriptSuffix}" \
@ -1501,21 +1521,25 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
%endif
%preun
%{?stop_on_removal:%{stop_on_removal smb nmb}}
%if 0%{?suse_version} > 1220
%service_del_preun nmb.service smb.service
%else
%{?stop_on_removal:%{stop_on_removal smb nmb}}
%endif
%post
%if 0%{?suse_version} > 1220
%service_add_post nmb.service smb.service
%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
%fillup_only
%endif
%postun
%{?restart_on_update:%{restart_on_update nmb smb}}
%{?insserv_cleanup:%{insserv_cleanup}}
%if 0%{?suse_version} > 1220
%service_del_postun nmb.service smb.service
%else
%{?restart_on_update:%{restart_on_update nmb smb}}
%{?insserv_cleanup:%{insserv_cleanup}}
%endif
%pre client
@ -1688,12 +1712,15 @@ else
fi
%if 0%{?suse_version} > 1220
%service_add_post winbind.service
%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
%fillup_only -a
%endif
%preun winbind
%{?stop_on_removal:%{stop_on_removal winbind}}
%if 0%{?suse_version} > 1220
%service_del_preun winbind.service
%else
%{?stop_on_removal:%{stop_on_removal winbind}}
%endif
%postun winbind
@ -1707,10 +1734,11 @@ if [ -x %{_sbindir}/nscd ]; then
fi
fi
%endif
%{?restart_on_update:%{restart_on_update winbind}}
%{?insserv_cleanup:%{insserv_cleanup}}
%if 0%{?suse_version} > 1220
%service_del_postun winbind.service
%else
%{?restart_on_update:%{restart_on_update winbind}}
%{?insserv_cleanup:%{insserv_cleanup}}
%endif
%post -n %{libsmbclient_name} -p /sbin/ldconfig
@ -1771,6 +1799,10 @@ fi
%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml
%dir %{_datadir}/samba
%{_datadir}/samba/update-apparmor-samba-profile
%if 0%{?suse_version} > 1222
%dir %{_prefix}/lib/tmpfiles.d
%{_prefix}/lib/tmpfiles.d/samba.conf
%endif
%doc %{_mandir}/man1/smbstatus.1.*
%doc %{_mandir}/man5/smbpasswd.5.*
%doc %{_mandir}/man8/nmbd.8.*
@ -1808,6 +1840,7 @@ fi
%doc %{_mandir}/man8/vfs_shadow_copy.8.*
%doc %{_mandir}/man8/vfs_shadow_copy2.8.*
%doc %{_mandir}/man8/vfs_smb_traffic_analyzer.8.*
%doc %{_mandir}/man8/vfs_snapper.8.*
%doc %{_mandir}/man8/vfs_streams_depot.8.*
%doc %{_mandir}/man8/vfs_streams_xattr.8.*
%doc %{_mandir}/man8/vfs_syncops.8.*
@ -1819,6 +1852,9 @@ fi
%endif
%exclude %{_mandir}/man8/samba-tool.8.*
%exclude %{_mandir}/man8/samba.8.*
%if 0%{?suse_version} > 1220
%{_var}/adm/fillup-templates/sysconfig.samba
%endif
%files client
%defattr(-,root,root)
@ -2162,6 +2198,9 @@ fi
%endif
%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml
%attr(0750,root,winbind) %dir %{LOCKDIR}/winbindd_privileged
%if 0%{?suse_version} > 1220
%{_var}/adm/fillup-templates/sysconfig.samba-winbind
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
%files doc -f filelist-samba-doc

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:861622d6f60b8ec6dc5d7f7015ad92d183636eafcaca2b44b8f34dd56d75647a
size 54163
oid sha256:ded4d51dcbc430c440ae6886451317c842615a0eaa77c748b5cb6db7ddf59fd4
size 53841