From 594712d6007f01171dbb4a436fd5d992aff1e8d5 Mon Sep 17 00:00:00 2001
From: Steven Pritchard <steve@fedoraproject.org>
Date: Tue, 12 Sep 2006 22:53:18 +0000
Subject: [PATCH] Add openvpn-2.1_beta15-test-timeout.patch to avoid test hang
 (from Paul     Howarth).

---
 openvpn-2.1_beta15-test-timeout.patch | 16 ++++++++++++++++
 openvpn.spec                          |  5 +++++
 2 files changed, 21 insertions(+)
 create mode 100644 openvpn-2.1_beta15-test-timeout.patch

diff --git a/openvpn-2.1_beta15-test-timeout.patch b/openvpn-2.1_beta15-test-timeout.patch
new file mode 100644
index 0000000..52a7eaa
--- /dev/null
+++ b/openvpn-2.1_beta15-test-timeout.patch
@@ -0,0 +1,16 @@
+--- 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
diff --git a/openvpn.spec b/openvpn.spec
index 317e2cb..d721310 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -15,6 +15,8 @@ Source2:           roadwarrior-server.conf
 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 @@ for compression.
 %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 @@ fi
 %changelog
 * Tue Sep 12 2006 Steven Pritchard <steve@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@kspei.com> 2.1-0.12.beta14
 - Rebuild