Fix tun (again), bug#218129, thanks to Sigmatador

Package-Manager: portage-2.1.5_rc4

4 files changed, 13 insertions, 6 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 710492470178..483434b44d29 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.132 2008/04/16 16:36:38 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.133 2008/04/18 06:22:44 alonbl Exp $
+
+*openvpn-2.1_rc7-r2 (18 Apr 2008)
+
+  18 Apr 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  files/openvpn-2.1_rc7-tap.patch, -openvpn-2.1_rc7-r1.ebuild,
+  +openvpn-2.1_rc7-r2.ebuild:
+  Fix tun (again), bug#218129, thanks to Sigmatador
 
 *openvpn-2.1_rc7-r1 (16 Apr 2008)
 
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index bbd712cbb1a1..bbb84249432a 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -3,7 +3,7 @@ AUX openvpn-2.0.7-pam.patch 1236 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d
 AUX openvpn-2.0.7-persistent.patch 1857 RMD160 b3232feb19810ac405cd7af6bb692ed03f9c44c2 SHA1 5ac9d0ff58f56ef771d44bb1dc13322815339e72 SHA256 51de714f2191ac3ea59a7f7c5a0aa1c0bf15ee5d79ace10f2276d415cd0f59e0
 AUX openvpn-2.1.conf 892 RMD160 687a747ed2f801b051438d02da8fcd44c6954484 SHA1 e65db7d972483c9391ef92d2931d9db7b69e4329 SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2
 AUX openvpn-2.1.init 4084 RMD160 1f815a77c3d89ee55d568e8dce582020fd68fc39 SHA1 811db5279b360f8d95bfbcd460a85bbf2c65ecbf SHA256 d844103cd67717ce505e191a3b4a1835b7fafbb856de7540791cf0e5fe017ec9
-AUX openvpn-2.1_rc7-tap.patch 1475 RMD160 dca37b3b86cbc1bcc9fa5bf62d11019002b2e12c SHA1 796a69b2036a5a5bd8903a1f319da61537405933 SHA256 a26bed36eddd8aca59e576659821c7a0360bdf12b0674fa7da3af807902949a1
+AUX openvpn-2.1_rc7-tap.patch 1470 RMD160 5f8ac08398ed7060dd287d030b25126a950ec987 SHA1 28ddec126c8ae121ba50888f32a56cbdfcfde5cd SHA256 272d0c03720c092756e3876517b3736c3f94640ab7e24fa322f5f6e8b6ff5282
 AUX openvpn.init 1488 RMD160 be34debb55b6c3e2453946a290da2650ca3baa72 SHA1 48aabadee2cbb6ce9c4196b2730922491a96f003 SHA256 c074126c90d35c04a7316f4533cd00e9e14849e4e222ca5b87e6172f401ec95d
 AUX up.sh 2560 RMD160 34c2f0845a2c3b2eebb20da5a5c316e81cd1ef5a SHA1 d7026eeb7586fb931e5f938ca00fcc63c63923ad SHA256 3a7cedba5909fa06d0eb36b3426f0e5bc21bdc28943beaaa241ab651b4388218
 DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63 SHA1 046f3811831a06e4fbc9c64544faaecf04547ae5 SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003
@@ -11,6 +11,6 @@ DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4
 DIST openvpn-2.1_rc7.tar.gz 787379 RMD160 67e80d7bfb554046c71c95ec15d478504057f903 SHA1 f9f57a8ef3af8ab51924784ad2aab5d5f5798581 SHA256 c07fcbc41465bf508caff70dcc4238b8c95e9b2f35bec7bf891f7164027ecbf8
 EBUILD openvpn-2.0.6.ebuild 3992 RMD160 a29b45480578f9ff80a8ab202c57813f6052c350 SHA1 e973ea504b42a90d4de99756a0349d6cee80dea3 SHA256 7fac8d4cecd9595317533ee2d2b79e2c93d350b83cffc63c07168c093ed11e28
 EBUILD openvpn-2.0.7-r2.ebuild 4174 RMD160 d4917068d83748cb9667f1fdb2f6a912f9cc7fdd SHA1 4f6388a0271bae7c53533eb9e3148575b43edd2e SHA256 51f9ac56227e3425f5074bf4b59ecf53663195ac2e0426431da41552ba46701e
-EBUILD openvpn-2.1_rc7-r1.ebuild 4393 RMD160 bd8f38605b82322496def87b720180ea3a447901 SHA1 bf604b9f2ac5598e177caee504f0646f1fbb0456 SHA256 f3b09aa1a1d90b557d9f7ceb6d624f3e33e6c7f1ef3e6bda2ad482b3cabb7221
-MISC ChangeLog 21004 RMD160 a2202643eb773fdcd5a152945cda76c97f2871f3 SHA1 8e11f4a530ff6003a9d22ee9c1e490b67ba2a856 SHA256 6145f5a7f7022153ad0af5dc2f13ca29f839aee64e68fa6f78d71e0286f74938
+EBUILD openvpn-2.1_rc7-r2.ebuild 4393 RMD160 a2612d19bb8b1ac21ad49505a740d7c0a4131196 SHA1 6064a4d5beda4a532b77c85119a7581e1434277c SHA256 926d1331d835501c5cf69246deb32113b8bf1bb3e570d3cbd49ff08152d30dd2
+MISC ChangeLog 21233 RMD160 d595e8528c4c27d2f5c8191678130c30fa81e703 SHA1 abc8c5a52475732c90d67c4710212482eb1321b0 SHA256 421fed4d51b3ec2ecfc2ea75aab81de369c071954e6253ab5c4c0ca73ce7254f
 MISC metadata.xml 439 RMD160 f706dea5fbe921385d0e2572e8c1f170fdad59f9 SHA1 ce672f573bf5e2a79fa0aed9c4db6a283c94705d SHA256 f9206f410231c68498f39bc887dbd00a3170ae1a0ede8e89adcce27745017baf
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc7-tap.patch b/net-misc/openvpn/files/openvpn-2.1_rc7-tap.patch
index d57273588893..5bd11ad103b2 100644
--- a/net-misc/openvpn/files/openvpn-2.1_rc7-tap.patch
+++ b/net-misc/openvpn/files/openvpn-2.1_rc7-tap.patch
@@ -41,7 +41,7 @@ Index: tun.c
 -			  print_in_addr_t (tt->local, 0, &gc),
 -			  print_in_addr_t (tt->remote_netmask, 0, &gc)
 -			  );
-+			IFCONFIG_PATH " %s addr 0.0.0.0",
++			IFCONFIG_PATH " %s 0.0.0.0",
 +			tt->actual_name
 +			);
 +#endif
diff --git a/net-misc/openvpn/openvpn-2.1_rc7-r1.ebuild b/net-misc/openvpn/openvpn-2.1_rc7-r2.ebuild
index 162f89c34b7b..291e73e8004a 100644
--- a/net-misc/openvpn/openvpn-2.1_rc7-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.1_rc7-r2.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_rc7-r1.ebuild,v 1.1 2008/04/16 16:36:38 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc7-r2.ebuild,v 1.1 2008/04/18 06:22:44 alonbl Exp $
 
 inherit eutils multilib