View | Details | Raw Unified | Return to bug 220183 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +9 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=			openvpn
4
PORTNAME=			openvpn
5
DISTVERSION=		201652
5
DISTVERSION=		201719
6
PORTREVISION?=		0
6
PORTREVISION?=		0
7
CATEGORIES=			security net
7
CATEGORIES=			security net
8
MASTER_SITES=		https://secure-computing.net/files/openvpn/ \
8
MASTER_SITES=		https://secure-computing.net/files/openvpn \
9
					ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/
9
					ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/
10
PKGNAMESUFFIX=		-devel
10
PKGNAMESUFFIX=		-devel
11
11
Lines 14-20 Link Here
14
14
15
LICENSE=		GPLv2
15
LICENSE=		GPLv2
16
16
17
CONFLICTS_INSTALL=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]*
17
CONFLICTS_INSTALL=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]*
18
18
19
GNU_CONFIGURE=		yes
19
GNU_CONFIGURE=		yes
20
WRKSRC=				${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
20
WRKSRC=				${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
Lines 35-41 Link Here
35
CPPFLAGS+=		-DPLUGIN_LIBDIR=\\\"${PREFIX}/lib/openvpn/plugins\\\"
35
CPPFLAGS+=		-DPLUGIN_LIBDIR=\\\"${PREFIX}/lib/openvpn/plugins\\\"
36
36
37
OPTIONS_DEFINE=		PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \
37
OPTIONS_DEFINE=		PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \
38
			TEST LZ4 SMALL
38
			TEST LZ4 SMALL TUNNELBLICK
39
OPTIONS_DEFAULT=	EASYRSA OPENSSL TEST LZ4
39
OPTIONS_DEFAULT=	EASYRSA OPENSSL TEST LZ4
40
OPTIONS_SINGLE=		SSL
40
OPTIONS_SINGLE=		SSL
41
OPTIONS_SINGLE_SSL=	OPENSSL MBEDTLS
41
OPTIONS_SINGLE_SSL=	OPENSSL MBEDTLS
Lines 42-47 Link Here
42
PKCS11_DESC=		Use security/pkcs11-helper
42
PKCS11_DESC=		Use security/pkcs11-helper
43
EASYRSA_DESC=		Install security/easy-rsa RSA helper package
43
EASYRSA_DESC=		Install security/easy-rsa RSA helper package
44
MBEDTLS_DESC=		SSL/TLS via mbedTLS
44
MBEDTLS_DESC=		SSL/TLS via mbedTLS
45
TUNNELBLICK_DESC=	Tunnelblick XOR scramble patch (READ HELP!)
45
X509ALTUSERNAME_DESC=	Enable --x509-username-field (OpenSSL only)
46
X509ALTUSERNAME_DESC=	Enable --x509-username-field (OpenSSL only)
46
SMALL_DESC=		Build a smaller executable with fewer features
47
SMALL_DESC=		Build a smaller executable with fewer features
47
48
Lines 49-55 Link Here
49
50
50
PKCS11_LIB_DEPENDS=	libpkcs11-helper.so:security/pkcs11-helper
51
PKCS11_LIB_DEPENDS=	libpkcs11-helper.so:security/pkcs11-helper
51
PKCS11_CONFIGURE_ENABLE=	pkcs11
52
PKCS11_CONFIGURE_ENABLE=	pkcs11
53
PKCS11_PREVENTS=	MBEDTLS
54
PKCS11_PREVENTS_MSG=	OpenVPN cannot use pkcs11-helper with mbedTLS. Disable PKCS11, or use OpenSSL instead
52
55
56
TUNNELBLICK_EXTRA_PATCHES=	${FILESDIR}/extra-tunnelblick-openvpn_xorpatch
57
53
X509ALTUSERNAME_CONFIGURE_ENABLE=	x509-alt-username
58
X509ALTUSERNAME_CONFIGURE_ENABLE=	x509-alt-username
54
59
55
X509ALTUSERNAME_PREVENTS=	MBEDTLS
60
X509ALTUSERNAME_PREVENTS=	MBEDTLS
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1483453128
1
TIMESTAMP = 1494853427
2
SHA256 (openvpn-201652.tar.xz) = 783c3d5200bd286cc83e5accec075ef7f896a401b9bf550801606d1b76a1d797
2
SHA256 (openvpn-201719.tar.xz) = 26724017c6a79f4936f473c8c03760037045cdea3b3f312f32dc0daeaa6ede93
3
SIZE (openvpn-201652.tar.xz) = 928316
3
SIZE (openvpn-201719.tar.xz) = 935492

Return to bug 220183