--- rpms/e-smith-ntp/sme10/e-smith-ntp.spec	2017/11/15 15:44:48	1.4
+++ rpms/e-smith-ntp/sme10/e-smith-ntp.spec	2022/07/17 05:19:10	1.16
@@ -1,17 +1,20 @@
-# $Id: e-smith-ntp.spec,v 1.3 2016/07/22 09:41:42 unnilennium Exp $
+# $Id: e-smith-ntp.spec,v 1.15 2022/07/17 05:17:07 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 4
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-ntp-2.6.0-bz9690.syslog.patch
-Patch1: e-smith-ntp-2.6.0-bz10190-ntp_posttransaction.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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -23,6 +26,41 @@ Requires: e-smith-lib >= 1.15.1-19
 AutoReqProv: no
 
 %changelog
+* 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]
+
+* Wed Sep 23 2020 Michel Begue <mab974@gmail.com> 2.6.0-6.sme
+- from service to systemd [SME: 11008]
+- add ntpd-update event [SME: 11009]
+
+* Fri Jan 25 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-5.sme
+- revert last change [SME: 10190]
+  on sme10 systemd has ntpd disabled by default
+
+* Fri Jan 25 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-5.sme
+- revert last change [SME: 10190]
+  on sme10 systemd has ntpd disabled by default
+
 * Wed Nov 15 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
 - added post transaction rule for ntp [SME: 10190]
 - thank you to Stefano Zamboni for this work
@@ -730,6 +768,11 @@ Configuration files and templates for th
 %setup
 %patch0 -p1
 %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
 
 %build
 for i in ip-change post-install post-upgrade timeserver-update \
@@ -741,28 +784,30 @@ perl createlinks
 /sbin/e-smith/buildtests 30e-smith-datetime
 
 # Manage supervise and multilog.
-mkdir -p root/service
-ln -s ../var/service/ntpd root/service/ntpd
-mkdir -p root/var/service/ntpd/supervise
-mkdir -p root/var/service/ntpd/env
-touch root/var/service/ntpd/down
-mkdir -p root/var/service/ntpd/log/supervise
-mkdir -p root/var/log/ntpd
+#mkdir -p root/service
+#ln -s ../var/service/ntpd root/service/ntpd
+#mkdir -p root/var/service/ntpd/supervise
+#mkdir -p root/var/service/ntpd/env
+#touch root/var/service/ntpd/down
+#mkdir -p root/var/service/ntpd/log/supervise
+#mkdir -p root/var/log/ntpd
 
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist \
-    --dir '/var/service/ntpd' 'attr(1755,root,root)' \
-    --file '/var/service/ntpd/down' 'attr(0644,root,root)' \
-    --file '/var/service/ntpd/run' 'attr(0755,root,root)' \
-    --dir '/var/service/ntpd/supervise' 'attr(0700,root,root)' \
-    --dir '/var/service/ntpd/env' '%attr(0755,root,root)' \
-    --file '/var/service/ntpd/env/MEMLIMIT' 'attr(0644,root,root)' \
-    --dir '/var/service/ntpd/log' 'attr(1755,root,root)' \
-    --file '/var/service/ntpd/log/run' 'attr(0755,root,root)' \
-    --dir '/var/log/ntpd' 'attr(2750,smelog,nofiles)' \
+    --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)' \
+#    --file '/var/service/ntpd/run' 'attr(0755,root,root)' \
+#    --dir '/var/service/ntpd/supervise' 'attr(0700,root,root)' \
+#    --dir '/var/service/ntpd/env' '%attr(0755,root,root)' \
+#    --file '/var/service/ntpd/env/MEMLIMIT' 'attr(0644,root,root)' \
+#    --dir '/var/service/ntpd/log' 'attr(1755,root,root)' \
+#    --file '/var/service/ntpd/log/run' 'attr(0755,root,root)' \
+#    --dir '/var/log/ntpd' 'attr(2750,smelog,nofiles)' \
+#    $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 echo "%doc COPYING"          >> %{name}-%{version}-filelist
 
 %clean