From 8c1e71f1614400dbda9dc3011519d8b56c66fb52 Mon Sep 17 00:00:00 2001
From: Steven Pritchard <steve@fedoraproject.org>
Date: Jun 15 2008 01:41:17 +0000
Subject: Update to 2.1_rc8. (Sync with devel.)


---

diff --git a/.cvsignore b/.cvsignore
index 640e993..ef4412e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-openvpn-2.1_rc4.tar.gz
-openvpn-2.1_rc4.tar.gz.asc
+openvpn-2.1_rc8.tar.gz
+openvpn-2.1_rc8.tar.gz.asc
diff --git a/openvpn.spec b/openvpn.spec
index e518d1e..88923ea 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -1,29 +1,37 @@
-%define prerelease rc4
+%define prerelease rc8
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.19%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.26%{?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
 #Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
-Source1:           http://openvpn.net/signatures/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz.asc
+Source0:           https://secure.openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
+#Source0:           http://openvpn.net/release/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
+Source1:           https://secure.openvpn.net/beta/signatures/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz.asc
+#Source1:           http://openvpn.net/signatures/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz.asc
 # Sample 2.0 config files
 Source2:           roadwarrior-server.conf
 Source3:           roadwarrior-client.conf
 # Don't start openvpn by default.
 Patch0:            openvpn-init.patch
-License:           GPL
+License:           GPLv2
 Group:             Applications/Internet
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-%(id -un)
 BuildRequires:     lzo-devel
 BuildRequires:     openssl-devel
 BuildRequires:     pam-devel
+# For /sbin/ip.
+BuildRequires:     iproute
 # We need /dev/net/tun.
 # This will work with RH9+ dev or udev.
 Requires:          dev >= 0:3.3.2-5
+# For /sbin/ip.
+Requires:          iproute
+# For ifconfig and route.
+Requires:          net-tools
 Requires(pre):     /usr/sbin/useradd
 Requires(post):    /sbin/chkconfig
 Requires(preun):   /sbin/chkconfig, /sbin/service
@@ -54,7 +62,16 @@ find contrib sample-config-files sample-keys sample-scripts -type f -perm +100 \
 #  --enable-password-save  Allow --askpass and --auth-user-pass passwords to be
 #                          read from a file
 #  --enable-iproute2       Enable support for iproute2
-%configure --enable-pthread --enable-password-save --enable-iproute2
+#  --with-ifconfig-path=PATH   Path to ifconfig tool
+#  --with-iproute-path=PATH    Path to iproute tool
+#  --with-route-path=PATH  Path to route tool
+%configure \
+    --enable-pthread \
+    --enable-password-save \
+    --enable-iproute2 \
+    --with-ifconfig-path=/sbin/ifconfig \
+    --with-iproute-path=/sbin/ip \
+    --with-route-path=/sbin/route
 %{__make}
 
 # Build plugins
@@ -62,7 +79,7 @@ for plugin in %{plugins} ; do
     %{__make} -C plugin/$plugin
 done
 
-%check || :
+%check
 # Test Crypto:
 ./openvpn --genkey --secret key
 ./openvpn --test-crypto --secret key
@@ -149,6 +166,32 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Sat Jun 14 2008 Steven Pritchard <steve@kspei.com> 2.1-0.26.rc8
+- Update to 2.1_rc8.
+- Update License tag.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.1-0.25.rc7
+- Autorebuild for GCC 4.3
+
+* Tue Jan 29 2008 Steven Pritchard <steve@kspei.com> 2.1-0.24.rc7
+- Update to 2.1_rc7
+- Drop BETA21-userpriv-fixups.patch (upstream)
+
+* Fri Jan 25 2008 Steven Pritchard <steve@kspei.com> 2.1-0.23.rc6
+- Apply update to BETA21-userpriv-fixups.patch from Alon Bar-Lev
+
+* Thu Jan 24 2008 Steven Pritchard <steve@kspei.com> 2.1-0.22.rc6
+- Update to 2.1_rc6
+- Pass paths to ifconfig, ip, and route to configure
+- BR iproute and Require iproute and net-tools
+- Add BETA21-userpriv-fixups.patch from Alon Bar-Lev
+
+* Wed Jan 23 2008 Steven Pritchard <steve@kspei.com> 2.1-0.21.rc5
+- Update to 2.1_rc5
+
+* Wed Dec 05 2007 Steven Pritchard <steve@kspei.com> 2.1-0.20.rc4
+- Remove check macro cruft.
+
 * Thu Apr 26 2007 Steven Pritchard <steve@kspei.com> 2.1-0.19.rc4
 - Update to 2.1_rc4
 
diff --git a/sources b/sources
index a51b8a1..a699188 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9fffc0aa0f797b612fa4f52b1e92197b  openvpn-2.1_rc4.tar.gz
-3aad29b84ed3ea12ec4645d48b0e571f  openvpn-2.1_rc4.tar.gz.asc
+059dfb6e21b503687c6b4a8a1b0034ac  openvpn-2.1_rc8.tar.gz
+25a7396a08e983fae44b08261af070cc  openvpn-2.1_rc8.tar.gz.asc