Attachment 183675 Details for Bug 220183 – update to 201725, which includes fixes for 4 CVEs.

[patch] update to 201725, which includes fixes for 4 CVEs.

ovpnd.diff (text/plain), 5.70 KB, created by Eric F Crist on 2017-06-21 13:29:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric F Crist

Created: 2017-06-21 13:29:54 UTC

Size: 5.70 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 440921)
>+++ Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=			openvpn
>-DISTVERSION=		201652
>+DISTVERSION=		201719
> PORTREVISION?=		0
> CATEGORIES=			security net
>-MASTER_SITES=		https://secure-computing.net/files/openvpn/ \
>+MASTER_SITES=		https://secure-computing.net/files/openvpn \
> 					ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/
> PKGNAMESUFFIX=		-devel
> 
>@@ -14,7 +14,7 @@
> 
> LICENSE=		GPLv2
> 
>-CONFLICTS_INSTALL=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]*
>+CONFLICTS_INSTALL=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]*
> 
> GNU_CONFIGURE=		yes
> WRKSRC=				${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
>@@ -35,7 +35,7 @@
> 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
>@@ -42,6 +42,7 @@
> 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,7 +50,11 @@
> 
> 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
> 
> X509ALTUSERNAME_PREVENTS=	MBEDTLS
>Index: distinfo
>===================================================================
>--- distinfo	(revision 440921)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/extra-tunnelblick-openvpn_xorpatch
>===================================================================
>--- files/extra-tunnelblick-openvpn_xorpatch	(revision 440921)
>+++ files/extra-tunnelblick-openvpn_xorpatch	(working copy)
>
>Property changes on: files/extra-tunnelblick-openvpn_xorpatch
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Index: files/openvpn-client.in
>===================================================================
>--- files/openvpn-client.in	(revision 440921)
>+++ files/openvpn-client.in	(working copy)
>
>Property changes on: files/openvpn-client.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Index: files/up-script.sample
>===================================================================
>--- files/up-script.sample	(revision 440921)
>+++ files/up-script.sample	(working copy)
>
>Property changes on: files/up-script.sample
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Index: Makefile
>===================================================================
>--- Makefile	(revision 444031)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=		openvpn
>-DISTVERSION=		201719
>+DISTVERSION=		201725
> PORTREVISION?=		0
> CATEGORIES=		security net
> MASTER_SITES=		https://secure-computing.net/files/openvpn/ \
>@@ -14,7 +14,7 @@
> 
> LICENSE=		GPLv2
> 
>-CONFLICTS_INSTALL=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]*
>+CONFLICTS_INSTALL=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]*
> 
> GNU_CONFIGURE=		yes
> WRKSRC=			${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 444031)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1494853427
>-SHA256 (openvpn-201719.tar.xz) = 26724017c6a79f4936f473c8c03760037045cdea3b3f312f32dc0daeaa6ede93
>-SIZE (openvpn-201719.tar.xz) = 935492
>+TIMESTAMP = 1498051791
>+SHA256 (openvpn-201725.tar.xz) = 88a14036f933b52c5094923e3673748ed2e58836a1a6744c0c224523b688ce21
>+SIZE (openvpn-201725.tar.xz) = 943804
>Index: files/extra-tunnelblick-openvpn_xorpatch
>===================================================================
>--- files/extra-tunnelblick-openvpn_xorpatch	(revision 444031)
>+++ files/extra-tunnelblick-openvpn_xorpatch	(working copy)
>
>Property changes on: files/extra-tunnelblick-openvpn_xorpatch
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Index: files/openvpn-client.in
>===================================================================
>--- files/openvpn-client.in	(revision 444031)
>+++ files/openvpn-client.in	(working copy)
>
>Property changes on: files/openvpn-client.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Index: files/up-script.sample
>===================================================================
>--- files/up-script.sample	(revision 444031)
>+++ files/up-script.sample	(working copy)
>
>Property changes on: files/up-script.sample
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 220183: 183672 | 183675