--- rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec 2009/03/03 18:52:41 1.11 +++ rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec 2009/06/25 10:41:08 1.25 @@ -1,4 +1,4 @@ -# $Id: smeserver-openvpn-bridge.spec,v 1.10 2009/03/03 18:34:43 snetram Exp $ +# $Id: smeserver-openvpn-bridge.spec,v 1.24 2009/05/26 09:48:21 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 15 +%define release 26 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -31,7 +31,17 @@ Patch14: smeserver-openvpn-bridge-2.0-re Patch15: smeserver-openvpn-bridge-2.0-fixlangtag.patch Patch16: smeserver-openvpn-bridge-2.0-fix-en-us-locale.patch Patch17: smeserver-openvpn-bridge-2.0-fix-en-us-locale2.patch -Patch18: 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 +Patch28: smeserver-openvpn-bridge-2.0-update_networks.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -40,6 +50,7 @@ BuildRequires: e-smith-devtools Requires: e-smith-base Requires: openvpn +Requires: smeserver-bridge-interface Requires: perl(Net::OpenVPN::Manage) Obsoletes: smeserver-openvpn-bridge-fws Obsoletes: smeserver-openvpn-bridge.fws @@ -47,10 +58,44 @@ Obsoletes: smeserver-openvpn-bridge.fws %description This package contains all the needed scripts and templates to have a full working openvpn server running in bridge mode. -The panel of the server manager has a certificate manager so you -won't have to generate them manually %changelog +* Thu Jun 25 2009 Daniel B. 2.0-26.sme +- expand config and restart the service when local networks are added + or removed so the new routes are pushed + +* Tue May 26 2009 Daniel B. 2.0-25.sme +- apply loca 2009-05-26 patch + +* Sun May 24 2009 Daniel B. 2.0-24.sme +- apply locale 2009-05-24 patch + +* Thu Apr 30 2009 Daniel B. 2.0-23.sme +- apply local 2009-04-30 patch + +* Mon Apr 27 2009 SME Translation Server 2.0-22.sme +- apply locale 2009-04-27 patch + +* Tue Apr 14 2009 Daniel B. [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. [2.0-20] +- remove obsolete init scripts reset-openvpn and openvpn-bridge + +* Wed Mar 18 2009 Daniel B. [2.0-19] +- Do not add cipher directive in client configuration file if set to 'auto' + +* Wed Mar 11 2009 Daniel B. [2.0-18] +- Compatibility with openvpn 2.1 (detect plugin dir location) [SME: 5060] + +* Mon Mar 09 2009 Daniel B. [2.0-17] +- Add smeserver-bridge-interface as dependency +- Update spec description + +* Tue Mar 03 2009 SME Translation Server [2.0-16] +- apply locale 2009-03-03 patch + * Tue Mar 03 2009 Jonathan Martens [2.0-15] - Fix some more errors in the en-us locale - Remove tabs from SPEC file as some editors act weird with them, e.g. nano @@ -72,7 +117,7 @@ won't have to generate them manually * Tue Mar 03 2009 Daniel B. [2.0-9] - Apply locale patch fr 1 -- Add e-smith-devtools as a dependencie +- Add e-smith-devtools as a build dependency * Thu Jan 29 2009 Daniel B. [2.0-8] - Fix an error with the creation of the db @@ -158,7 +203,17 @@ won't have to generate them manually %patch15 -p1 %patch16 -p1 %patch17 -p1 -%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 %build perl createlinks @@ -176,6 +231,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