Update net/openvpn to 2.1rc4. Changes from version 2.1rc2 include:

* Fixed 64-bit portability bug in time_string function
  (Thomas Habets).

* Clean up configure on FreeBSD for recent autotool versions
  that require that all .h files have to be compiled.
  Also, FreeBSD install does not support GNU long options
  which the Makefile in easy-rsa/2.0 uses (not checked the
  others as we don't install those on Gentoo) (Roy Marples).

8 files changed, 117 insertions, 55 deletions

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index d53edb41be8..2f156a19520 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2007/02/28 11:06:21 sborrill Exp $
+# $NetBSD: Makefile,v 1.21 2007/06/21 21:44:42 jlam Exp $
 #
 
-DISTNAME=	openvpn-2.1_rc2
-PKGNAME=	openvpn-2.1rc2
+DISTNAME=	openvpn-2.1_rc4
+PKGNAME=	openvpn-2.1rc4
 
 CATEGORIES=	net
 MASTER_SITES=	http://openvpn.net/release/ \
@@ -22,13 +22,18 @@ PKG_SYSCONFSUBDIR=	openvpn
 DATADIR=		${PREFIX}/share/${PKGBASE}
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+EASYRSADIR=		${DATADIR}/easy-rsa
 RCD_SCRIPTS=		openvpn
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--enable-pthread
 CONFIGURE_ARGS+=	--enable-password-save
 CONFIGURE_ARGS+=	--disable-dependency-tracking
 
+# Pthread support is still considered very experimental, so don't enable
+# it for the default (production) build.
+#
+#CONFIGURE_ARGS+=	--enable-pthread
+
 INSTALLATION_DIRS=	${DATADIR}/easy-rsa	${EGDIR}/config		\
 			${DOCDIR}		${EGDIR}/keys		\
 						${EGDIR}/scripts
@@ -43,35 +48,32 @@ DL_AUTO_VARS=		yes
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
-# Fix up the paths to tools in the pkitool script.
-post-build:
-	for file in ${WRKSRC}/easy-rsa/2.0/pkitool; do			\
-		${SED}	-e "s|^\\(GREP\\)=.*|\\1=\""${GREP}"\"|"		\
-			-e "s|^\\(OPENSSL\\)=.*|\\1=\""${SSLBASE}/bin/openssl"\"|" \
-			$$file > $$file.new;				\
-		${MV} -f $$file.new $$file;				\
-		${CHMOD} +x $$file;					\
-	done
+SUBST_CLASSES+=		pkitool
+SUBST_STAGE.pkitool=	post-build
+SUBST_MESSAGE.pkitool=	Fixing up default paths to grep & openssl in pkitool.
+SUBST_FILES.pkitool=	easy-rsa/2.0/pkitool
+SUBST_SED.pkitool=	\
+	-e "s|\\(GREP\\)=.*|\\1=\""${GREP:Q}"\"|"			\
+	-e "s|\\(OPENSSL\\)=.*|\\1=\""${SSLBASE:Q}/bin/openssl"\"|"
 
 post-install:
-	dir=${DATADIR:S/^${PREFIX}\///}/easy-rsa;			\
-	cd ${WRKSRC}/easy-rsa/2.0;					\
-	${GREP} "^$$dir/" ${PKGDIR}/PLIST | ${SED} "s|^$$dir/||" |	\
-	while read file; do						\
+	cd ${WRKSRC:Q}/easy-rsa/2.0; for file in [a-zR]*; do		\
 		case $$file in						\
-		[A-Z]*|*.cnf|vars)	${INSTALL_DATA} $$file ${PREFIX}/$$dir ;; \
-		*)		${INSTALL_SCRIPT} $$file ${PREFIX}/$$dir ;; \
+		*.orig)	;;						\
+		[A-Z]*|*.cnf|vars)					\
+			${INSTALL_DATA} $$file ${EASYRSADIR:Q} ;;	\
+		*)	${INSTALL_SCRIPT} $$file ${EASYRSADIR:Q} ;;	\
 		esac;							\
 	done
