rpms/openvpn/devel openvpn-2.1_beta15-test-timeout.patch, NONE, 1.1 openvpn.spec, 1.21, 1.22

[Steven Pritchard (steve)]

Author: steve

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

Modified Files:
	openvpn.spec 
Added Files:
	openvpn-2.1_beta15-test-timeout.patch 
Log Message:
Add openvpn-2.1_beta15-test-timeout.patch to avoid test hang (from Paul Howarth).

openvpn-2.1_beta15-test-timeout.patch:

--- NEW FILE openvpn-2.1_beta15-test-timeout.patch ---
--- openvpn-2.1_beta15/sample-config-files/loopback-client	2006-09-12 18:21:43.000000000 +0100
+++ openvpn-2.1_beta15/sample-config-files/loopback-client	2006-09-12 18:22:40.000000000 +0100
@@ -22,4 +22,4 @@
 cert sample-keys/client.crt
 cipher DES-EDE3-CBC
 ping 1
-inactive 120
+inactive 120 10000000
--- openvpn-2.1_beta15/sample-config-files/loopback-server	2006-09-12 18:21:50.000000000 +0100
+++ openvpn-2.1_beta15/sample-config-files/loopback-server	2006-09-12 18:22:51.000000000 +0100
@@ -23,4 +23,4 @@
 cert sample-keys/server.crt
 cipher DES-EDE3-CBC
 ping 1
-inactive 120
+inactive 120 10000000


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openvpn.spec	12 Sep 2006 18:55:50 -0000	1.21
+++ openvpn.spec	12 Sep 2006 22:53:18 -0000	1.22
@@ -15,6 +15,8 @@
 Source3:           roadwarrior-client.conf
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
+# Avoid test hang (from Paul Howarth).
+Patch1:            openvpn-2.1_beta15-test-timeout.patch
 License:           GPL
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
@@ -43,6 +45,7 @@
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease:_%{prerelease}}
 %patch0 -p0
+%patch1 -p1
 sed -i -e 's,%{_datadir}/openvpn/plugin,%{_libdir}/openvpn/plugin,' openvpn.8
 
 # %%doc items shouldn't be executable.
@@ -134,6 +137,8 @@
 %changelog
 * 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