--- rpms/smeserver-openvpn-bridge/contribs10/smeserver-openvpn-bridge.spec	2021/02/04 16:20:59	1.1
+++ rpms/smeserver-openvpn-bridge/contribs10/smeserver-openvpn-bridge.spec	2021/03/23 20:50:08	1.3
@@ -1,4 +1,4 @@
-# $Id: smeserver-openvpn-bridge.spec,v 1.11 2019/12/07 04:04:55 jpp Exp $
+# $Id: smeserver-openvpn-bridge.spec,v 1.2 2021/02/13 14:43:54 brianr 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 10
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -21,6 +21,8 @@ Patch4: smeserver-openvpn-bridge-2.1-loc
 Patch5: smeserver-openvpn-bridge-2.1-locale-2017-12-02.patch
 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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -39,6 +41,17 @@ This package contains all the needed scr
 to have a full working openvpn server running in bridge mode.
 
 %changelog
+* 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
+
 * Sat Dec 07 2019 SME Translation Server <translations@contribs.org> 2.1-10.sme
 - apply locale 2019-12-07 patch
 
@@ -283,6 +296,11 @@ to have a full working openvpn server ru
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
+rm -rf root/usr/sbin/systemd/
+rm -rf root/var/service/
 
 %build
 perl createlinks
@@ -297,11 +315,10 @@ 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)' \