-	${INSTALL_DATA} ${WRKSRC}/management/management-notes.txt ${DOCDIR}
-	cd ${WRKSRC}/sample-config-files; for file in *; do		\
-		${INSTALL_DATA} $$file ${EGDIR}/config;			\
+	${INSTALL_DATA} ${WRKSRC:Q}/management/management-notes.txt ${DOCDIR:Q}
+	cd ${WRKSRC:Q}/sample-config-files; for file in *; do		\
+		${INSTALL_DATA} $$file ${EGDIR:Q}/config;		\
 	done
-	cd ${WRKSRC}/sample-scripts; for file in *; do			\
-		${INSTALL_DATA} $$file ${EGDIR}/scripts;		\
+	cd ${WRKSRC:Q}/sample-scripts; for file in *; do		\
+		${INSTALL_DATA} $$file ${EGDIR:Q}/scripts;		\
 	done
-	cd ${WRKSRC}/sample-keys; for file in *; do			\
-		${INSTALL_DATA} $$file ${EGDIR}/keys;			\
+	cd ${WRKSRC:Q}/sample-keys; for file in *; do			\
+		${INSTALL_DATA} $$file ${EGDIR:Q}/keys;			\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openvpn/PLIST b/net/openvpn/PLIST
index 1e5d112217d..c3959633617 100644
--- a/net/openvpn/PLIST
+++ b/net/openvpn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/02/20 09:40:49 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/06/21 21:44:42 jlam Exp $
 man/man8/openvpn.8
 sbin/openvpn
 share/doc/openvpn/management-notes.txt
@@ -49,11 +49,13 @@ share/openvpn/easy-rsa/build-req-pass
 share/openvpn/easy-rsa/clean-all
 share/openvpn/easy-rsa/inherit-inter
 share/openvpn/easy-rsa/list-crl
+share/openvpn/easy-rsa/openssl-0.9.6.cnf
 share/openvpn/easy-rsa/openssl.cnf
 share/openvpn/easy-rsa/pkitool
 share/openvpn/easy-rsa/revoke-full
 share/openvpn/easy-rsa/sign-req
 share/openvpn/easy-rsa/vars
+share/openvpn/easy-rsa/whichopensslcnf
 @dirrm share/openvpn/easy-rsa
 @dirrm share/openvpn
 @dirrm share/examples/openvpn/scripts
diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo
index 9e665b24292..deea37d639a 100644
--- a/net/openvpn/distinfo
+++ b/net/openvpn/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.11 2007/02/28 11:06:21 sborrill Exp $
+$NetBSD: distinfo,v 1.12 2007/06/21 21:44:42 jlam Exp $
 
-SHA1 (openvpn-2.1_rc2.tar.gz) = 30e6983bb0cb8c28b89dc438c2804dcf7f70988d
-RMD160 (openvpn-2.1_rc2.tar.gz) = d9608869ceae3edb610a94b0076d8ac9c818663c
-Size (openvpn-2.1_rc2.tar.gz) = 802075 bytes
-SHA1 (patch-ab) = 05c9df0a7a71cb1cfa4a2f132df02cac822ba3ba
+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 (patch-ab) = d26cdc9166a8813860f31cb5b11bc5b3643b8aa5
 SHA1 (patch-ac) = 2fe382042522d46f1f6fba5a3e07992b7d701460
-SHA1 (patch-ad) = ee577ad5c5621bbfa05d522e85e467e937929f6e
-SHA1 (patch-ae) = b6f8f869b5c727120df8dd433e54ffe3537e0006
-SHA1 (patch-af) = acde49f65530921940ce9e5b6fdcfb0cdd9af7c0
+SHA1 (patch-ad) = 69f5fff5105131dc05ab38a1a717e1b363f88c1c
+SHA1 (patch-ae) = 66f7d62588d465daa6195ee550bdad4ac2879db7
+SHA1 (patch-af) = b30791372a097e02250515ec57a62b0a4fde2cdd
+SHA1 (patch-ag) = fe8e59cf177c99c2fd001e7893df86af961e8e4e
diff --git a/net/openvpn/patches/patch-ab b/net/openvpn/patches/patch-ab
index a466a6baca7..17d8d90fca3 100644
--- a/net/openvpn/patches/patch-ab
+++ b/net/openvpn/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2006/04/11 20:09:52 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2007/06/21 21:44:42 jlam Exp $
 
