--- rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec 2009/03/03 17:59:19 1.7 +++ rpms/smeserver-openvpn-bridge/contribs7/smeserver-openvpn-bridge.spec 2011/03/06 15:28:11 1.43 @@ -1,4 +1,4 @@ -# $Id: smeserver-openvpn-bridge.spec,v 1.6 2009/03/03 16:39:04 slords Exp $ +# $Id: smeserver-openvpn-bridge.spec,v 1.42 2011/03/01 18:02:24 vip-ire Exp $ # Authority: vip-ire # Name: Daniel Berteaud @@ -6,29 +6,67 @@ Summary: OpenVPN, a strong VPN solution %define name smeserver-openvpn-bridge Name: %{name} %define version 2.0 -%define release 12 +%define release 44 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 -Patch15: smeserver-openvpn-bridge-2.0-fixlangtag.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 +Patch27: smeserver-openvpn-bridge-2.0-locale-2009-05-26.patch +Patch28: smeserver-openvpn-bridge-2.0-update_networks.patch +Patch29: smeserver-openvpn-bridge-2.0-locale-2009-07-22.patch +Patch30: smeserver-openvpn-bridge-2.0-locale-2009-08-24.patch +Patch31: smeserver-openvpn-bridge-2.0-tls_client.patch +Patch32: smeserver-openvpn-bridge-2.0-locale-2009-09-28.patch +Patch33: smeserver-openvpn-bridge-2.0-locale-2009-10-21.patch +Patch34: smeserver-openvpn-bridge-2.0-locale-2009-10-27.patch +Patch35: smeserver-openvpn-bridge-2.0-update_crl.patch +Patch36: smeserver-openvpn-bridge-2.0-locale-2009-11-17.patch +Patch37: smeserver-openvpn-bridge-2.0-code_cleanup1.patch +Patch38: smeserver-openvpn-bridge-2.0-code_cleanup2.patch +Patch39: smeserver-openvpn-bridge-2.0-locale-2010-03-02.patch +Patch40: smeserver-openvpn-bridge-2.0-set_tos.patch +Patch41: smeserver-openvpn-bridge-2.0-push_complzo.patch +Patch42: smeserver-openvpn-bridge-2.0-locale-2010-04-29.patch +Patch43: smeserver-openvpn-bridge-2.0-comment_passtos.patch +Patch44: smeserver-openvpn-bridge-2.0-log_timestamp.patch +Patch45: smeserver-openvpn-bridge-2.0-return_pass_tos_comment.patch +Patch46: smeserver-openvpn-bridge-2.0-locale-2010-06-02.patch +Patch47: smeserver-openvpn-bridge-2.0-locale-2010-07-19.patch +Patch48: smeserver-openvpn-bridge-2.0-templates_cleanup.patch +Patch49: smeserver-openvpn-bridge-2.0-option_to_disable_route_push.patch +Patch50: smeserver-openvpn-bridge-2.0-toggle_passtos.patch +Patch51: smeserver-openvpn-bridge-2.0-enhance_routes_push.patch +Patch52: smeserver-openvpn-bridge-2.0-add_complzo_back.patch +Patch53: smeserver-openvpn-bridge-2.0-locale-2011-03-06.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -37,17 +75,124 @@ 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 Mar 06 2011 SME Translation Server 2.0-44.sme +- apply locale 2011-03-06 patch + +* Thu Feb 17 2011 Daniel B. 2.0-43.sme +- Fix a typo in the panel [SME: 6509] + +* Tue Jan 25 2011 Daniel B. 2.0-42.sme +- Stop disabling service on rpm removal (spec change only) + +* Tue Jan 25 2011 Daniel B. 2.0-41.sme +- Add comp-lzo option back into client conf file + +* Tue Oct 26 2010 Daniel B. 2.0-40.sme +- Add PassTOS DB key to enable/disable passtos +- Enhance routes push (work with s2s contrib) + +* Tue Oct 19 2010 Daniel B. 2.0-39.sme +- templates cleanup +- DB prop to disable local networks routes push to client + +* Mon Jul 19 2010 Daniel B. 2.0-38.sme +- apply locale 2010-07-19 patc + +* Wed Jun 02 2010 Daniel B. 2.0-37.sme +- apply locale 2010-06-02 patch +- use multilog timestamp + +* Wed May 12 2010 Daniel B. 2.0-36.sme +- Comment the passtos option as it's not supported on Windows + +* Fri Apr 30 2010 Daniel B. 2.0-35.sme +- add the passtos option +- push the comp-lzo option to the client +- apply locale 2010-04-29 patch + +* Tue Mar 02 2010 SME Translation Server 2.0-34.sme +- apply locale 2010-03-02 patch + +* Wed Nov 18 2009 Daniel B. 2.0-33.sme +- code cleanup + +* Tue Nov 17 2009 Daniel B. 2.0-32.sme +- apply locale 2009-11-17 patch +- Fix CRL update on event (openvpn-bridge-update) + +* Tue Oct 27 2009 SME Translation Server 2.0-31.sme +- apply locale 2009-10-27 patch + +* Wed Oct 21 2009 Daniel B. 2.0-30.sme +- apply locale 2009-10-21 patch + +* Tue Sep 29 2009 Daniel B. 2.0-29.sme +- Put tls-client directive in client config file even when additional TLS + auth is disabled (required for the main TLS auth) [SME: 5495] +- apply locale 2009-09-28 patch + +* Mon Aug 24 2009 SME Translation Server 2.0-28.sme +- apply locale 2009-08-24 patch + +* Wed Jul 22 2009 Daniel B. 2.0-27.sme +- apply locale 2009-07-22 patch + +* 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 locale 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 + +* 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 @@ -59,7 +204,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 @@ -143,6 +288,44 @@ won't have to generate them manually %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 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 +%patch46 -p1 +%patch47 -p1 +%patch48 -p1 +%patch49 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 %build perl createlinks @@ -157,11 +340,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) @@ -173,10 +359,3 @@ rm -rf $RPM_BUILD_ROOT %post %preun -if [ $1 -eq 0 ] ; then - /sbin/e-smith/db configuration setprop openvpn-bridge status disabled - sv d /service/openvpn-bridge -fi - -true -