--- rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec	2009/03/09 20:34:06	1.15
+++ rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec	2009/05/26 09:48:21	1.24
@@ -1,4 +1,4 @@
-# $Id: smeserver-openvpn-bridge.spec,v 1.14 2009/03/03 21:36:59 slords Exp $
+# $Id: smeserver-openvpn-bridge.spec,v 1.23 2009/05/26 09:45:06 vip-ire 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.0
-%define release 17
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -33,6 +33,14 @@ Patch16: smeserver-openvpn-bridge-2.0-fi
 Patch17: smeserver-openvpn-bridge-2.0-fix-en-us-locale2.patch
 Patch18: smeserver-openvpn-bridge-2.0-fix-en-us-locale3.patch
 Patch19: smeserver-openvpn-bridge-2.0-locale-2009-03-03.patch
+Patch20: smeserver-openvpn-bridge-2.0-openvpn_2_1_compat.patch
+Patch21: smeserver-openvpn-bridge-2.0-cipher_auto.patch
+Patch22: smeserver-openvpn-bridge-2.0-remove_obsolete_init_scripts.patch
+Patch23: smeserver-openvpn-bridge-2.0-fix_perms_on_pub_dir.patch
+Patch24: smeserver-openvpn-bridge-2.0-locale-2009-04-27.patch
+Patch25: smeserver-openvpn-bridge-2.0-locale-2009-04-30.patch
+Patch26: smeserver-openvpn-bridge-2.0-locale-2009-05-24.patch
+Patch27: smeserver-openvpn-bridge-2.0-locale-2009-05-26.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -51,6 +59,31 @@ This package contains all the needed scr
 to have a full working openvpn server running in bridge mode.
 
 %changelog
+* Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 2.0-25.sme
+- apply loca 2009-05-26 patch
+
+* Sun May 24 2009 Daniel B. <daniel@firewall-services.com> 2.0-24.sme
+- apply locale 2009-05-24 patch
+
+* Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 2.0-23.sme
+- apply local 2009-04-30 patch
+
+* Mon Apr 27 2009 SME Translation Server <translations@contribs.org> 2.0-22.sme
+- apply locale 2009-04-27 patch
+
+* Tue Apr 14 2009 Daniel B. <daniel@firewall-services.com> [2.0-21]
+- Fixe permissions on public directory (pub and ccd) which must be readable
+  by everyone (especially user nobody)
+
+* Sun Apr 12 2009 Daniel B. <daniel@firewall-services.com> [2.0-20]
+- remove obsolete init scripts reset-openvpn and openvpn-bridge
+
+* Wed Mar 18 2009 Daniel B. <daniel@firewall-services.com> [2.0-19]
+- Do not add cipher directive in client configuration file if set to 'auto'
+
+* Wed Mar 11 2009 Daniel B. <daniel@firewall-services.com> [2.0-18]
+- Compatibility with openvpn 2.1 (detect plugin dir location) [SME: 5060]
+
 * Mon Mar 09 2009 Daniel B. <daniel@firewall-services.com> [2.0-17]
 - Add smeserver-bridge-interface as dependency
 - Update spec description
@@ -167,6 +200,14 @@ to have a full working openvpn server ru
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
 
 %build
 perl createlinks
@@ -184,6 +225,9 @@ perl createlinks
   --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 /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)' \
   --file /usr/bin/ovpn-bridge-update-crl  'attr(0750,root,root)' \
   > %{name}-%{version}-filelist