--- rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec	2019/12/19 06:00:24	1.9
+++ rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec	2020/12/09 22:30:03	1.14
@@ -1,10 +1,10 @@
-# $Id: e-smith-radiusd.spec,v 1.8 2016/04/12 10:16:09 unnilennium Exp $
+# $Id: e-smith-radiusd.spec,v 1.13 2020/12/09 02:51:41 jpp Exp $
 
 Summary: e-smith server and gateway - configure PPTP inbound VPN
 %define name e-smith-radiusd
 Name: %{name}
 %define version 2.6.0
-%define release 9
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,7 @@ Patch0: e-smith-radiusd-2.6.0-freeradius
 Patch1: e-smith-radiusd-2.6.0-freeradius3bis.patch
 Patch2: e-smith-radiusd-2.6.0-freeradius3ter.patch
 Patch3: e-smith-radiusd-2.6.0-bz10853.patch
+Patch4: e-smith-radiusd-2.6.0-bz11113-bz11155-systemd-update.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.13.16-27
@@ -30,6 +31,11 @@ BuildArchitectures: noarch
 e-smith server and gateway - configure radius server
 
 %changelog
+* Tue Dec 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+- create -update event [SME: 11155]
+- move radiusd to systemd {SME: 11113]
+  remove noise from spec file 
+
 * Thu Dec 19 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
 - fix server restartting with virtual_server error  [SME: 10853]
 
@@ -183,6 +189,9 @@ e-smith server and gateway - configure r
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+rm -rf root/service root/var/service root/var/log/radiusd
+mkdir -p root/var/log/stunnel/ssl 
 
 %build
 perl createlinks
@@ -192,12 +201,11 @@ rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-%{release}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+    --file /sbin/e-smith/systemd/radiusd-configure 'attr(0554,root,root)' \
+    --file /sbin/e-smith/systemd/radiusd-certificate 'attr(0554,root,root)' \
     --dir /var/service/radiusd 'attr(01755,root,root)' \
-    --file /var/service/radiusd/down 'attr(0644,root,root)' \
-    --file /var/service/radiusd/run 'attr(0755,root,root)' \
-    --file /var/service/radiusd/log/run 'attr(0755,root,root)' \
-    --dir /var/service/radiusd/supervise 'attr(0700,root,root)' \
-    --dir /var/log/radiusd 'attr(0755,smelog,smelog)' \
+    --dir /var/log/stunnel 'attr(0755,stunnel,stunnel)' \
+    --dir /var/log/stunnel/ssl 'attr(0755,stunnel,stunnel)' \
  |sed -e '/%dir %attr(0755,root,root) \/etc\/raddb/d' \
  |sed  -e '/%dir %attr(0755,root,root) \/etc\/raddb\/mods-enabled/d' \
     > %{name}-%{version}-%{release}-filelist
@@ -205,10 +213,19 @@ echo "%doc COPYING" >> %{name}-%{version
 
 %pre
 /sbin/e-smith/create-system-user stunnel %{stunnelid} \
-    'chrooted stunnel user user' /var/log/imap/ssl /bin/false
+    'chrooted stunnel user user' /var/log/stunnel/ssl /bin/false
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/radiusd/run ] ; then
+        /usr/bin/sv d radiusd
+        /usr/bin/sv d radiusd/log
+  fi
+fi
+
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)
+
+