--- rpms/e-smith-samba/sme10/e-smith-samba.spec 2020/12/16 12:35:56 1.14 +++ rpms/e-smith-samba/sme10/e-smith-samba.spec 2021/11/02 03:42:39 1.27 @@ -1,10 +1,10 @@ -# $Id: e-smith-samba.spec,v 1.13 2020/11/26 00:11:04 jcrisp Exp $ +# $Id: e-smith-samba.spec,v 1.26 2021/11/01 01:31:20 terryfage Exp $ Summary: e-smith specific Samba configuration files and templates %define name e-smith-samba Name: %{name} %define version 2.6.0 -%define release 13 +%define release 25 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -19,6 +19,12 @@ Patch5: e-smith-samba-2.6.0-bz9060-remov Patch6: e-smith-samba-2.6.0-bz11093-add-krb5-template.patch Patch7: e-smith-samba-2.6.0-bz11198-fix-pid-dir.patch Patch8: e-smith-samba-2.6.0-bz11199-fix-mutex-locking.patch +Patch9: e-smith-samba-2.6.0-bz11118-bz11117-bz11157-systemd-update.patch +Patch10: e-smith-samba-2.6.0-bz11348-user-create-profiledir.patch +Patch11: e-smith-samba-2.6.0-bz11349-logging.patch +Patch12: e-smith-samba-2.6.0-bz11555.patch +Patch13: e-smith-samba-2.6.0.bz11725.create_v6_profile_dir.patch +Patch14: e-smith-samba-2.6.0.bz11725.delete_v6_profile_dir.patch Obsoletes: e-smith-netlogon BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot @@ -48,6 +54,43 @@ Requires: /usr/bin/tdbbackup AutoReqProv: no %changelog +* Tue Nov 02 2021 Terry Fage 2.6.0-25.sme +- samba delete v6 profile dir win10 [SME: 11725] + +* Mon Nov 01 2021 Terry Fage 2.6.0-24.sme +- samba create v6 profile dir win10 [SME: 11725] + +* Mon Apr 19 2021 Jean-Philippe Pialasse 2.6.0-23.sme +- netlogon.bat +x [SME: 11566] + +* Fri Apr 16 2021 Jean-Philippe Pialasse 2.6.0-21.sme +- add possibility to reenable allow execute always on ibays homes or everywhere [SME: 11555] + +* Fri Apr 16 2021 Jean-Philippe Pialasse 2.6.0-20.sme +- fix double entries for min protocol [SME: 11558] + +* Tue Mar 16 2021 Jean-Philippe Pialasse 2.6.0-19.sme +- clean rsyslog syntax for smbd and nmbd [SME: 11422] + +* Sun Feb 21 2021 Jean-Philipe Pialasse 2.6.0-18.sme +- fix noise in message log from nmbd and smbd redirected to dedicated logs [SME: 11349] + +* Mon Feb 15 2021 Jean-Philipe Pialasse 2.6.0-17.sme +- allow using user-create-profiledir action with temp or package-update events [SME: 11348] + +* Sun Jan 03 2021 Jean-Philipe Pialasse 2.6.0-16.sme +- fix log noise for smb.service [SME: 11157] + +* Sat Jan 02 2021 Jean-Philipe Pialasse 2.6.0-15.sme +- add Restart=always [SME: 11118] +- add Restart=always [SME: 11117] + +* Fri Jan 01 2021 Jean-Philipe Pialasse 2.6.0-14.sme +- migrate nmbd to systemd [SME: 11118] +- migrate smbd to systemd [SME: 11117] + create generik smb.service service +- create e-smith-samba-update event [SME: 11157] + * Wed Dec 16 2020 John Crisp 2.6.0-13.sme - Fix mutex locking [SME: 11199] @@ -253,7 +296,7 @@ AutoReqProv: no * Thu Sep 23 2010 Daniel Berteaud 2.2.0-19.sme - Add slapd support [SME: 6228] -* Wed Jul 08 2010 Shad L. Lords 2.2.0-18.sme +* Thu Jul 08 2010 Shad L. Lords 2.2.0-18.sme - Remove require strong key part of regedit file [SME: 6119] * Wed Jun 23 2010 Shad L. Lords 2.2.0-17.sme @@ -354,7 +397,7 @@ AutoReqProv: no * Wed Oct 10 2007 Charlie Brady 1.14.0-31 - Delete printer tdb file on printer delete. [SME: 3336] -* Thu Jun 2 2007 Shad L. Lords 1.14.0-30 +* Sat Jun 2 2007 Shad L. Lords 1.14.0-30 - revert last change. Breaks sme8 and is caught by pass check lib. * Sat Jun 2 2007 Shad L. Lords 1.14.0-29 @@ -1279,6 +1322,13 @@ Configuration files and templates for th %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +rm -rf root/service root/var/service root/etc/rc.d +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build perl createlinks @@ -1287,25 +1337,30 @@ perl createlinks rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) /sbin/e-smith/genfilelist \ - --dir '/var/service/smbd' 'attr(1755,root,root)' \ - --file '/var/service/smbd/down' 'attr(0644,root,root)' \ - --file '/var/service/smbd/run' 'attr(0755,root,root)' \ - --dir '/var/service/smbd/supervise' 'attr(0700,root,root)' \ - --dir '/var/service/smbd/log' 'attr(1755,root,root)' \ - --file '/var/service/smbd/log/run' 'attr(0755,root,root)' \ + --file '/sbin/e-smith/systemd/nmbd-prepare' 'attr(0554,root,root)' \ + --file '/sbin/e-smith/systemd/smbd-prepare' 'attr(0554,root,root)' \ --dir '/var/log/smbd' 'attr(2750,smelog,smelog)' \ - --dir '/var/service/nmbd' 'attr(1755,root,root)' \ - --file '/var/service/nmbd/down' 'attr(0644,root,root)' \ - --file '/var/service/nmbd/run' 'attr(0755,root,root)' \ - --dir '/var/service/nmbd/supervise' 'attr(0700,root,root)' \ - --dir '/var/service/nmbd/log' 'attr(1755,root,root)' \ - --file '/var/service/nmbd/log/run' 'attr(0755,root,root)' \ --dir '/var/log/nmbd' 'attr(2750,smelog,smelog)' \ --file '/sbin/e-smith/samba_check_password' 'attr(0555,root,root)' \ $RPM_BUILD_ROOT \ > %{name}-%{version}-filelist echo "%doc COPYING" >> %{name}-%{version}-filelist +%pre +if [ $1 -gt 1 ] ; then + if [ -e /var/service/smbd/run ] ; then + /usr/bin/sv d smbd + /usr/bin/sv d smbd/log + fi +fi +if [ $1 -gt 1 ] ; then + if [ -e /var/service/nmbd/run ] ; then + /usr/bin/sv d nmbd + /usr/bin/sv d nmbd/log + fi +fi + + %clean rm -rf $RPM_BUILD_ROOT