rpms/openvpn/FC-6 .cvsignore, 1.14, 1.15 openvpn.spec, 1.23, 1.24 sources, 1.14, 1.15 openvpn-2.1_beta15-test-timeout.patch, 1.1, NONE

[Steven Pritchard (steve)]

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14327

Modified Files:
	.cvsignore openvpn.spec sources 
Removed Files:
	openvpn-2.1_beta15-test-timeout.patch 
Log Message:
Sync with devel branch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 Oct 2006 14:49:18 -0000	1.14
+++ .cvsignore	3 Mar 2007 21:11:53 -0000	1.15
@@ -1,2 +1,2 @@
-openvpn-2.1_beta16.tar.gz
-openvpn-2.1_beta16.tar.gz.asc
+openvpn-2.1_rc2.tar.gz
+openvpn-2.1_rc2.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-6/openvpn.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- openvpn.spec	3 Oct 2006 14:49:18 -0000	1.23
+++ openvpn.spec	3 Mar 2007 21:11:53 -0000	1.24
@@ -1,10 +1,10 @@
-%define prerelease beta16
+%define prerelease rc2
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.14%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.17%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 Source0:           http://openvpn.net/release/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -67,11 +67,28 @@
 ./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
 
@@ -132,6 +149,15 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Fri Mar 02 2007 Steven Pritchard <steve at kspei.com> 2.1-0.17.rc2
+- Update to 2.1_rc2
+
+* Tue Feb 27 2007 Steven Pritchard <steve at kspei.com> 2.1-0.16.rc1
+- Randomize ports for tests to avoid conflicts on the build servers
+
+* Tue Feb 27 2007 Steven Pritchard <steve at kspei.com> 2.1-0.15.rc1
+- Update to 2.1_rc1
+
 * Mon Oct 02 2006 Steven Pritchard <steve at kspei.com> 2.1-0.14.beta16
 - Update to 2.1_beta16
 - Drop Paul's patch (in upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Oct 2006 14:49:18 -0000	1.14
+++ sources	3 Mar 2007 21:11:53 -0000	1.15
@@ -1,2 +1,2 @@
-3a53f55dafcfa4aab9e408e36326e236  openvpn-2.1_beta16.tar.gz
-4529dc8c27ea67783b333dc586a909ef  openvpn-2.1_beta16.tar.gz.asc
+853c81d2de51d85b5381d4c7f7f074e3  openvpn-2.1_rc2.tar.gz
+4b4319498804b4365fd5c1d3a02e4f3f  openvpn-2.1_rc2.tar.gz.asc


--- openvpn-2.1_beta15-test-timeout.patch DELETED ---