--- rpms/e-smith-samba/sme10/e-smith-samba.spec	2020/11/16 15:44:39	1.12
+++ rpms/e-smith-samba/sme10/e-smith-samba.spec	2021/03/16 20:52:16	1.20
@@ -1,10 +1,10 @@
-# $Id: e-smith-samba.spec,v 1.11 2020/06/27 19:32:05 jpp Exp $
+# $Id: e-smith-samba.spec,v 1.19 2021/02/22 04:52:16 jpp Exp $
 
 Summary: e-smith specific Samba configuration files and templates
 %define name e-smith-samba
 Name: %{name}
 %define version 2.6.0
-%define release 11
+%define release 19
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,6 +17,11 @@ Patch3: e-smith-samba-2.6.0.bz10169.outl
 Patch4: e-smith-samba-2.6.0-bz10963-bz10576-minprot-SMB2.patch
 Patch5: e-smith-samba-2.6.0-bz9060-remove-win98-reg.patch
 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
 
 Obsoletes: e-smith-netlogon
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
@@ -46,6 +51,34 @@ Requires: /usr/bin/tdbbackup
 AutoReqProv: no
 
 %changelog
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-19.sme
+- clean rsyslog syntax for smbd and nmbd [SME: 11422]
+
+* Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 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 <tests@pialasse.com> 2.6.0-16.sme
+- fix log noise for smb.service [SME: 11157]
+
+* Sat Jan 02 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
+- add Restart=always [SME: 11118]
+- add Restart=always [SME: 11117]
+
+* Fri Jan 01 2021 Jean-Philipe Pialasse <tests@pialasse.com> 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 <jcrisp@safeandsoundit.co.uk> 2.6.0-13.sme
+- Fix mutex locking [SME: 11199]
+
+* Thu Nov 26 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.6.0-12.sme
+- Fix pid directory [SME: 11198]
+
 * Mon Nov 16 2020 John Crisp <jcrisp@safeansoundit.co.uk> 2.6.0-11.sme
 - Add /etc/krb5.conf as template using templates from smeserver-samba
 - [SME: 11093]
@@ -1269,6 +1302,12 @@ Configuration files and templates for th
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+rm -rf root/service root/var/service root/etc/rc.d
+%patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks
@@ -1277,25 +1316,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