Updated net/openvpn to 2.1rc7

* Added a few extra files that exist in the svn repo but were
  not being copied into the tarball by make dist.

* Fixup null interface on close, don't use ip addr flush (Alon Bar-Lev).

* Fixed options checking bug introduced in rc5 where legitimate configuration
  files might elicit the error: "Options error: Parameter pkcs11_private_mode
  can only be specified in TLS-mode, i.e. where --tls-server or --tls-client
  is also specified."

* Added "forget-passwords" command to the management interface
  (Alon Bar-Lev).

* Added --management-signal option to signal SIGUSR1 when the
  management interface disconnects (Alon Bar-Lev).

* Modified command line and config file parser to allow
  quoted strings using single quotes ('') (Alon Bar-Lev).

* Use pkcs11-helper as external library, can be downloaded from
  https://www.opensc-project.org/pkcs11-helper (Alon Bar-Lev).

* Fixed interim memory growth issue in TCP connect loop where
  "TCP: connect to %s failed, will try again in %d seconds: %s"
  is output.

* Fixed bug in epoll driver in event.c, where the lack of a
  handler for EPOLLHUP could cause 99% CPU usage.

* Defined ALLOW_NON_CBC_CIPHERS for people who don't
  want to use a CBC cipher for OpenVPN's data channel.

* Added PLUGIN_LIBDIR preprocessor string to prepend a default
  plugin directory to the dlopen search list when the user
  specifies the basename of the plugin only (Marius Tomaschewski).

* Rewrote extract_x509_field and modified COMMON_NAME_CHAR_CLASS
  to allow forward slash characters ("/") in the X509 common name
  (Pavel Shramov).

* Allow OpenVPN to run completely unprivileged under Linux
  by allowing openvpn --mktun to be used with --user and --group
  to set the UID/GID of the tun device node.  Also added --iproute
  option to allow an alternative command to be executed in place
  of the default iproute2 command (Alon Bar-Lev).

* Fixed --disable-iproute2 in ./configure to actually disable
  iproute2 usage (Alon Bar-Lev).

* Added --management-forget-disconnect option -- forget
  passwords when management session disconnects (Alon Bar-Lev).

4 files changed, 24 insertions, 24 deletions

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index b7528de2c0d..888184d6fdf 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2008/01/18 05:08:48 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2008/02/13 12:07:24 martti Exp $
 #
 
-DISTNAME=	openvpn-2.1_rc4
-PKGNAME=	openvpn-2.1rc4
-
-PKGREVISION=	1
+DISTNAME=	openvpn-2.1_rc7
+PKGNAME=	openvpn-2.1rc7
+#PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://openvpn.net/release/ \
 		http://openvpn.net/release/old/
@@ -12,6 +11,7 @@ MASTER_SITES=	http://openvpn.net/release/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openvpn.net/
 COMMENT=	Easy-to-use SSL VPN daemon
+#LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		grep:run
diff --git a/net/openvpn/PLIST b/net/openvpn/PLIST
index c3959633617..43ed39ea6a4 100644
--- a/net/openvpn/PLIST
+++ b/net/openvpn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/06/21 21:44:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/02/13 12:07:24 martti Exp $
 man/man8/openvpn.8
 sbin/openvpn
 share/doc/openvpn/management-notes.txt
@@ -19,6 +19,8 @@ share/examples/openvpn/config/tls-office.conf
 share/examples/openvpn/config/xinetd-client-config
 share/examples/openvpn/config/xinetd-server-config
 share/examples/openvpn/keys/README
+share/examples/openvpn/keys/ca.crt
+share/examples/openvpn/keys/ca.key
 share/examples/openvpn/keys/client.crt
 share/examples/openvpn/keys/client.key
 share/examples/openvpn/keys/dh1024.pem
@@ -27,8 +29,6 @@ share/examples/openvpn/keys/pass.key
 share/examples/openvpn/keys/pkcs12.p12
 share/examples/openvpn/keys/server.crt
 share/examples/openvpn/keys/server.key
-share/examples/openvpn/keys/ca.crt
-share/examples/openvpn/keys/ca.key
 share/examples/openvpn/scripts/auth-pam.pl
 share/examples/openvpn/scripts/bridge-start
 share/examples/openvpn/scripts/bridge-stop
diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo
index d20cbac6d6a..2a4ca799073 100644
--- a/net/openvpn/distinfo
+++ b/net/openvpn/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2007/07/01 15:40:05 tnn Exp $
+$NetBSD: distinfo,v 1.14 2008/02/13 12:07:24 martti Exp $
 
