--- rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec 2020/12/09 02:38:43 1.11 +++ rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec 2021/11/18 22:28:12 1.24 @@ -1,10 +1,10 @@ -# $Id: e-smith-radiusd.spec,v 1.10 2020/12/09 02:33:21 jpp Exp $ +# $Id: e-smith-radiusd.spec,v 1.23 2021/11/15 17:12:22 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 21 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -15,6 +15,13 @@ 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 +Patch7: e-smith-radiusd-2.6.0-bz11718-WAP-auth.patch +Patch8: e-smith-radiusd-2.6.0-bz11719-LDAP-auth.patch +Patch9: e-smith-radiusd-2.6.0-bz11735-PAP-auth.patch +Patch10: e-smith-radiusd-2.6.0-bz11735-add_DB_prop_PAP_auth.patch +Patch11: e-smith-radiusd-2.6.0-bz11736-startuperror.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: e-smith-base >= 4.13.16-27 @@ -31,9 +38,43 @@ BuildArchitectures: noarch e-smith server and gateway - configure radius server %changelog -* Tue Dec 08 2020 Jean-Philipe Pialasse 2.6.0-10.sme +* Thu Nov 18 2021 Terry Fage 2.6.0-21.sme +- fix startup informational message Duplicate Auth-Type 'REJECT' [SME: 11736] +- patch was blank, populate and apply [SME: 11736] + +* Mon Nov 15 2021 John H. Bennett III 2.6.0-20.sme +- fix startup informational message Duplicate Auth-Type 'REJECT' [SME: 11736] + +* Mon Nov 08 2021 John H. Bennett III 2.6.0-19.sme +- add db property PAP-auth [SME: 11735] + +* Sat Nov 06 2021 John H. Bennett III 2.6.0-18.sme +- add/fix PAP-auth patch [SME: 11735] + +* Thu Nov 04 2021 John H. Bennett III 2.6.0-17.sme +- fix WAP-auth patch [SME: 11718] +- fix LDAP-auth patch [SME: 11719] + +* 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] @@ -189,7 +230,15 @@ e-smith server and gateway - configure r %patch2 -p1 %patch3 -p1 %patch4 -p1 -rm -rf root/service root/var/service +rm -rf root/service root/var/service root/var/log/radiusd +mkdir -p root/var/log/stunnel/ssl +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 %build perl createlinks @@ -204,7 +253,6 @@ rm -f %{name}-%{version}-%{release}-file --dir /var/service/radiusd 'attr(01755,root,root)' \ --dir /var/log/stunnel 'attr(0755,stunnel,stunnel)' \ --dir /var/log/stunnel/ssl 'attr(0755,stunnel,stunnel)' \ - --dir /var/log/radiusd 'attr(0755,smelog,smelog)' \ |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 @@ -218,10 +266,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 - fi - fi @@ -230,5 +274,3 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root) - -