rpms/openvpn/devel openvpn.spec,1.24,1.25

[Steven Pritchard (steve)]

Author: steve

Update of /cvs/extras/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17872

Modified Files:
	openvpn.spec 
Log Message:
Randomize ports for tests to avoid conflicts on the build servers.


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openvpn.spec	27 Feb 2007 20:08:35 -0000	1.24
+++ openvpn.spec	28 Feb 2007 01:42:40 -0000	1.25
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.15%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.16%{?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,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* 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