From 1ccdee732c2a2866b5282de08ad5a5b0a9bb1df2 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Mar 21 2007 22:11:49 +0000 Subject: Sync with EL-5. --- diff --git a/.cvsignore b/.cvsignore index 7fe58af..9b979c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -openvpn-2.0.7.tar.gz -openvpn-2.0.7.tar.gz.asc +openvpn-2.1_rc2.tar.gz +openvpn-2.1_rc2.tar.gz.asc diff --git a/openvpn.spec b/openvpn.spec index c2b52d0..2e92216 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -1,12 +1,15 @@ +%define prerelease rc2 + %define plugins down-root auth-pam Name: openvpn -Version: 2.0.7 -Release: 1%{?dist} +Version: 2.1 +Release: 0.17%{?prerelease:.%{prerelease}}%{?dist} Summary: A full-featured SSL VPN solution URL: http://openvpn.net/ -Source0: http://openvpn.net/release/%{name}-%{version}.tar.gz -Source1: http://openvpn.net/signatures/%{name}-%{version}.tar.gz.asc +Source0: http://openvpn.net/release/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz +#Source0: http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz +Source1: http://openvpn.net/signatures/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz.asc # Sample 2.0 config files Source2: roadwarrior-server.conf Source3: roadwarrior-client.conf @@ -38,7 +41,7 @@ port. It can use the Marcus Franz Xaver Johannes Oberhumer's LZO library for compression. %prep -%setup -q -n %{name}-%{version}%{?prever:_%{prever}} +%setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}} %patch0 -p0 sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8 @@ -64,11 +67,28 @@ done ./openvpn --genkey --secret key ./openvpn --test-crypto --secret key +# Randomize ports for tests to avoid conflicts on the build servers. +cport=$[ 50000 + ($RANDOM % 15534) ] +sport=$[ $cport + 1 ] +sed -e 's/^\(rport\) .*$/\1 '$sport'/' \ + -e 's/^\(lport\) .*$/\1 '$cport'/' \ + < sample-config-files/loopback-client \ + > %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-client +sed -e 's/^\(rport\) .*$/\1 '$cport'/' \ + -e 's/^\(lport\) .*$/\1 '$sport'/' \ + < sample-config-files/loopback-server \ + > %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-server + # Test SSL/TLS negotiations (runs for 2 minutes): -./openvpn --config sample-config-files/loopback-client & -./openvpn --config sample-config-files/loopback-server +./openvpn --config \ + %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-client & +./openvpn --config \ + %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-server wait +rm -f %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-client \ + %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u})-loopback-server + %install rm -rf $RPM_BUILD_ROOT @@ -129,23 +149,62 @@ fi %config %dir %{_sysconfdir}/%{name}/ %changelog -* Wed Apr 12 2006 Steven Pritchard 2.0.7-1 -- Update to 2.0.7 +* Fri Mar 02 2007 Steven Pritchard 2.1-0.17.rc2 +- Update to 2.1_rc2 + +* Tue Feb 27 2007 Steven Pritchard 2.1-0.16.rc1 +- Randomize ports for tests to avoid conflicts on the build servers + +* Tue Feb 27 2007 Steven Pritchard 2.1-0.15.rc1 +- Update to 2.1_rc1 + +* Mon Oct 02 2006 Steven Pritchard 2.1-0.14.beta16 +- Update to 2.1_beta16 +- Drop Paul's patch (in upstream) + +* Tue Sep 12 2006 Steven Pritchard 2.1-0.13.beta15 +- Update to 2.1_beta15 +- Add openvpn-2.1_beta15-test-timeout.patch to avoid test hang + (from Paul Howarth) + +* Mon Aug 28 2006 Steven Pritchard 2.1-0.12.beta14 +- Rebuild -* Wed Apr 05 2006 Steven Pritchard 2.0.6-1 -- Update to 2.0.6 (BZ#188050/CVE-2006-1629) +* Mon Jul 31 2006 Steven Pritchard 2.1-0.11.beta14 +- Rebuild -* Wed Jan 04 2006 Steven Pritchard 2.0.5-3 +* Fri Apr 14 2006 Steven Pritchard 2.1-0.10.beta14 +- Update to 2.1_beta14 + +* Wed Apr 12 2006 Steven Pritchard 2.1-0.9.beta13 +- Update to 2.1_beta13 + +* Wed Apr 05 2006 Steven Pritchard 2.1-0.8.beta12 +- Update to 2.1_beta12 (BZ#188050/CVE-2006-1629) + +* Tue Feb 21 2006 Steven Pritchard 2.1-0.7.beta11 +- Update to 2.1_beta11 + +* Tue Feb 14 2006 Steven Pritchard 2.1-0.6.beta8 +- Update to 2.1_beta8 + +* Wed Jan 04 2006 Steven Pritchard 2.1-0.5.beta7 - Man page shouldn't be executable (BZ#176953) -* Tue Nov 08 2005 Steven Pritchard 2.0.5-2 +* Tue Dec 06 2005 Steven Pritchard 2.1-0.4.beta7 +- Rebuild + +* Fri Nov 18 2005 Steven Pritchard 2.1-0.3.beta7 +- Update to 2.1_beta7 + +* Tue Nov 08 2005 Steven Pritchard 2.1-0.2.beta6 - Make sample-scripts (etc.) non-executable to avoid some dependencies -* Fri Nov 04 2005 Steven Pritchard 2.0.5-1 -- Update to 2.0.5 +* Wed Nov 02 2005 Steven Pritchard 2.1-0.1.beta6 +- Update to 2.1_beta6 -* Wed Nov 02 2005 Steven Pritchard 2.0.4-1 -- Update to 2.0.4 +* Mon Oct 17 2005 Steven Pritchard 2.1-0.1.beta4 +- Update to 2.1_beta4 * Thu Aug 25 2005 Steven Pritchard 2.0.2-1 - Update to 2.0.2 diff --git a/sources b/sources index f3132ac..95828a0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -93528233f1f6d02fc18e2c00f82e0aca openvpn-2.0.7.tar.gz -f1715e85764289b5fa5f784857dcbc31 openvpn-2.0.7.tar.gz.asc +853c81d2de51d85b5381d4c7f7f074e3 openvpn-2.1_rc2.tar.gz +4b4319498804b4365fd5c1d3a02e4f3f openvpn-2.1_rc2.tar.gz.asc