summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpaetzel <jpaetzel@FreeBSD.org>2017-06-23 16:37:41 +0000
committerjpaetzel <jpaetzel@FreeBSD.org>2017-06-23 16:37:41 +0000
commit107c6fcd98914602ad79c8db55e1406c8223c581 (patch)
tree1a17d4d32043dc6685fbc61b1530f5c4f25fc167
parentd35a37ca62483f1e6ab205fc154b63fd7b57694b (diff)
downloadFreeBSD-ports-107c6fcd98914602ad79c8db55e1406c8223c581.zip
FreeBSD-ports-107c6fcd98914602ad79c8db55e1406c8223c581.tar.gz
MFH: r440983
Update to new snapshot. Note I didn't take the original patch because it needed to NOT conflict with itself, and I had to fix indentation - be sure to use TAB, not blanks, after the VARIABLE= part. PR: 219305 Submitted by: ecrist@secure-computing.net (maintainer) Approved by: ports-secteam (delphij)
-rw-r--r--security/openvpn-devel/Makefile23
-rw-r--r--security/openvpn-devel/distinfo6
2 files changed, 17 insertions, 12 deletions
diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index 7b4ba71..0f795a4 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -1,12 +1,12 @@
# Created by: Matthias Andree <mandree@FreeBSD.org>
# $FreeBSD$
-PORTNAME= openvpn
-DISTVERSION= 201652
+PORTNAME= openvpn
+DISTVERSION= 201719
PORTREVISION?= 0
-CATEGORIES= security net
+CATEGORIES= security net
MASTER_SITES= https://secure-computing.net/files/openvpn/ \
- ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/
+ ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/
PKGNAMESUFFIX= -devel
MAINTAINER= ecrist@secure-computing.net
@@ -17,11 +17,11 @@ LICENSE= GPLv2
CONFLICTS_INSTALL= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]*
GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
-USES= cpe libtool pkgconfig shebangfix tar:xz
+WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
+USES= cpe libtool pkgconfig shebangfix tar:xz
SHEBANG_FILES= sample/sample-scripts/verify-cn \
- sample/sample-scripts/auth-pam.pl \
- sample/sample-scripts/ucn.pl
+ sample/sample-scripts/auth-pam.pl \
+ sample/sample-scripts/ucn.pl
CONFIGURE_ARGS+= --enable-strict
# avoid picking up CMAKE, we don't have cmocka in the tarballs..
CONFIGURE_ENV+= ac_cv_prog_CMAKE= CMAKE=
@@ -35,13 +35,14 @@ LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -DPLUGIN_LIBDIR=\\\"${PREFIX}/lib/openvpn/plugins\\\"
OPTIONS_DEFINE= PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \
- TEST LZ4 SMALL
+ TEST LZ4 SMALL TUNNELBLICK
OPTIONS_DEFAULT= EASYRSA OPENSSL TEST LZ4
OPTIONS_SINGLE= SSL
OPTIONS_SINGLE_SSL= OPENSSL MBEDTLS
PKCS11_DESC= Use security/pkcs11-helper
EASYRSA_DESC= Install security/easy-rsa RSA helper package
MBEDTLS_DESC= SSL/TLS via mbedTLS
+TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!)
X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only)
SMALL_DESC= Build a smaller executable with fewer features
@@ -49,6 +50,10 @@ EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa
PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper
PKCS11_CONFIGURE_ENABLE= pkcs11
+PKCS11_PREVENTS= MBEDTLS
+PKCS11_PREVENTS_MSG= OpenVPN cannot use pkcs11-helper with mbedTLS. Disable PKCS11, or use OpenSSL instead
+
+TUNNELBLICK_EXTRA_PATCHES= ${FILESDIR}/extra-tunnelblick-openvpn_xorpatch
X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username
diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo
index 7886bee..bd2517f 100644
--- a/security/openvpn-devel/distinfo
+++ b/security/openvpn-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483453128
-SHA256 (openvpn-201652.tar.xz) = 783c3d5200bd286cc83e5accec075ef7f896a401b9bf550801606d1b76a1d797
-SIZE (openvpn-201652.tar.xz) = 928316
+TIMESTAMP = 1494853427
+SHA256 (openvpn-201719.tar.xz) = 26724017c6a79f4936f473c8c03760037045cdea3b3f312f32dc0daeaa6ede93
+SIZE (openvpn-201719.tar.xz) = 935492
OpenPOWER on IntegriCloud