- Update to 2.1.beta15

PR:		ports/103244
Submitted by:	Matthias Andree <matthias.andree at gmx.de> (maintainer)

4 files changed, 27 insertions, 5 deletions

diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index a3d55edea7a4..1290704f3380 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openvpn
-DISTVERSION=	2.1_beta14
-PORTREVISION=	1
+DISTVERSION=	2.1_beta15
 CATEGORIES=	security net
 # MASTER_SITES points to hosts in distinct data centers,
 # so just one MASTER_SITES entry should be OK.
@@ -58,6 +57,9 @@ LIB_DEPENDS+=	lzo.1:${PORTSDIR}/archivers/lzo
 CONFIGURE_ARGS+=	--enable-password-save
 .endif
 
+post-patch:
+	@${FIND} ${WRKSRC} -name \*.orig -delete
+
 post-build:
 	cd ${WRKSRC}/plugin/down-root && ${MAKE}
 	@# self-tests here
diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo
index 54a4b3c7a62e..bc669e9485eb 100644
--- a/security/openvpn-devel/distinfo
+++ b/security/openvpn-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (openvpn-2.1_beta14.tar.gz) = 7bd96eaa834a1779755d68c9b2591583
-SHA256 (openvpn-2.1_beta14.tar.gz) = da61d236047b9a5985765961930446a706aeef87dc2b4ce0f7e2c9f2831566ea
-SIZE (openvpn-2.1_beta14.tar.gz) = 775042
+MD5 (openvpn-2.1_beta15.tar.gz) = 2ddc1878c99ea3a9b348275338f7d502
+SHA256 (openvpn-2.1_beta15.tar.gz) = 35daa28523095d637bc694d4e22f9a0e075f9e8b910998ca7bf2576fa9d8cc05
+SIZE (openvpn-2.1_beta15.tar.gz) = 776778
diff --git a/security/openvpn-devel/files/patch-fix-cltsrv-timeout b/security/openvpn-devel/files/patch-fix-cltsrv-timeout
new file mode 100644
index 000000000000..8d5cf3df1465
--- /dev/null
+++ b/security/openvpn-devel/files/patch-fix-cltsrv-timeout
@@ -0,0 +1,19 @@
+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 12ab817929a1..f38e1d6861cd 100644
--- a/security/openvpn-devel/pkg-plist
+++ b/security/openvpn-devel/pkg-plist
@@ -27,6 +27,7 @@ lib/openvpn-down-root.so
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/revoke-full
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/sign-req
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/vars
+%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/README
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-ca
 %%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-dh