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

Package-Manager: portage-2.1.4

5 files changed, 68 insertions, 13 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/Manifest b/net-misc/openvpn/Manifest
index 7d7cf30f42a6..5cbfdbf08ce0 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -22,6 +22,10 @@ AUX openvpn-2.1_rc4-ip6-mss.patch 9971 RMD160 67d4b0ef282f77dd61da901a4acca861ec
 MD5 eac58785029b59b56d468885afec5f58 files/openvpn-2.1_rc4-ip6-mss.patch 9971
 RMD160 67d4b0ef282f77dd61da901a4acca861ece36980 files/openvpn-2.1_rc4-ip6-mss.patch 9971
 SHA256 73c6bcb15be8ae1200241e344094332efcb219c8933a066e78f9c8f369fbdfd2 files/openvpn-2.1_rc4-ip6-mss.patch 9971
+AUX openvpn-2.1_rc6-iproute.patch 1113 RMD160 4edd78a4ac875f3ea38329278e7ede493320a9a5 SHA1 b2291d167bbe8aa854b33434d5ef29a8f00e631f SHA256 cf6f21e0498cc3d0f233afb7eb4a3e685e6339c37cdf444fcd934a1bcce0bcff
+MD5 16aff5d396526195a4442738517f156b files/openvpn-2.1_rc6-iproute.patch 1113
+RMD160 4edd78a4ac875f3ea38329278e7ede493320a9a5 files/openvpn-2.1_rc6-iproute.patch 1113
+SHA256 cf6f21e0498cc3d0f233afb7eb4a3e685e6339c37cdf444fcd934a1bcce0bcff files/openvpn-2.1_rc6-iproute.patch 1113
 AUX openvpn.init 1461 RMD160 5b1e41f449e287fc2629c2ecef28f7437d10eb74 SHA1 756afc52a29aae1bc41e5eb43f5604e4d9e39112 SHA256 81782885fe6b65434404e4d5875071cb9a4c70914f25c71826290bb265ab109e
 MD5 8f8bae9823ceafe8b9a1ac24bb4a23da files/openvpn.init 1461
 RMD160 5b1e41f449e287fc2629c2ecef28f7437d10eb74 files/openvpn.init 1461
@@ -47,14 +51,14 @@ EBUILD openvpn-2.1_rc4-r2.ebuild 4593 RMD160 6567672b01b354454f3b28c2b827533d65b
 MD5 97c8d87f26677ee1f6dbb97e55f557f5 openvpn-2.1_rc4-r2.ebuild 4593
 RMD160 6567672b01b354454f3b28c2b827533d65b316be openvpn-2.1_rc4-r2.ebuild 4593
 SHA256 dce1e19c192f8188992a72eefb3b0b5f8aa3d257d8886d40104686a1698d73fb openvpn-2.1_rc4-r2.ebuild 4593
