4 files changed, 11 insertions, 27 deletions

diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index 1290704f3380..9baab330a633 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openvpn
-DISTVERSION=	2.1_beta15
+DISTVERSION=	2.1_beta16
 CATEGORIES=	security net
 # MASTER_SITES points to hosts in distinct data centers,
 # so just one MASTER_SITES entry should be OK.
@@ -62,6 +62,7 @@ post-patch:
 
 post-build:
 	cd ${WRKSRC}/plugin/down-root && ${MAKE}
+	cd ${WRKSRC}/plugin/auth-pam && ${CC} ${CPPFLAGS} -I../.. -DDLOPEN_PAM=0 ${CFLAGS} -fPIC -shared -Wl,-soname,openvpn-auth-pam.so -o openvpn-auth-pam.so auth-pam.c pamdl.c -lc -lpam
 	@# self-tests here
 .if !defined(WITHOUT_CHECK)
 	cd ${WRKSRC} && ${MAKE} check
@@ -72,12 +73,12 @@ pre-install:
 
 post-install:
 	${MKDIR} ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/plugin/down-root/openvpn-down-root.so \
-		${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/plugin/down-root/openvpn-down-root.so ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/plugin/auth-pam/openvpn-auth-pam.so ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/plugin/down-root/README \
-		${DOCSDIR}/README.openvpn-down-root
+	${INSTALL_DATA} ${WRKSRC}/plugin/down-root/README ${DOCSDIR}/README.openvpn-down-root
+	${INSTALL_DATA} ${WRKSRC}/plugin/auth-pam/README ${DOCSDIR}/README.openvpn-auth-pam
 .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \
 	PORTS README
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo
index bc669e9485eb..54d0b62f9212 100644
--- a/security/openvpn-devel/distinfo
+++ b/security/openvpn-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (openvpn-2.1_beta15.tar.gz) = 2ddc1878c99ea3a9b348275338f7d502
-SHA256 (openvpn-2.1_beta15.tar.gz) = 35daa28523095d637bc694d4e22f9a0e075f9e8b910998ca7bf2576fa9d8cc05
-SIZE (openvpn-2.1_beta15.tar.gz) = 776778
+MD5 (openvpn-2.1_beta16.tar.gz) = 3a53f55dafcfa4aab9e408e36326e236
+SHA256 (openvpn-2.1_beta16.tar.gz) = 1628613c52c6a16dd08f9f5079d4cdf0f408d6c92ffe969e3efaebb0aff7d1ad
+SIZE (openvpn-2.1_beta16.tar.gz) = 778889
diff --git a/security/openvpn-devel/files/patch-fix-cltsrv-timeout b/security/openvpn-devel/files/patch-fix-cltsrv-timeout
deleted file mode 100644
index 8d5cf3df1465..000000000000
--- a/security/openvpn-devel/files/patch-fix-cltsrv-timeout
+++ /dev/null
@@ -1,19 +0,0 @@
-This fix was published by Paul Howarth on the OpenVPN-devel mailing list
-on 2006-09-13 and fixes the TLS test's running indefinitely.
-
---- ./sample-config-files/loopback-client~	2006-09-12 18:21:43.000000000 +0100
-+++ ./sample-config-files/loopback-client	2006-09-12 18:22:40.000000000 +0100
-@@ -22,4 +22,4 @@
- cert sample-keys/client.crt
- cipher DES-EDE3-CBC
- ping 1
--inactive 120
-+inactive 120 10000000
---- ./sample-config-files/loopback-server~	2006-09-12 18:21:50.000000000 +0100
-+++ ./sample-config-files/loopback-server	2006-09-12 18:22:51.000000000 +0100
-@@ -23,4 +23,4 @@
- cert sample-keys/server.crt
- cipher DES-EDE3-CBC
- ping 1
--inactive 120
-+inactive 120 10000000
diff --git a/security/openvpn-devel/pkg-plist b/security/openvpn-devel/pkg-plist
index f38e1d6861cd..9607e2b3b53a 100644
--- a/security/openvpn-devel/pkg-plist
+++ b/security/openvpn-devel/pkg-plist
@@ -1,4 +1,5 @@
 sbin/openvpn
+lib/openvpn-auth-pam.so
 lib/openvpn-down-root.so
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -8,6 +9,7 @@ lib/openvpn-down-root.so
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PORTS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-auth-pam
 %%PORTDOCS%%%%DOCSDIR%%/README.openvpn-down-root
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/README
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-ca