--- rpms/smeserver-openvpn-bridge/contribs10/smeserver-openvpn-bridge.spec	2021/02/13 14:43:54	1.2
+++ rpms/smeserver-openvpn-bridge/contribs10/smeserver-openvpn-bridge.spec	2021/09/08 05:14:42	1.7
@@ -1,4 +1,4 @@
-# $Id: smeserver-openvpn-bridge.spec,v 1.1 2021/02/04 16:20:59 brianr Exp $
+# $Id: smeserver-openvpn-bridge.spec,v 1.6 2021/08/23 01:43:47 terryfage Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,7 +6,7 @@ Summary: OpenVPN, a strong VPN solution
 %define name smeserver-openvpn-bridge
 Name: %{name}
 %define version 2.1
-%define release 11
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -22,6 +22,10 @@ Patch5: smeserver-openvpn-bridge-2.1-loc
 Patch6: smeserver-openvpn-bridge-2.1-push-routes.patch
 Patch7: smeserver-openvpn-bridge-2.1-locale-2019-12-07.patch
 Patch8: smeserver-openvpn-bridge-2.1-Add-in-systemd-startup.patch
+Patch9: smeserver-openvpn-bridge-2.1-bz11335.patch
+Patch10: smeserver-openvpn-bridge-2.1-bz11335-sme10bis.patch
+Patch11: smeserver-openvpn-bridge-2.1-locale-2021-08-23.patch
+Patch12: smeserver-openvpn-bridge-2.1-locale-2021-09-08.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -40,6 +44,27 @@ This package contains all the needed scr
 to have a full working openvpn server running in bridge mode.
 
 %changelog
+* Wed Sep 08 2021 Terry Fage <terry.fage@gmail.com> 2.1-15.sme
+- apply locale 2021-09-08 patch
+
+* Mon Aug 23 2021 Terry Fage <terry.fage@gmail.com> 2.1-14.sme
+- apply locale 2021-08-23 patch
+
+* Wed Mar 31 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.1-13.sme
+- default AES-128-CBC and SHA256 fix [SME: 11335]
+- better frist screen with information on link and hnac and cipher
+- better client default configuration with embded shared key and CAcert
+- migrate cipher to Cipher like routed and s2s usage
+- HMAC and Cipher are accessible to change using the manager.
+- fix typos in translations [SME: 6647]
+
+* Tue Mar 23 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.1-12.sme
+- fix permisison issue on private keys [SME: 11335]
+- rework unit file
+  avoid failure, add ncp cipher, add loging status
+- add default cipher  AES-256-CBC - if issue with older clients < 2.4
+  it is advised to set it to 'auto' or BF-CBC 
+
 * Thu Feb 04 2021 Brian Read <brianr@bjsystems.co.uk> 2.1-11.sme
 - Initial import to SME10 [SME: 11335]
 - Add-in-systemd-startup
@@ -289,6 +314,13 @@ to have a full working openvpn server ru
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+
+rm -rf root/usr/sbin/systemd/
+rm -rf root/var/service/
 
 %build
 perl createlinks
@@ -303,12 +335,9 @@ perl createlinks
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
-/bin/chmod +x $RPM_BUILD_ROOT/usr/sbin/systemd/openvpn-bridge
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-  --file /var/service/openvpn-bridge/run 'attr(0755,root,root)' \
-  --file /var/service/openvpn-bridge/log/run 'attr(0755,root,root)' \
-  --dir /var/log/openvpn-bridge 'attr(0750,smelog,smelog)' \
+  --dir /var/log/openvpn-bridge 'attr(0750,root,root)' \
   --dir /etc/openvpn/bridge/pub 'attr(0755,root,root)' \
   --dir /etc/openvpn/bridge/priv 'attr(0750,root,root)' \
   --dir /etc/openvpn/bridge/ccd 'attr(0755,root,root)' \