---- syshead.h.orig	2005-12-08 15:57:49.000000000 -0500
+--- syshead.h.orig	2007-04-25 17:38:46.000000000 -0400
 +++ syshead.h
-@@ -254,6 +254,10 @@
+@@ -262,6 +262,10 @@
  
  #ifdef TARGET_NETBSD
  
diff --git a/net/openvpn/patches/patch-ad b/net/openvpn/patches/patch-ad
index adfb2cdf5da..ef5b36832ab 100644
--- a/net/openvpn/patches/patch-ad
+++ b/net/openvpn/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2006/04/11 20:09:52 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2007/06/21 21:44:42 jlam Exp $
 
---- config.h.in.orig	2006-04-05 04:03:07.000000000 -0400
+--- config.h.in.orig	2007-04-25 19:54:40.000000000 -0400
 +++ config.h.in
-@@ -201,6 +201,9 @@
+@@ -216,6 +216,9 @@
  /* Define to 1 if you have the <net/if.h> header file. */
  #undef HAVE_NET_IF_H
  
diff --git a/net/openvpn/patches/patch-ae b/net/openvpn/patches/patch-ae
index 39ebdf95eab..f36516b3d10 100644
--- a/net/openvpn/patches/patch-ae
+++ b/net/openvpn/patches/patch-ae
@@ -1,13 +1,34 @@
-$NetBSD: patch-ae,v 1.1 2006/04/11 20:09:52 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2007/06/21 21:44:42 jlam Exp $
 
---- configure.ac.orig	2006-04-05 04:02:59.000000000 -0400
+--- configure.ac.orig	2007-04-25 17:38:46.000000000 -0400
 +++ configure.ac
