From 9f1c9a40eff05c3e4f3ea2bb076265e053f9e1ae Mon Sep 17 00:00:00 2001
From: Steven Pritchard <steve@fedoraproject.org>
Date: Jan 26 2008 01:46:41 +0000
Subject: Apply update to BETA21-userpriv-fixups.patch from Alon Bar-Lev.


---

diff --git a/BETA21-userpriv-fixups.patch b/BETA21-userpriv-fixups.patch
index 2936544..64cdab4 100644
--- a/BETA21-userpriv-fixups.patch
+++ b/BETA21-userpriv-fixups.patch
@@ -1,8 +1,8 @@
 Index: openvpn/tun.c
 ===================================================================
 --- openvpn/tun.c	(revision 2677)
-+++ openvpn/tun.c	(revision 2679)
-@@ -1221,17 +1221,20 @@
++++ openvpn/tun.c	(revision 2682)
+@@ -1221,17 +1221,24 @@
    if (tt)
      {
  #ifdef CONFIG_FEATURE_IPROUTE
@@ -11,21 +11,27 @@ Index: openvpn/tun.c
 -	 * Flush IP configuration for the device
 -	 */
 -	openvpn_snprintf (command_line, sizeof (command_line),
-+	if (tt->type != DEV_TYPE_NULL)
+-			  "%s addr flush dev %s",
++	if (tt->type != DEV_TYPE_NULL && tt->did_ifconfig)
 +	  {
 +	    char command_line[256];
-+	    /*
-+	     * Flush IP configuration for the device
-+	     */
++	    struct gc_arena gc = gc_new ();
++
 +	    openvpn_snprintf (command_line, sizeof (command_line),
- 			  "%s addr flush dev %s",
++			  "%s addr del dev %s local %s peer %s",
  			  iproute_path,
- 			  tt->actual_name
+-			  tt->actual_name
++			  tt->actual_name,
++			  print_in_addr_t (tt->local, 0, &gc),
++			  print_in_addr_t (tt->remote_netmask, 0, &gc)
  			  );
 -	msg (M_INFO, "%s", command_line);
 -	system_check (command_line, NULL, S_FATAL, "Linux ip flush failed");
++
 +	    msg (M_INFO, "%s", command_line);
-+	    system_check (command_line, NULL, S_FATAL, "Linux ip flush failed");
++	    system_check (command_line, NULL, S_FATAL, "Linux ip addr del failed");
++
++	    gc_free (&gc);
 +	  }
  #endif
        close_tun_generic (tt);
diff --git a/openvpn.spec b/openvpn.spec
index e2902e9..a714209 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.22%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.23%{?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
@@ -166,6 +166,9 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* 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