--- rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec	2016/02/05 21:34:35	1.1
+++ rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec	2021/01/03 06:47:48	1.16
@@ -1,15 +1,22 @@
-# $Id: e-smith-radiusd.spec,v 1.13 2013/06/08 09:06:55 vip-ire Exp $
+# $Id: e-smith-radiusd.spec,v 1.15 2021/01/02 05:36:25 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 1
+%define release 13
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch0: e-smith-radiusd-2.6.0-freeradius3.patch
+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
+Patch5: e-smith-radiusd-2.6.0-bz11302.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.13.16-27
 Requires: e-smith-lib >= 1.15.1-16
@@ -25,6 +32,38 @@ BuildArchitectures: noarch
 e-smith server and gateway - configure radius server
 
 %changelog
+* Sun Jan 03 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
+- radiusd needs ldap started before [SME: 11302]
+
+* Sat Jan 02 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+- add Restart=always [SME: 11113]
+  change group of pem file to radiusd
+
+* 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]
+
+* Tue Apr 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+- escaped {} characters in ldap template [SME: 9434]
+
+* Sun Apr 10 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- fix typo [SME: 9434]
+
+* Wed Apr 06 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-6.sme
+- more  adjustements regarding [SME: 9434]
+- e-smith-radiusd-2.6.0-freeradius3bis.patch
+- e-smith-radiusd-2.6.0-freeradius3ter.patch
+
+* Fri Apr 01 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+- fix directorie rpm ownership [SME: 9425]
+
+* Fri Apr 01 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
+- updated syntax and conf files for freeradius3 server [SME: 9409]
+
 * Fri Feb 05 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
 - Initial release to sme10
 
@@ -154,6 +193,14 @@ e-smith server and gateway - configure r
 
 %prep
 %setup
+%patch0 -p1
+%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 
+%patch5 -p1
 
 %build
 perl createlinks
@@ -163,21 +210,31 @@ 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
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
 
 %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)
+
+