-@@ -266,7 +266,7 @@ AC_CHECK_HEADERS(sys/time.h sys/socket.h
+@@ -285,14 +285,17 @@ AC_CHECK_HEADERS(sys/time.h sys/socket.h
  		 sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h dnl
  		 stdarg.h unistd.h signal.h stdio.h string.h dnl
  		 strings.h ctype.h errno.h syslog.h pwd.h grp.h dnl
--		 net/if_tun.h net/if.h stropts.h sys/sockio.h dnl
-+		 net/if_tap.h net/if_tun.h net/if.h stropts.h sys/sockio.h dnl
- 		 netinet/in.h netinet/in_systm.h netinet/ip.h dnl
- 		 netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h dnl
+-		 net/if_tun.h stropts.h sys/sockio.h dnl
++		 net/if_tap.h net/if_tun.h stropts.h sys/sockio.h dnl
+ 		 netinet/in.h netinet/in_systm.h dnl
+ 		 netinet/tcp.h arpa/inet.h dnl
  		 netdb.h sys/uio.h linux/if_tun.h linux/sockios.h dnl
+ 		 linux/types.h sys/poll.h sys/epoll.h err.h dnl
+ )
+ AC_CHECK_HEADERS(net/if.h,,,
+-		 [#ifdef HAVE_SYS_SOCKET_H 
++		 [#ifdef HAVE_SYS_TYPES_H 
++		  # include <sys/types.h>
++		  #endif
++		  #ifdef HAVE_SYS_SOCKET_H 
+ 		  # include <sys/socket.h>
+ 		  #endif
+ 		 ])
+@@ -314,6 +317,9 @@ AC_CHECK_HEADERS(netinet/if_ether.h,,,
+ 		  #ifdef HAVE_SYS_SOCKET_H
+ 		  # include <sys/socket.h>
+ 		  #endif
++		  #ifdef HAVE_NET_IF_H
++		  # include <net/if.h>
++		  #endif
+ 		  #ifdef HAVE_NETINET_IN_H
+ 		  # include <netinet/in.h>
+ 		  #endif
diff --git a/net/openvpn/patches/patch-af b/net/openvpn/patches/patch-af
index 3fc933ef25d..62619bc8a77 100644
--- a/net/openvpn/patches/patch-af
+++ b/net/openvpn/patches/patch-af
@@ -1,13 +1,35 @@
-$NetBSD: patch-af,v 1.2 2007/02/20 09:40:49 sborrill Exp $
+$NetBSD: patch-af,v 1.3 2007/06/21 21:44:42 jlam Exp $
 
---- configure.orig	2006-10-31 22:53:55.000000000 +0000
-+++ configure	2007-02-12 11:01:39.000000000 +0000
-@@ -4929,7 +4929,7 @@
+--- configure.orig	2007-04-25 19:54:40.000000000 -0400
++++ configure
+@@ -5528,7 +5528,7 @@ fi
  
  
  
--for ac_header in sys/time.h sys/socket.h sys/ioctl.h sys/stat.h 		 sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h 		 stdarg.h unistd.h signal.h stdio.h string.h 		 strings.h ctype.h errno.h syslog.h pwd.h grp.h 		 net/if_tun.h net/if.h stropts.h sys/sockio.h 		 netinet/in.h netinet/in_systm.h netinet/ip.h 		 netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h 		 netdb.h sys/uio.h linux/if_tun.h linux/sockios.h 		 linux/types.h sys/poll.h sys/epoll.h err.h
-+for ac_header in sys/time.h sys/socket.h sys/ioctl.h sys/stat.h 		 sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h 		 stdarg.h unistd.h signal.h stdio.h string.h 		 strings.h ctype.h errno.h syslog.h pwd.h grp.h 		 net/if_tap.h net/if_tun.h net/if.h stropts.h sys/sockio.h 		 netinet/in.h netinet/in_systm.h netinet/ip.h 		 netinet/if_ether.h netinet/tcp.h resolv.h arpa/inet.h 		 netdb.h sys/uio.h linux/if_tun.h linux/sockios.h 		 linux/types.h sys/poll.h sys/epoll.h err.h
+-for ac_header in sys/time.h sys/socket.h sys/ioctl.h sys/stat.h 		 sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h 		 stdarg.h unistd.h signal.h stdio.h string.h 		 strings.h ctype.h errno.h syslog.h pwd.h grp.h 		 net/if_tun.h stropts.h sys/sockio.h 		 netinet/in.h netinet/in_systm.h 		 netinet/tcp.h arpa/inet.h 		 netdb.h sys/uio.h linux/if_tun.h linux/sockios.h 		 linux/types.h sys/poll.h sys/epoll.h err.h
++for ac_header in sys/time.h sys/socket.h sys/ioctl.h sys/stat.h 		 sys/mman.h fcntl.h sys/file.h stdlib.h stdint.h 		 stdarg.h unistd.h signal.h stdio.h string.h 		 strings.h ctype.h errno.h syslog.h pwd.h grp.h 		 net/if_tap.h net/if_tun.h stropts.h sys/sockio.h 		 netinet/in.h netinet/in_systm.h 		 netinet/tcp.h arpa/inet.h 		 netdb.h sys/uio.h linux/if_tun.h linux/sockios.h 		 linux/types.h sys/poll.h sys/epoll.h err.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -5687,7 +5687,10 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#ifdef HAVE_SYS_SOCKET_H
++#ifdef HAVE_SYS_TYPES_H
++		  # include <sys/types.h>
++		  #endif
++		  #ifdef HAVE_SYS_SOCKET_H
+ 		  # include <sys/socket.h>
+ 		  #endif
+ 
+@@ -5821,6 +5824,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 		  #ifdef HAVE_SYS_SOCKET_H
+ 		  # include <sys/socket.h>
+ 		  #endif
++		  #ifdef HAVE_NET_IF_H
++		  # include <net/if.h>
++		  #endif
+ 		  #ifdef HAVE_NETINET_IN_H
+ 		  # include <netinet/in.h>
+ 		  #endif
diff --git a/net/openvpn/patches/patch-ag b/net/openvpn/patches/patch-ag
new file mode 100644
index 00000000000..f1e51c54114
--- /dev/null
+++ b/net/openvpn/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 2007/06/21 21:44:42 jlam Exp $
+
+--- easy-rsa/2.0/pkitool.orig	2007-04-25 17:38:44.000000000 -0400
++++ easy-rsa/2.0/pkitool
+@@ -134,6 +134,9 @@ CA="ca"
+ PKCS11_MODULE_PATH="dummy"
+ PKCS11_PIN="dummy"
+ 
++[ -n "$GREP" ] || GREP=grep
++[ -n "$OPENSSL" ] || OPENSSL=openssl
++
+ # Process options
+ while [ $# -gt 0 ]; do
+     case "$1" in