--- rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec 2020/12/09 02:51:41 1.13 +++ rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec 2021/08/23 04:29:32 1.19 @@ -1,10 +1,10 @@ -# $Id: e-smith-radiusd.spec,v 1.12 2020/12/09 02:48:39 jpp Exp $ +# $Id: e-smith-radiusd.spec,v 1.18 2021/06/02 14:51:18 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 10 +%define release 16 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -15,6 +15,8 @@ Patch1: e-smith-radiusd-2.6.0-freeradius 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 +Patch6: e-smith-radiusd-2.6.0-bz11602-ssl-template.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: e-smith-base >= 4.13.16-27 @@ -31,9 +33,26 @@ BuildArchitectures: noarch e-smith server and gateway - configure radius server %changelog -* Tue Dec 08 2020 Jean-Philipe Pialasse 2.6.0-10.sme +* Mon Aug 23 2021 Jean-Philippe Pialasse 2.6.0-16.sme +- fix ssl template metadata patch [SME: 11680] + +* Wed Jun 02 2021 Jean-Philippe Pialasse 2.6.0-15.sme +- remove services2adjust in bootstrap-console-save event, this put systemd in a loop [SME: 11602] + +* Mon May 31 2021 Jean-Philippe Pialasse 2.6.0-14.sme +- ssl pem using template in place of copy [SME: 11602] + +* Sun Jan 03 2021 Jean-Philipe Pialasse 2.6.0-13.sme +- radiusd needs ldap started before [SME: 11302] + +* Sat Jan 02 2021 Jean-Philipe Pialasse 2.6.0-12.sme +- add Restart=always [SME: 11113] + change group of pem file to radiusd + +* Tue Dec 08 2020 Jean-Philipe Pialasse 2.6.0-11.sme - create -update event [SME: 11155] -- move radiusd to systemd {SME: 11113] +- move radiusd to systemd {SME: 11113] + remove noise from spec file * Thu Dec 19 2019 Jean-Philipe Pialasse 2.6.0-9.sme - fix server restartting with virtual_server error [SME: 10853] @@ -191,6 +210,8 @@ e-smith server and gateway - configure r %patch4 -p1 rm -rf root/service root/var/service root/var/log/radiusd mkdir -p root/var/log/stunnel/ssl +%patch5 -p1 +%patch6 -p1 %build perl createlinks @@ -218,10 +239,6 @@ if [ $1 -gt 1 ] ; then /usr/bin/sv d radiusd /usr/bin/sv d radiusd/log fi - if [ -e /var/service/radiusd ] ; then - rm -rf /var/service/radiusd >/dev/null 2>&1 - fi - fi