-SHA1 (openvpn-2.1_rc4.tar.gz) = 4a22e23e497b7f5269628b1f430207c700cd6ebf
-RMD160 (openvpn-2.1_rc4.tar.gz) = d9843c2fb6fda64b5cf9474f42b36068bb4cd845
-Size (openvpn-2.1_rc4.tar.gz) = 803125 bytes
+SHA1 (openvpn-2.1_rc7.tar.gz) = f9f57a8ef3af8ab51924784ad2aab5d5f5798581
+RMD160 (openvpn-2.1_rc7.tar.gz) = 67e80d7bfb554046c71c95ec15d478504057f903
+Size (openvpn-2.1_rc7.tar.gz) = 787379 bytes
 SHA1 (patch-ab) = d26cdc9166a8813860f31cb5b11bc5b3643b8aa5
-SHA1 (patch-ac) = efbc3f00d2391a0b66fa88296359e3e0189b4cee
+SHA1 (patch-ac) = 21e8e89b03b69cf8e6ec7dbb6eb57885992e8aed
 SHA1 (patch-ad) = 69f5fff5105131dc05ab38a1a717e1b363f88c1c
 SHA1 (patch-ae) = 66f7d62588d465daa6195ee550bdad4ac2879db7
 SHA1 (patch-af) = b30791372a097e02250515ec57a62b0a4fde2cdd
diff --git a/net/openvpn/patches/patch-ac b/net/openvpn/patches/patch-ac
index b2cdd0db676..f07d55c7f3b 100644
--- a/net/openvpn/patches/patch-ac
+++ b/net/openvpn/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2007/07/01 15:40:06 tnn Exp $
+$NetBSD: patch-ac,v 1.6 2008/02/13 12:07:24 martti Exp $
 
---- tun.c.orig	2007-04-25 23:38:46.000000000 +0200
-+++ tun.c
-@@ -68,6 +68,7 @@ static const char *netsh_get_id (const c
+--- tun.c.orig	2008-01-26 06:39:13.000000000 +0200
++++ tun.c	2008-02-13 13:32:50.000000000 +0200
+@@ -68,6 +68,7 @@
  
  #ifdef TARGET_SOLARIS
  static void solaris_error_close (struct tuntap *tt, const struct env_set *es, const char *actual);
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.5 2007/07/01 15:40:06 tnn Exp $
  #endif
  
  bool
-@@ -659,7 +660,12 @@ do_ifconfig (struct tuntap *tt,
+@@ -662,7 +663,12 @@
  			    );
  	}
        else
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.5 2007/07/01 15:40:06 tnn Exp $
  
        msg (M_INFO, "%s", command_line);
        if (!system_check (command_line, es, 0, "Solaris ifconfig phase-2 failed"))
-@@ -945,7 +951,37 @@ open_tun_generic (const char *dev, const
+@@ -948,7 +954,37 @@
  	  if (dynamic && !has_digit((unsigned char *)dev))
  	    {
  	      int i;
@@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.5 2007/07/01 15:40:06 tnn Exp $
  		{
  		  openvpn_snprintf (tunname, sizeof (tunname),
  				    "/dev/%s%d", dev, i);
-@@ -1255,13 +1291,16 @@ read_tun (struct tuntap* tt, uint8_t *bu
+@@ -1310,13 +1346,16 @@
  void
  open_tun (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, struct tuntap *tt)
  {
@@ -83,7 +83,7 @@ $NetBSD: patch-ac,v 1.5 2007/07/01 15:40:06 tnn Exp $
  
    ipv6_support (ipv6, false, tt);
  
-@@ -1282,9 +1321,10 @@ open_tun (const char *dev, const char *d
+@@ -1337,9 +1376,10 @@
      }
    else if (tt->type == DEV_TYPE_TAP)
      {
@@ -95,7 +95,7 @@ $NetBSD: patch-ac,v 1.5 2007/07/01 15:40:06 tnn Exp $
        dev_tuntap_type = "tap";
        link_type = I_PLINK; /* was: I_LINK */
        is_tun = false;
-@@ -1311,7 +1351,11 @@ open_tun (const char *dev, const char *d
+@@ -1366,7 +1406,11 @@
      msg (M_ERR, "Can't open %s", dev_node);
  
    /* Assign a new PPA and get its unit number. */
@@ -108,7 +108,7 @@ $NetBSD: patch-ac,v 1.5 2007/07/01 15:40:06 tnn Exp $
      msg (M_ERR, "Can't assign new interface");
  
    if ((if_fd = open (dev_node, O_RDWR, 0)) < 0)
-@@ -1320,27 +1364,81 @@ open_tun (const char *dev, const char *d
+@@ -1375,27 +1419,81 @@
    if (ioctl (if_fd, I_PUSH, "ip") < 0)
      msg (M_ERR, "Can't push IP module");
  
@@ -203,7 +203,7 @@ $NetBSD: patch-ac,v 1.5 2007/07/01 15:40:06 tnn Exp $
        msg (M_ERR, "Can't set multiplexor id");
      }
  
-@@ -1358,18 +1456,24 @@ solaris_close_tun (struct tuntap *tt)
+@@ -1413,18 +1511,24 @@
      {
        if (tt->ip_fd >= 0)
  	{