Version bump, fix bug#209055

Package-Manager: portage-2.1.4.1

8 files changed, 77 insertions, 520 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 6342af06b62d..8ebf21749cc4 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,15 @@
 # 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.128 2008/02/08 10:01:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.129 2008/02/09 16:20:56 alonbl Exp $
+
+*openvpn-2.1_rc7 (09 Feb 2008)
+
+  09 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/openvpn-2.1_rc4-ip6-mss.patch,
+  -files/openvpn-2.1_rc6-iproute.patch, +files/openvpn-2.1_rc7-tap.patch,
+  -openvpn-2.1_rc4-r2.ebuild, -openvpn-2.1_rc6-r1.ebuild,
+  +openvpn-2.1_rc7.ebuild:
+  Version bump, fix bug#209055
 
   08 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   openvpn-2.0.7-r2.ebuild:
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index d6a5c0649f9b..96634aaae17a 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -3,18 +3,14 @@ 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_rc4-ip6-mss.patch 9971 RMD160 67d4b0ef282f77dd61da901a4acca861ece36980 SHA1 e02378d9addbc64c01af0b1dbd1353eac9d58b43 SHA256 73c6bcb15be8ae1200241e344094332efcb219c8933a066e78f9c8f369fbdfd2
-AUX openvpn-2.1_rc6-iproute.patch 1113 RMD160 4edd78a4ac875f3ea38329278e7ede493320a9a5 SHA1 b2291d167bbe8aa854b33434d5ef29a8f00e631f SHA256 cf6f21e0498cc3d0f233afb7eb4a3e685e6339c37cdf444fcd934a1bcce0bcff
+AUX openvpn-2.1_rc7-tap.patch 1474 RMD160 a200e42f1fd224e9d0f02eb59ab6371224245715 SHA1 1453666b79208d528880b95e324900605172a420 SHA256 f26a2ccad67a23c863241ca64c110c36601d70a0e6e0d6d626c02d176c36a2db
 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
 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e
