--- rpms/smeserver-openvpn-s2s/contribs10/smeserver-openvpn-s2s.spec 2021/03/31 20:54:55 1.5 +++ rpms/smeserver-openvpn-s2s/contribs10/smeserver-openvpn-s2s.spec 2021/08/23 02:19:38 1.7 @@ -1,4 +1,4 @@ -# $Id: smeserver-openvpn-s2s.spec,v 1.4 2021/03/30 06:47:35 jpp Exp $ +# $Id: smeserver-openvpn-s2s.spec,v 1.6 2021/04/02 02:12:09 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 12 +%define release 14 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -20,6 +20,7 @@ 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 BuildArchitectures: noarch @@ -34,6 +35,12 @@ This package contains all the needed scr to run openvpn in client or server mode for site to site tunnels %changelog +* 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 +- fix permission on log dir [SME: 11516] + * Wed Mar 31 2021 Jean-Philippe Pialasse 0.2-12.sme - fix typos [SME: 11498] @@ -158,6 +165,7 @@ to run openvpn in client or server mode %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build perl createlinks @@ -178,14 +186,13 @@ 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 /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 @@ -193,6 +200,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 -