--- rpms/e-smith-ntp/sme10/e-smith-ntp.spec	2020/11/27 04:29:40	1.8
+++ rpms/e-smith-ntp/sme10/e-smith-ntp.spec	2023/02/06 07:14:17	1.21
@@ -1,10 +1,10 @@
-# $Id: e-smith-ntp.spec,v 1.7 2020/11/27 04:14:40 jpp Exp $
+# $Id: e-smith-ntp.spec,v 1.20 2023/02/06 07:07:17 jpp Exp $
 
 Summary: e-smith specific NTP configuration files and templates
 %define name e-smith-ntp
 Name: %{name}
 %define version 2.6.0
-%define release 7
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,10 @@ Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-ntp-2.6.0-bz9690.syslog.patch
 Patch1: %{name}-%{version}-bz11008_systemd.patch
 Patch2: e-smith-ntp-2.6.0-bz11008-bz8881-improve-systemd-driftfile.patch
+Patch3: e-smith-ntp-2.6.0-bz11298-ntpdpanic_stop.patch
+Patch4: e-smith-ntp-2.6.0-bz12107-untainting.patch
+Patch5: e-smith-ntp-2.6.0-bz12115-loging.patch
+Patch6: e-smith-ntp-2.6.0-bz12177.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -24,7 +28,33 @@ Requires: e-smith-lib >= 1.15.1-19
 AutoReqProv: no
 
 %changelog
-* Thu Nov 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+* Mon Feb 06 2023 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-18.sme
+- fix noise about chown on driftfile [SME: 12177]
+
+* Wed Jul 20 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-17.sme
+- dedicated log and logrotate [SME: 12115]
+  thanks to  bunkobugsy for this patch
+
+* Sun Jul 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-15.sme
+- untainting fields [SME: 12107]
+
+* Sun Jan 03 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
+- fix ntpd crashing with panic_stop [SME: 11298]
+
+* Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+- update override.conf to 50koozali.conf [SME: 11008]
+
+* Sun Nov 29 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+- adding missing folder /usr/lib/systemd/system/ntpd.service.d [SME: 11008]
+
+* Sun Nov 29 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
+- fix typo in path for new driftfile [SME: 8881]
+
+* Fri Nov 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+- fix systemd-preset fragment [SME: 11008]
+  add +x to ExecStartPRe script
+
+* Thu Nov 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
 - improve systemd integration [SME: 11008]
 - change driftfile path [SME: 8881]
 
@@ -72,7 +102,8 @@ AutoReqProv: no
 * Fri Feb 1 2013 Ian Wells <esmith@wellsi.com> 2.4.0-1.sme
 - Rolling for SME 9
 
-* Tue Oct 7 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
+* Fri Oct 07 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
+  Tue Oct 07 2011 --> Tue Oct 04 2011 or Fri Oct 07 2011 or Tue Oct 11 2011 or ....
 - Set the TimeZone property earlier, so templates can rely on it [SME: 6754]
 
 * Sun Nov 21 2010 Ian Wells <esmith@wellsi.com> 2.2.0-4.sme
@@ -749,6 +780,11 @@ Configuration files and templates for th
 %patch1 -p1
 %patch2 -p1
 /usr/bin/rm -rf root/var/service/ntpd/
+mkdir -p root/usr/lib/systemd/system/ntpd.service.d
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 for i in ip-change post-install post-upgrade timeserver-update \
@@ -772,6 +808,7 @@ perl createlinks
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist \
+    --file '/sbin/e-smith/systemd/initializedate' 'attr(0554,root,root)' \
     $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 #    --dir '/var/service/ntpd' 'attr(1755,root,root)' \
 #    --file '/var/service/ntpd/down' 'attr(0644,root,root)' \