From 7ae94eb2e893ef7e0c66c22bf34c4795fd14871f Mon Sep 17 00:00:00 2001
From: Steven Pritchard <steve@fedoraproject.org>
Date: Mon, 23 Apr 2007 15:55:39 +0000
Subject: [PATCH] Update to 2.1_rc3.

---
 .cvsignore                            |  4 ++--
 openvpn-2.1_beta15-test-timeout.patch | 16 ----------------
 openvpn.spec                          |  7 +++++--
 sources                               |  4 ++--
 4 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 openvpn-2.1_beta15-test-timeout.patch

diff --git a/.cvsignore b/.cvsignore
index 9b979c5..25441e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-openvpn-2.1_rc2.tar.gz
-openvpn-2.1_rc2.tar.gz.asc
+openvpn-2.1_rc3.tar.gz
+openvpn-2.1_rc3.tar.gz.asc
diff --git a/openvpn-2.1_beta15-test-timeout.patch b/openvpn-2.1_beta15-test-timeout.patch
deleted file mode 100644
index 52a7eaa..0000000
--- a/openvpn-2.1_beta15-test-timeout.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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 2e92216..651951e 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -1,10 +1,10 @@
-%define prerelease rc2
+%define prerelease rc3
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.17%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.18%{?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
@@ -149,6 +149,9 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Mon Apr 23 2007 Steven Pritchard <steve@kspei.com> 2.1-0.18.rc3
+- Update to 2.1_rc3
+
 * Fri Mar 02 2007 Steven Pritchard <steve@kspei.com> 2.1-0.17.rc2
 - Update to 2.1_rc2
 
diff --git a/sources b/sources
index 95828a0..9be9e3f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-853c81d2de51d85b5381d4c7f7f074e3  openvpn-2.1_rc2.tar.gz
-4b4319498804b4365fd5c1d3a02e4f3f  openvpn-2.1_rc2.tar.gz.asc
+4bff1e30b560717dff79ff6ed4f97ab1  openvpn-2.1_rc3.tar.gz
+902131bae2e1522e4d2d950175788472  openvpn-2.1_rc3.tar.gz.asc