rpms/openvpn/FC-5 .cvsignore, 1.12, 1.13 openvpn.spec, 1.18, 1.19 sources, 1.12, 1.13

[Steven Pritchard (steve)]

Author: steve

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

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Sync with devel branch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Apr 2006 13:37:48 -0000	1.12
+++ .cvsignore	6 Mar 2007 00:10:55 -0000	1.13
@@ -1,2 +1,2 @@
-openvpn-2.1_beta14.tar.gz
-openvpn-2.1_beta14.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-5/openvpn.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openvpn.spec	14 Apr 2006 13:37:48 -0000	1.18
+++ openvpn.spec	6 Mar 2007 00:10:55 -0000	1.19
@@ -1,10 +1,10 @@
-%define prerelease beta14
+%define prerelease rc2
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.10%{?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,30 @@
 %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)
+
+* Tue Sep 12 2006 Steven Pritchard <steve at kspei.com> 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 <steve at kspei.com> 2.1-0.12.beta14
+- Rebuild
+
+* Mon Jul 31 2006 Steven Pritchard <steve at kspei.com> 2.1-0.11.beta14
+- Rebuild
+
 * Fri Apr 14 2006 Steven Pritchard <steve at kspei.com> 2.1-0.10.beta14
 - Update to 2.1_beta14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Apr 2006 13:37:48 -0000	1.12
+++ sources	6 Mar 2007 00:10:55 -0000	1.13
@@ -1,2 +1,2 @@
-7bd96eaa834a1779755d68c9b2591583  openvpn-2.1_beta14.tar.gz
-835dab606f9f72c610b4f52e541ae5fd  openvpn-2.1_beta14.tar.gz.asc
+853c81d2de51d85b5381d4c7f7f074e3  openvpn-2.1_rc2.tar.gz
+4b4319498804b4365fd5c1d3a02e4f3f  openvpn-2.1_rc2.tar.gz.asc