--- rpms/smeserver-openvpn-s2s/contribs10/smeserver-openvpn-s2s.spec 2021/03/30 06:47:35 1.4 +++ rpms/smeserver-openvpn-s2s/contribs10/smeserver-openvpn-s2s.spec 2022/11/29 20:30:06 1.12 @@ -1,4 +1,4 @@ -# $Id: smeserver-openvpn-s2s.spec,v 1.3 2021/03/30 05:07:27 jpp Exp $ +# $Id: smeserver-openvpn-s2s.spec,v 1.11 2022/11/18 06:24:45 jpp Exp $ # Authority: vip-ire # Name: Daniel Berteaud @@ -6,7 +6,7 @@ Summary: OpenVPN, a strong VPN solution %define name smeserver-openvpn-s2s Name: %{name} %define version 0.2 -%define release 11 +%define release 19 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -20,6 +20,11 @@ Patch3: smeserver-openvpn-s2s-0.2-fix_da Patch4: smeserver-openvpn-s2s-0.2-locale-2017-12-02.patch Patch5: smeserver-openvpn-s2s-0.2-Alter-for-systemd-startup.patch Patch6: smeserver-openvpn-s2s-0.2-sme10.patch +Patch7: smeserver-openvpn-s2s-0.2-locale-2021-08-23.patch +Patch8: smeserver-openvpn-s2s-0.2-locale-2021-09-08.patch +Patch9: smeserver-openvpn-s2s-0.2-bz12019-backup.patch +Patch10: smeserver-openvpn-s2s-0.2-bz12224.patch +Patch11: smeserver-openvpn-s2s-0.2-bz12244-log.patch BuildArchitectures: noarch @@ -34,6 +39,30 @@ This package contains all the needed scr to run openvpn in client or server mode for site to site tunnels %changelog +* Tue Nov 29 2022 Jean-Philippe Pialasse 0.2-19.sme +- log in locale time [SME: 12244] + +* Fri Nov 18 2022 Jean-Philippe Pialasse 0.2-18.sme +- improve panel display [SME: 12224] + +* Sat Jul 30 2022 Brian Read 0.2-17.sme +- Re-build and link to latest devtools [SME: 11997] + +* Sat Jul 23 2022 Jean-Philippe Pialasse 0.2-16.sme +- add to core backup [SME: 12019] + +* Wed Sep 08 2021 Terry Fage 0.2-14.sme +- apply locale 2021-09-08 patch + +* Mon Aug 23 2021 Terry Fage 0.2-14.sme +- apply locale 2021-08-23 patch + +* Thu Apr 01 2021 Jean-Philippe Pialasse 0.2-13.sme +- Re-build and link to latest devtools permission on log dir [SME: 11516] + +* Wed Mar 31 2021 Jean-Philippe Pialasse 0.2-12.sme +- Re-build and link to latest devtools typos [SME: 11498] + * Tue Mar 30 2021 Jean-Philippe Pialasse 0.2-11.sme - enforce better cipher with settings [SME: 11498] - enforce better HMAC with setting [SME: 11498] @@ -41,7 +70,7 @@ to run openvpn in client or server mode - enforce strong TLS ciphers with setting [SME: 11498] - better list of vpn connections [SME: 11337] - allow soft reload of individual connection [SME: 11337] -- fix incorect permission on private keys [SME: 11337] +- Re-build and link to latest devtools incorect permission on private keys [SME: 11337] * Thu Feb 04 2021 Brian Read 0.2-9.sme - Initial import to SME10 [SME: 11337] @@ -155,6 +184,11 @@ to run openvpn in client or server mode %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 %build perl createlinks @@ -163,6 +197,7 @@ perl createlinks %{__mkdir_p} root/etc/openvpn/s2s/pub %{__mkdir_p} root/etc/openvpn/s2s/tmp %{__mkdir_p} root/etc/openvpn/s2s/dev +%{__mkdir_p} root/etc/openvpn/s2s/etc %{__mkdir_p} root/var/run/openvpn-s2s %{__mkdir_p} root/var/log/openvpn-s2s @@ -175,14 +210,14 @@ perl createlinks --dir /etc/openvpn/s2s/pub 'attr(0755,root,root)' \ --dir /etc/openvpn/s2s/priv 'attr(0750,root,root)' \ --dir /etc/openvpn/s2s/tmp 'attr(0750,root,root)' \ - --dir /var/log/openvpn-s2s 'attr(0770,root,nobody)' \ + --dir /etc/openvpn/s2s/etc 'attr(0750,root,root)' \ + --dir /var/log/openvpn-s2s 'attr(0770,root,root)' \ --file /etc/openvpn/s2s/bin/up 'attr(4750,root,openvpn)' \ > %{name}-%{version}-filelist %files -f %{name}-%{version}-filelist %defattr(-,root,root) - %clean rm -rf $RPM_BUILD_ROOT @@ -190,6 +225,5 @@ rm -rf $RPM_BUILD_ROOT if [ \! -c /etc/openvpn/s2s/dev/urandom ]; then mknod -m 0444 /etc/openvpn/s2s/dev/urandom c 1 9 fi - +#chown root:root /var/log/openvpn-s2s %preun -