--- rpms/smeserver-openvpn-s2s/contribs10/smeserver-openvpn-s2s.spec	2021/03/30 05:07:27	1.3
+++ rpms/smeserver-openvpn-s2s/contribs10/smeserver-openvpn-s2s.spec	2022/07/30 17:38:35	1.10
@@ -1,4 +1,4 @@
-# $Id: smeserver-openvpn-s2s.spec,v 1.2 2021/02/05 12:17:48 brianr Exp $
+# $Id: smeserver-openvpn-s2s.spec,v 1.9 2022/07/24 03:17:14 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 10
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -20,6 +20,9 @@ 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
 
 BuildArchitectures: noarch
 
@@ -34,14 +37,32 @@ This package contains all the needed scr
 to run openvpn in client or server mode for site to site tunnels
 
 %changelog
-* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.2-10.sme
+* Sat Jul 30 2022 Brian Read <brianr@bjsystems.co.uk> 0.2-17.sme
+- Re-build and link to latest devtools [SME: 11997]
+
+* Sat Jul 23 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.2-16.sme
+- add to core backup [SME: 12019]
+
+* Wed Sep 08 2021 Terry Fage <terry.fage@gmail.com> 0.2-14.sme
+- apply locale 2021-09-08 patch
+
+* Mon Aug 23 2021 Terry Fage <terry.fage@gmail.com> 0.2-14.sme
+- apply locale 2021-08-23 patch
+
+* Thu Apr 01 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.2-13.sme
+- Re-build and link to latest devtools permission on log dir [SME: 11516]
+
+* Wed Mar 31 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.2-12.sme
+- Re-build and link to latest devtools typos [SME: 11498]
+
+* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.2-11.sme
 - enforce better cipher with settings [SME: 11498]
 - enforce better HMAC with setting [SME: 11498]
 - enforce TLS 1.2 or better with setting [SME: 11498]
 - 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 <brianr@bjsystems.co.uk> 0.2-9.sme
 - Initial import to SME10 [SME: 11337]
@@ -155,6 +176,9 @@ to run openvpn in client or server mode
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 perl createlinks
@@ -175,14 +199,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
 
@@ -190,6 +213,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
-