Fix iproute issue, bug#207320, thanks to Graham Murray

(Portage version: 2.1.4)

4 files changed, 53 insertions, 2 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index b71fd749e3d4..2fb1fd4abf85 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.120 2008/01/24 17:27:25 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.121 2008/01/25 23:51:45 alonbl Exp $
+
+*openvpn-2.1_rc6-r1 (25 Jan 2008)
+
+  25 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/openvpn-2.1_rc6-iproute.patch, -openvpn-2.1_rc6.ebuild,
+  +openvpn-2.1_rc6-r1.ebuild:
+  Fix iproute issue, bug#207320, thanks to Graham Murray
 
 *openvpn-2.1_rc6 (24 Jan 2008)
 
diff --git a/net-misc/openvpn/files/digest-openvpn-2.1_rc6 b/net-misc/openvpn/files/digest-openvpn-2.1_rc6-r1
index be2850287852..be2850287852 100644
--- a/net-misc/openvpn/files/digest-openvpn-2.1_rc6
+++ b/net-misc/openvpn/files/digest-openvpn-2.1_rc6-r1
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc6-iproute.patch b/net-misc/openvpn/files/openvpn-2.1_rc6-iproute.patch
new file mode 100644
index 000000000000..64cdab408c31
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.1_rc6-iproute.patch
@@ -0,0 +1,38 @@
+Index: openvpn/tun.c
+===================================================================
+--- openvpn/tun.c	(revision 2677)
++++ openvpn/tun.c	(revision 2682)
+@@ -1221,17 +1221,24 @@
+   if (tt)
+     {
+ #ifdef CONFIG_FEATURE_IPROUTE
+-	char command_line[256];
+-	/*
+-	 * Flush IP configuration for the device
+-	 */
+-	openvpn_snprintf (command_line, sizeof (command_line),
+-			  "%s addr flush dev %s",
++	if (tt->type != DEV_TYPE_NULL && tt->did_ifconfig)
++	  {
++	    char command_line[256];
++	    struct gc_arena gc = gc_new ();
++
++	    openvpn_snprintf (command_line, sizeof (command_line),
++			  "%s addr del dev %s local %s peer %s",
+ 			  iproute_path,
+-			  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 addr del failed");
++
++	    gc_free (&gc);
++	  }
+ #endif
+       close_tun_generic (tt);
+       free (tt);
diff --git a/net-misc/openvpn/openvpn-2.1_rc6.ebuild b/net-misc/openvpn/openvpn-2.1_rc6-r1.ebuild
index b76c9a75fc56..734b99d77a0e 100644
--- a/net-misc/openvpn/openvpn-2.1_rc6.ebuild
+++ b/net-misc/openvpn/openvpn-2.1_rc6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc6.ebuild,v 1.1 2008/01/24 17:27:25 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc6-r1.ebuild,v 1.1 2008/01/25 23:51:45 alonbl Exp $
 
 inherit eutils multilib
 
@@ -32,6 +32,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-iproute.patch"
+}
+
 src_compile() {
 	local myconf=""