-EBUILD openvpn-2.1_rc6.ebuild 4302 RMD160 08f89839db6a3fb2924f4c66da704e746b35230f SHA1 c83e5218876ade5b24eaff37d2e2253df52c4659 SHA256 a65d674bedcb16659bf0543446ac611bfa8893c36f7531a09d2207c4d6e79b3c
-MD5 ac0144cf5d45af54a912cba5532cd33e openvpn-2.1_rc6.ebuild 4302
-RMD160 08f89839db6a3fb2924f4c66da704e746b35230f openvpn-2.1_rc6.ebuild 4302
-SHA256 a65d674bedcb16659bf0543446ac611bfa8893c36f7531a09d2207c4d6e79b3c openvpn-2.1_rc6.ebuild 4302
-MISC ChangeLog 19172 RMD160 cbffe615e250ef8e8241d60b0b3f721fa36c6a23 SHA1 9e7cb7bc646b47a6efea10ad8d4700b2a34a81ae SHA256 ca3bb97bd61a4a72bc774bf01b6090ca2e15ac90953bb95c0c9180c505f4f58e
-MD5 5f3bca9db04022fb006f869bc996abba ChangeLog 19172
-RMD160 cbffe615e250ef8e8241d60b0b3f721fa36c6a23 ChangeLog 19172
-SHA256 ca3bb97bd61a4a72bc774bf01b6090ca2e15ac90953bb95c0c9180c505f4f58e ChangeLog 19172
+EBUILD openvpn-2.1_rc6-r1.ebuild 4388 RMD160 2b5df040bee307f53f4fef36b3bbf04dcaaa173e SHA1 78a84e484860ba25414b05febccbc3a1ea6003a0 SHA256 264235f0a8ef1641feb8591721a50fdbfd6ec8fece0a5140b89553b25e47fb1a
+MD5 aec8143a9e32e606f6d55952e3eb22f4 openvpn-2.1_rc6-r1.ebuild 4388
+RMD160 2b5df040bee307f53f4fef36b3bbf04dcaaa173e openvpn-2.1_rc6-r1.ebuild 4388
+SHA256 264235f0a8ef1641feb8591721a50fdbfd6ec8fece0a5140b89553b25e47fb1a openvpn-2.1_rc6-r1.ebuild 4388
+MISC ChangeLog 19408 RMD160 c7260051beb81387217f200ea6512c72ef6a88d4 SHA1 aa61e1932749e18e2c404dc843b5aadf7dfc47ee SHA256 8a72fcda72e3ccb25b1bd4a904404541d6728cb069271ae252d29dba520dfec3
+MD5 662968387bc55b73aeaedaf0dab6475b ChangeLog 19408
+RMD160 c7260051beb81387217f200ea6512c72ef6a88d4 ChangeLog 19408
+SHA256 8a72fcda72e3ccb25b1bd4a904404541d6728cb069271ae252d29dba520dfec3 ChangeLog 19408
 MISC metadata.xml 439 RMD160 f706dea5fbe921385d0e2572e8c1f170fdad59f9 SHA1 ce672f573bf5e2a79fa0aed9c4db6a283c94705d SHA256 f9206f410231c68498f39bc887dbd00a3170ae1a0ede8e89adcce27745017baf
 MD5 cd62c31fec8f65e0a3a3080c5ad9775f metadata.xml 439
 RMD160 f706dea5fbe921385d0e2572e8c1f170fdad59f9 metadata.xml 439
@@ -68,6 +72,6 @@ SHA256 a1f31a906a965a6209c5e248a0a36f80423f087dd519d8465503446f23f1446d files/di
 MD5 927b1ce2be5d2879bf68940e68cbd04c files/digest-openvpn-2.1_rc4-r2 503
 RMD160 5a50a471798346526ca5421dc519507ef98eba7a files/digest-openvpn-2.1_rc4-r2 503
 SHA256 9f61a1d35bb0c7fe056674478f0251d6ed6cbc19f409c0b8aa2cd6d28e3d7900 files/digest-openvpn-2.1_rc4-r2 503
-MD5 663f2896a21eed4e4c9888049d0b5adf files/digest-openvpn-2.1_rc6 247
-RMD160 87c0972c58afa9137808c467dd041c5b796051b2 files/digest-openvpn-2.1_rc6 247
-SHA256 5ba36bc0cd0d7e06d68d3a9a842d558b7ee4bc0b574bbcb8233227aad7e251fe files/digest-openvpn-2.1_rc6 247
+MD5 663f2896a21eed4e4c9888049d0b5adf files/digest-openvpn-2.1_rc6-r1 247
+RMD160 87c0972c58afa9137808c467dd041c5b796051b2 files/digest-openvpn-2.1_rc6-r1 247
+SHA256 5ba36bc0cd0d7e06d68d3a9a842d558b7ee4bc0b574bbcb8233227aad7e251fe files/digest-openvpn-2.1_rc6-r1 247
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=""