--- rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec 2009/03/03 16:39:04 1.6 +++ rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec 2009/05/24 21:03:27 1.22 @@ -1,4 +1,4 @@ -# $Id: smeserver-openvpn-bridge.spec,v 1.5 2009/03/03 16:02:16 slords Exp $ +# $Id: smeserver-openvpn-bridge.spec,v 1.21 2009/04/30 10:41:08 vip-ire Exp $ # Authority: vip-ire # Name: Daniel Berteaud @@ -6,28 +6,40 @@ Summary: OpenVPN, a strong VPN solution %define name smeserver-openvpn-bridge Name: %{name} %define version 2.0 -%define release 11 +%define release 24 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Remote access Source: %{name}-%{version}.tar.gz -Patch0: smeserver-openvpn-bridge-2.0-remove_dup_migrate.patch -Patch1: smeserver-openvpn-bridge-2.0-pull.patch -Patch2: smeserver-openvpn-bridge-2.0-config_required.patch -Patch3: smeserver-openvpn-bridge-2.0-config_cleanup.patch -Patch4: smeserver-openvpn-bridge-2.0-add_rule.patch -Patch5: smeserver-openvpn-bridge-2.0-locale1.patch -#Patch6: smeserver-openvpn-bridge-2.0-openvpn_db.patch -Patch7: smeserver-openvpn-bridge-2.0-check_certs.patch -Patch8: smeserver-openvpn-bridge-2.0-check_bridge.patch -Patch9: smeserver-openvpn-bridge-2.0-configure_crl_url.patch -Patch10: smeserver-openvpn-bridge-2.0-check_certs.patch2 -Patch11: smeserver-openvpn-bridge-2.0-create_openvpn_db.patch -Patch12: smeserver-openvpn-bridge-2.0-local_fr_1.patch -Patch13: smeserver-openvpn-bridge-2.0-fixtranslation.patch -Patch14: smeserver-openvpn-bridge-2.0-removedups.patch +Patch0: smeserver-openvpn-bridge-2.0-remove_dup_migrate.patch +Patch1: smeserver-openvpn-bridge-2.0-pull.patch +Patch2: smeserver-openvpn-bridge-2.0-config_required.patch +Patch3: smeserver-openvpn-bridge-2.0-config_cleanup.patch +Patch4: smeserver-openvpn-bridge-2.0-add_rule.patch +Patch5: smeserver-openvpn-bridge-2.0-locale1.patch +#atch6: smeserver-openvpn-bridge-2.0-openvpn_db.patch +Patch7: smeserver-openvpn-bridge-2.0-check_certs.patch +Patch8: smeserver-openvpn-bridge-2.0-check_bridge.patch +Patch9: smeserver-openvpn-bridge-2.0-configure_crl_url.patch +Patch10: smeserver-openvpn-bridge-2.0-check_certs.patch2 +Patch11: smeserver-openvpn-bridge-2.0-create_openvpn_db.patch +Patch12: smeserver-openvpn-bridge-2.0-local_fr_1.patch +Patch13: smeserver-openvpn-bridge-2.0-fixtranslation.patch +Patch14: smeserver-openvpn-bridge-2.0-removedups.patch +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-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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -36,17 +48,58 @@ 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 +Obsoletes: smeserver-openvpn-bridge-fws +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 +* 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 + +* Tue Mar 03 2009 Jonathan Martens [2.0-14] +- Fix some grammar errors in the en-us locale + +* Tue Mar 03 2009 Jonathan Martens [2.0-13] +- Fix a typo in the en-us locale + +* Tue Mar 03 2009 Shad L. Lords [2.0-12] +- Fix xml language tag to be correct + * Tue Mar 03 2009 Shad L. Lords [2.0-11] - Remove duplicate translations that break pootle @@ -55,7 +108,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 @@ -138,6 +191,18 @@ won't have to generate them manually %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 %build perl createlinks @@ -152,11 +217,14 @@ perl createlinks (cd root ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT) /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)' \ - --file /usr/bin/ovpn-bridge-update-crl 'attr(0750,root,root)' \ - > %{name}-%{version}-filelist + --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 %files -f %{name}-%{version}-filelist %defattr(-,root,root) @@ -169,9 +237,8 @@ rm -rf $RPM_BUILD_ROOT %preun if [ $1 -eq 0 ] ; then - /sbin/e-smith/db configuration setprop openvpn-bridge status disabled - sv d /service/openvpn-bridge + /sbin/e-smith/db configuration setprop openvpn-bridge status disabled + sv d /service/openvpn-bridge fi true -