-DIST openvpn-2.1-udp6.patch.bz2 16625 RMD160 58f7fa1e9eebdfb267782f409b162e84f227faf8 SHA1 cb13e4f7dd973bb782e2bd5cc9a59f5f5bcb3ef0 SHA256 e98bd77e3098a203b23dde34847ba9647f8f0c75d432559d1c3fb1e9ada66322
-DIST openvpn-2.1_rc4.tar.gz 803125 RMD160 d9843c2fb6fda64b5cf9474f42b36068bb4cd845 SHA1 4a22e23e497b7f5269628b1f430207c700cd6ebf SHA256 5d14e101c40e396250727fae7ee9ab734edd4e6e7f55b8209e0e215423775ff3
-DIST openvpn-2.1_rc6.tar.gz 752817 RMD160 f1a445cc6058eb3e3e9dbb8e4612aa180292cccd SHA1 ddd6479694547b8c7880f25145353fc7b81ffb40 SHA256 e8dd7c31cf7ad356e3d1f4243a71e9e0f363cc98d578d315a00d8a4be46d424f
+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 4181 RMD160 0404753ea21824bb170f8ab84d98e997f53e668b SHA1 00d9bb1ba377d60a10ba102833bc20b1c817f9f0 SHA256 f5a45785773d9a26605677dcaa1f176ec4085682973af3358ce0abf619d9d39b
-EBUILD openvpn-2.1_rc4-r2.ebuild 4593 RMD160 6567672b01b354454f3b28c2b827533d65b316be SHA1 e0ff6726e50fd0bfa91789afa71fc10d202367e5 SHA256 dce1e19c192f8188992a72eefb3b0b5f8aa3d257d8886d40104686a1698d73fb
-EBUILD openvpn-2.1_rc6-r1.ebuild 4388 RMD160 2b5df040bee307f53f4fef36b3bbf04dcaaa173e SHA1 78a84e484860ba25414b05febccbc3a1ea6003a0 SHA256 264235f0a8ef1641feb8591721a50fdbfd6ec8fece0a5140b89553b25e47fb1a
-MISC ChangeLog 20253 RMD160 bc0f72a17b9f4373f115f6efb1721de2925b7fd3 SHA1 d5c5734ce38870641ad8bb8b849464f3bfc80b4e SHA256 99271d71c45c64cd76b2113920411ced96b9492f2c275a40d055111887f96ec9
+EBUILD openvpn-2.0.7-r2.ebuild 4176 RMD160 caef18d295fa921bbc09b3a2941043c217f75a2b SHA1 8b121008d2478fc2ce9d99be511e9e059f2710c5 SHA256 6eafc86cc3c2938b9caf06cca12b663b7bff182b6e1bd046b50cda738a168f1f
+EBUILD openvpn-2.1_rc7.ebuild 4384 RMD160 515f00715172720b9547945c709b121fb886cc9c SHA1 0914687d7446112acde0e16be7ccd983aa6b9bfc SHA256 1d613fb8163d639e752546b3acd33d8c6998406542c11c4666db5094f8cc9bf5
+MISC ChangeLog 20560 RMD160 85a3f44fcb09542c8f9262cc35ca2d6771123307 SHA1 e9aac43f91f3f97459a4e370b454a8ce6816a5ce SHA256 1b8c392ca922f4f1c29928a6b4d7a1bcf61bb8b9bb1b6c0426539687282c0d71
 MISC metadata.xml 439 RMD160 f706dea5fbe921385d0e2572e8c1f170fdad59f9 SHA1 ce672f573bf5e2a79fa0aed9c4db6a283c94705d SHA256 f9206f410231c68498f39bc887dbd00a3170ae1a0ede8e89adcce27745017baf
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc4-ip6-mss.patch b/net-misc/openvpn/files/openvpn-2.1_rc4-ip6-mss.patch
deleted file mode 100644
index 596bacf84ee3..000000000000
--- a/net-misc/openvpn/files/openvpn-2.1_rc4-ip6-mss.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-diff -ur a/forward.c b/forward.c
---- a/forward.c	2007-04-25 22:38:46 +0100
-+++ b/forward.c	2007-08-01 17:55:20 +0100
-@@ -942,7 +942,7 @@
-        * The --passtos and --mssfix options require
-        * us to examine the IPv4 header.
-        */
--      process_ipv4_header (c, PIPV4_PASSTOS|PIPV4_MSSFIX, &c->c2.buf);
-+      process_ip_header (c, PIPV4_PASSTOS|PIPV4_MSSFIX, &c->c2.buf);
- 
- #ifdef PACKET_TRUNCATION_CHECK
-       /* if (c->c2.buf.len > 1) --c->c2.buf.len; */
-@@ -964,7 +964,7 @@
- }
- 
- void
--process_ipv4_header (struct context *c, unsigned int flags, struct buffer *buf)
-+process_ip_header (struct context *c, unsigned int flags, struct buffer *buf)
- {
-   if (!c->options.mssfix)
-     flags &= ~PIPV4_MSSFIX;
-@@ -986,17 +986,22 @@
- #endif
- 	{
- 	  struct buffer ipbuf = *buf;
--	  if (is_ipv4 (TUNNEL_TYPE (c->c1.tuntap), &ipbuf))
-+	  switch (get_ipversion(TUNNEL_TYPE (c->c1.tuntap), &ipbuf))
- 	    {
-+	      case OPENVPN_PROTO_IPV4:
- #if PASSTOS_CAPABILITY
--	      /* extract TOS from IP header */
--	      if (flags & PIPV4_PASSTOS)
--		link_socket_extract_tos (c->c2.link_socket, &ipbuf);
--#endif
--			  
--	      /* possibly alter the TCP MSS */
--	      if (flags & PIPV4_MSSFIX)
--		mss_fixup (&ipbuf, MTU_TO_MSS (TUN_MTU_SIZE_DYNAMIC (&c->c2.frame)));
-+	        /* extract TOS from IP header */
-+	        if (flags & PIPV4_PASSTOS)
-+	  	  link_socket_extract_tos (c->c2.link_socket, &ipbuf);
-+#endif
-+	        /* possibly alter the TCP MSS */
-+	        if (flags & PIPV4_MSSFIX)
-+		  mss_fixup_ipv4 (&ipbuf, MTU_TO_MSS (TUN_MTU_SIZE_DYNAMIC (&c->c2.frame)));
-+                break;
-+	      case OPENVPN_PROTO_IPV6:
-+	        if (flags & PIPV4_MSSFIX)
-+		  mss_fixup_ipv6 (&ipbuf, MTU_TO_MSS (TUN_MTU_SIZE_DYNAMIC (&c->c2.frame)));
-+
- 	    }
- 	}
-     }
-@@ -1145,7 +1150,7 @@
-    * The --mssfix option requires
-    * us to examine the IPv4 header.
-    */
--  process_ipv4_header (c, PIPV4_MSSFIX|PIPV4_OUTGOING, &c->c2.to_tun);
-+  process_ip_header (c, PIPV4_MSSFIX|PIPV4_OUTGOING, &c->c2.to_tun);
- 
-   if (c->c2.to_tun.len <= MAX_RW_SIZE_TUN (&c->c2.frame))
-     {
-diff -ur a/forward.h b/forward.h
---- a/forward.h	2007-04-25 22:38:46 +0100
-+++ b/forward.h	2007-08-01 17:54:10 +0100
-@@ -76,7 +76,7 @@
- #define PIPV4_MSSFIX          (1<<1)
- #define PIPV4_OUTGOING        (1<<2)
- 
--void process_ipv4_header (struct context *c, unsigned int flags, struct buffer *buf);
-+void process_ip_header (struct context *c, unsigned int flags, struct buffer *buf);
- 
- #if P2MP
- void schedule_exit (struct context *c, const int n_seconds);
-diff -ur a/mroute.c b/mroute.c
---- a/mroute.c	2007-08-01 17:57:36 +0100
-+++ b/mroute.c	2007-08-01 17:54:10 +0100
-@@ -101,9 +101,9 @@
- 	  switch (OPENVPN_IPH_GET_VER (*BPTR(buf)))
- 	    {
- 	    case 4:
--	      if (BLEN (buf) >= (int) sizeof (struct openvpn_iphdr))
-+	      if (BLEN (buf) >= (int) sizeof (struct openvpn_ip4hdr))
- 		{
--		  const struct openvpn_iphdr *ip = (const struct openvpn_iphdr *) BPTR (buf);
-+		  const struct openvpn_ip4hdr *ip = (const struct openvpn_ip4hdr *) BPTR (buf);
- 		  if (src)
- 		    {
- 		      src->type = MR_ADDR_IPV4;
-diff -ur a/mss.c b/mss.c
---- a/mss.c	2007-04-25 22:38:46 +0100
-+++ b/mss.c	2007-08-01 17:54:10 +0100
-@@ -39,16 +39,16 @@
-  * encapsulation.
-  */
- void
--mss_fixup (struct buffer *buf, int maxmss)
-+mss_fixup_ipv4 (struct buffer *buf, int maxmss)
- {
--  const struct openvpn_iphdr *pip;
-+  const struct openvpn_ip4hdr *pip;
-   int hlen;
- 
--  if (BLEN (buf) < (int) sizeof (struct openvpn_iphdr))
-+  if (BLEN (buf) < (int) sizeof (struct openvpn_ip4hdr))
-     return;
-   
-   verify_align_4 (buf);
--  pip = (struct openvpn_iphdr *) BPTR (buf);
-+  pip = (struct openvpn_ip4hdr *) BPTR (buf);
- 
-   hlen = OPENVPN_IPH_GET_LEN (pip->version_len);
- 
-@@ -70,6 +70,31 @@
- }
- 
- void
-+mss_fixup_ipv6 (struct buffer *buf, int maxmss)
-+{
-+  const struct openvpn_ip6hdr *pip;
-+  if (BLEN (buf) < (int) sizeof (struct openvpn_ip6hdr))
-+    return;
-+
-+  verify_align_4 (buf);
-+  pip = (struct openvpn_ip6hdr *) BPTR (buf);
-+  if (pip->ip6_ctlun.ip6_un1.ip6_un1_nxt == OPENVPN_IPPROTO_TCP
-+      && ntohs (pip->ip6_ctlun.ip6_un1.ip6_un1_plen) 
-+         == BLEN (buf) - sizeof(struct openvpn_ip6hdr)
-+      && BLEN(buf) - sizeof(struct openvpn_ip6hdr) 
-+         >= (int) sizeof (struct openvpn_tcphdr))
-+  {
-+      struct buffer newbuf = *buf;
-+      if (buf_advance (&newbuf, sizeof(struct openvpn_ip6hdr)))
-+	{
-+	  struct openvpn_tcphdr *tc = (struct openvpn_tcphdr *) BPTR (&newbuf);
-+	  if (tc->flags & OPENVPN_TCPH_SYN_MASK)
-+	    mss_fixup_dowork (&newbuf, (uint16_t) maxmss);
-+	}
-+  }
-+}
-+
-+void
- mss_fixup_dowork (struct buffer *buf, uint16_t maxmss)
- {
-   int hlen, olen, optlen;
-@@ -118,3 +143,4 @@
-     }
-   }
- }
-+
-diff -ur a/mss.h b/mss.h
---- a/mss.h	2007-04-25 22:38:46 +0100
-+++ b/mss.h	2007-08-01 17:54:10 +0100
-@@ -28,7 +28,8 @@
- #include "proto.h"
- #include "error.h"
- 
--void mss_fixup (struct buffer *buf, int maxmss);
-+void mss_fixup_ipv4 (struct buffer *buf, int maxmss);
-+void mss_fixup_ipv6 (struct buffer *buf, int maxmss);
- void mss_fixup_dowork (struct buffer *buf, uint16_t maxmss);
- 
- #endif
-diff -ur a/multi.c b/multi.c
---- a/multi.c	2007-08-01 17:57:36 +0100
-+++ b/multi.c	2007-08-01 17:54:10 +0100
-@@ -1984,7 +1984,7 @@
-       item.instance->context.c2.buf = item.buffer->buf;
-       if (item.buffer->flags & MF_UNICAST) /* --mssfix doesn't make sense for broadcast or multicast */
- 	pipv4_flags |= PIPV4_MSSFIX;
--      process_ipv4_header (&item.instance->context, pipv4_flags, &item.instance->context.c2.buf);
-+      process_ip_header (&item.instance->context, pipv4_flags, &item.instance->context.c2.buf);
-       encrypt_sign (&item.instance->context, true);
-       mbuf_free_buf (item.buffer);
- 
-diff -ur a/proto.c b/proto.c
---- a/proto.c	2007-04-25 22:38:46 +0100
-+++ b/proto.c	2007-08-01 17:54:10 +0100
-@@ -39,39 +39,43 @@
-  * If raw tunnel packet is IPv4, return true and increment
-  * buffer offset to start of IP header.
-  */
--bool
--is_ipv4 (int tunnel_type, struct buffer *buf)
-+int
-+get_ipversion (int tunnel_type, struct buffer *buf)
- {
-   int offset;
--  const struct openvpn_iphdr *ih;
-+  uint8_t version;
- 
-   verify_align_4 (buf);
-   if (tunnel_type == DEV_TYPE_TUN)
-     {
--      if (BLEN (buf) < (int) sizeof (struct openvpn_iphdr))
--	return false;
-+      if (BLEN (buf) < (int) sizeof (struct openvpn_ip4hdr))
-+	return OPENVPN_PROTO_UNK;
-       offset = 0;
-     }
-   else if (tunnel_type == DEV_TYPE_TAP)
-     {
-       const struct openvpn_ethhdr *eh;
-       if (BLEN (buf) < (int)(sizeof (struct openvpn_ethhdr)
--	  + sizeof (struct openvpn_iphdr)))
-+	  + sizeof (struct openvpn_ip4hdr)))
- 	return false;
-       eh = (const struct openvpn_ethhdr *) BPTR (buf);
--      if (ntohs (eh->proto) != OPENVPN_ETH_P_IPV4)
--	return false;
-+      if (!(ntohs (eh->proto) == OPENVPN_ETH_P_IPV4 ||
-+      	    ntohs (eh->proto) == OPENVPN_ETH_P_IPV6 ))
-+	return OPENVPN_PROTO_UNK;
-       offset = sizeof (struct openvpn_ethhdr);
-     }
-   else
--    return false;
--
--  ih = (const struct openvpn_iphdr *) (BPTR (buf) + offset);
-+    return OPENVPN_PROTO_UNK;
- 
--  if (OPENVPN_IPH_GET_VER (ih->version_len) == 4)
--    return buf_advance (buf, offset);
-+  version = (*((uint8_t *)(BPTR (buf) + offset)) >> 4) & 0xf;
-+  if (version == OPENVPN_PROTO_IPV4 || version == OPENVPN_PROTO_IPV6)
-+    {
-+       if (!buf_advance (buf, offset))
-+         return OPENVPN_PROTO_UNK;
-+       return version; 
-+    }
-   else
--    return false;
-+    return OPENVPN_PROTO_UNK;
- }
- 
- #ifdef PACKET_TRUNCATION_CHECK
-diff -ur a/proto.h b/proto.h
---- a/proto.h	2007-04-25 22:38:46 +0100
-+++ b/proto.h	2007-08-01 17:54:10 +0100
-@@ -62,7 +62,7 @@
-   uint16_t proto;                     /* packet type ID field */
- };
- 
--struct openvpn_iphdr {
-+struct openvpn_ip4hdr {
- # define OPENVPN_IPH_GET_VER(v) (((v) >> 4) & 0x0F)
- # define OPENVPN_IPH_GET_LEN(v) (((v) & 0x0F) << 2)
-   uint8_t    version_len;
-@@ -87,6 +87,27 @@
-   /*The options start here. */
- };
- 
-+struct openvpn_in6_addr {
-+        union {
-+                uint8_t         __u6_addr8[16];
-+                uint16_t        __u6_addr16[8];
-+                uint32_t        __u6_addr32[4];
-+        } __u6_addr;                    /* 128-bit IP6 address */
-+}; 
-+struct openvpn_ip6hdr {
-+        union {
-+                struct ip6_hdrctl {
-+                        uint32_t ip6_un1_flow; /* 20 bits of flow-ID */
-+                        uint16_t ip6_un1_plen; /* payload length */
-+                        uint8_t  ip6_un1_nxt;  /* next header */
-+                        uint8_t  ip6_un1_hlim; /* hop limit */
-+                } ip6_un1;
-+                uint8_t ip6_un2_vfc;   /* 4 bits version, top 4 bits class */
-+        } ip6_ctlun;
-+        struct openvpn_in6_addr ip6_src;        /* source address */
-+        struct openvpn_in6_addr ip6_dst;        /* destination address */
-+};
-+
- /*
-  * UDP header
-  */
-@@ -159,14 +180,19 @@
-  *
-  * (RFC 879, section 7).
-  */
--#define MTU_TO_MSS(mtu) (mtu - sizeof(struct openvpn_iphdr) \
-+#define MTU_TO_MSS(mtu) (mtu - sizeof(struct openvpn_ip4hdr) \
-                              - sizeof(struct openvpn_tcphdr))
- 
- /*
-- * If raw tunnel packet is IPv4, return true and increment
-+ * Check if raw tunnel packet is IPv4 or IPv6, 
-+ * return the version and increment
-  * buffer offset to start of IP header.
-  */
--bool is_ipv4 (int tunnel_type, struct buffer *buf);
-+
-+#define OPENVPN_PROTO_IPV6 6
-+#define OPENVPN_PROTO_IPV4 4
-+#define OPENVPN_PROTO_UNK  0
-+int get_ipversion(int tunnel_type, struct buffer *buf);
- 
- #ifdef PACKET_TRUNCATION_CHECK
- void ipv4_packet_size_verify (const uint8_t *data,
-diff -ur a/socket.h b/socket.h
---- a/socket.h	2007-08-01 17:57:36 +0100
-+++ b/socket.h	2007-08-01 17:54:10 +0100
-@@ -1009,7 +1009,7 @@
- {
-   if (ls && ipbuf)
-     {
--      struct openvpn_iphdr *iph = (struct openvpn_iphdr *) BPTR (ipbuf);
-+      struct openvpn_ip4hdr *iph = (struct openvpn_ip4hdr *) BPTR (ipbuf);
-       ls->ptos = iph->tos;
-       ls->ptos_defined = true;
-     }
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc6-iproute.patch b/net-misc/openvpn/files/openvpn-2.1_rc6-iproute.patch
deleted file mode 100644
index 64cdab408c31..000000000000
--- a/net-misc/openvpn/files/openvpn-2.1_rc6-iproute.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/files/openvpn-2.1_rc7-tap.patch b/net-misc/openvpn/files/openvpn-2.1_rc7-tap.patch
new file mode 100644
index 000000000000..0220194a5bd6
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.1_rc7-tap.patch
@@ -0,0 +1,57 @@
+Index: tun.c
+===================================================================
+--- tun.c	(revision 2713)
++++ tun.c	(revision 2715)
+@@ -1220,26 +1220,44 @@
+ {
+   if (tt)
+     {
+-#ifdef CONFIG_FEATURE_IPROUTE
+ 	if (tt->type != DEV_TYPE_NULL && tt->did_ifconfig)
+ 	  {
+ 	    char command_line[256];
+ 	    struct gc_arena gc = gc_new ();
+ 
++#ifdef CONFIG_FEATURE_IPROUTE
++	    if (is_tun_p2p (tt))
++	      {
++		openvpn_snprintf (command_line, sizeof (command_line),
++			"%s addr del dev %s local %s peer %s",
++			iproute_path,
++			tt->actual_name,
++			print_in_addr_t (tt->local, 0, &gc),
++			print_in_addr_t (tt->remote_netmask, 0, &gc)
++			);
++	      }
++	    else
++	      {
++		openvpn_snprintf (command_line, sizeof (command_line),
++			"%s addr del dev %s %s/%d",
++			iproute_path,
++			tt->actual_name,
++			print_in_addr_t (tt->local, 0, &gc),
++			count_netmask_bits(print_in_addr_t (tt->remote_netmask, 0, &gc))
++			);
++	      }
++#else
+ 	    openvpn_snprintf (command_line, sizeof (command_line),
+-			  "%s addr del dev %s local %s peer %s",
+-			  iproute_path,
+-			  tt->actual_name,
+-			  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",
++			tt->actual_name
++			);
++#endif
+ 
+ 	    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.0.7-r2.ebuild b/net-misc/openvpn/openvpn-2.0.7-r2.ebuild
index 8cd7e7361527..eaf04130e93f 100644
--- a/net-misc/openvpn/openvpn-2.0.7-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.7-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.0.7-r2.ebuild,v 1.9 2008/02/08 10:01:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7-r2.ebuild,v 1.10 2008/02/09 16:20:56 alonbl Exp $
 
 inherit eutils multilib
 
@@ -35,7 +35,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-pam.patch"
diff --git a/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild b/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild
deleted file mode 100644
index 3836dad3f4c9..000000000000
--- a/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild,v 1.2 2007/09/15 07:30:31 uberlord Exp $
-
-inherit autotools eutils multilib
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://openvpn.net/release/${P}.tar.gz
-		ipv6? ( mirror://gentoo/${PN}-2.1-udp6.patch.bz2 )"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="examples iproute2 ipv6 minimal pam passwordsave selinux ssl static threads userland_BSD"
-
-DEPEND=">=dev-libs/lzo-1.07
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
-	)
-	!minimal? ( pam? ( virtual/pam ) )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-pkg_setup() {
-	if use iproute2 ; then
-		if built_with_use sys-apps/iproute2 minimal ; then
-			eerror "iproute2 support requires that sys-apps/iproute2 was not"
-			eerror "built with the minimal USE flag"
-			die "iproute2 support not available"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}"-ip6-mss.patch
-	use ipv6 && epatch "${WORKDIR}/${PN}"-2.1-udp6.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-	# We cannot use use_enable with iproute2 as the Makefile stupidly
-	# enables it with --disable-iproute2
-	use iproute2 && myconf="${myconf} --enable-iproute2"
-	if use minimal ; then
-		myconf="${myconf} --disable-plugins"
-		myconf="${myconf} --disable-pkcs11"
-	fi
-
-	econf ${myconf} \
-		$(use_enable ipv6) \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable threads pthread) \
-		|| die "configure failed"
-
-	use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
-
-	emake || die "make failed"
-
-	if ! use minimal ; then
-		cd plugin
-		for i in $( ls 2>/dev/null ); do
-			[[ ${i} == "README" || ${i} == "examples" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			einfo "Building ${i} plugin"
-			cd "${i}"
-			emake || die "make failed"
-			cd ..
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Empty dir
-	dodir /etc/openvpn
-	keepdir /etc/openvpn
-
-	# Install some helper scripts
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample-{config-files,keys,scripts} contrib
-		prepalldocs
-	fi
-
-	# Install plugins and easy-rsa
-	if ! use minimal ; then
-		cd easy-rsa/2.0
-		make install "DESTDIR=${D}/usr/share/${PN}/easy-rsa"
-		cd ../..
-
-		exeinto "/usr/$(get_libdir)/${PN}"
-		doexe plugin/*/*.so
-	fi
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [[ -n $(ls /etc/openvpn/*/local.conf 2>/dev/null) ]] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	einfo "The openvpn init script expects to find the configuration file"
-	einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	einfo ""
-	einfo "To create more VPNs, simply create a new .conf file for it and"
-	einfo "then create a symlink to the openvpn init script from a link called"
-	einfo "openvpn.newconfname - like so"
-	einfo "   cd /etc/openvpn"
-	einfo "   ${EDITOR##*/} foo.conf"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s openvpn openvpn.foo"
-	einfo ""
-	einfo "You can then treat openvpn.foo as any other service, so you can"
-	einfo "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" ${ROOT}/etc/openvpn/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if ! use minimal ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-}
diff --git a/net-misc/openvpn/openvpn-2.1_rc6-r1.ebuild b/net-misc/openvpn/openvpn-2.1_rc7.ebuild
index 734b99d77a0e..b241fdf61c72 100644
--- a/net-misc/openvpn/openvpn-2.1_rc6-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.1_rc7.ebuild
@@ -1,11 +1,11 @@
 # 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-r1.ebuild,v 1.1 2008/01/25 23:51:45 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc7.ebuild,v 1.1 2008/02/09 16:20:56 alonbl Exp $
 
 inherit eutils multilib
 
 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
-SRC_URI="http://openvpn.net/beta/${P}.tar.gz"
+SRC_URI="http://openvpn.net/release/${P}.tar.gz"
 HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
@@ -35,7 +35,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-iproute.patch"
+	epatch "${FILESDIR}/${P}-tap.patch"
 }
 
 src_compile() {