Attachment 191480 Details for Bug 226588 – Patch File

[patch] Patch File

ovpn.diff (text/plain), 3.63 KB, created by Eric F Crist on 2018-03-14 02:45:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric F Crist

Created: 2018-03-14 02:45:53 UTC

Size: 3.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 464446)
>+++ Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=		openvpn
>-DISTVERSION=		201725
>-PORTREVISION?=		2
>+DISTVERSION=		201811
>+PORTREVISION?=		0
> CATEGORIES=		security net
> MASTER_SITES=		https://secure-computing.net/files/openvpn/ \
> 			ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/
>@@ -112,6 +112,22 @@
> 	    ${WRKSRC}/src/plugins/auth-pam/Makefile \
> 	    ${WRKSRC}/src/plugins/down-root/Makefile
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MMBEDTLS}
>+_tlslibs=libmbedtls libmbedx509 libmbedcrypto
>+.else
>+# OpenSSL
>+_tlslibs=libssl libcrypto
>+.endif
>+
>+# sanity check that we don't inherit incompatible SSL libs through,
>+# for instance, pkcs11-helper:
>+post-build:
>+	   @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \
>+       |	${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\
>+       if test "$$*" != "1" ; then ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${PRINTF} '%s\n' "$$a"; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi
>+
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-down-root.so
>Index: distinfo
>===================================================================
>--- distinfo	(revision 464446)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1498051791
>-SHA256 (openvpn-201725.tar.xz) = 88a14036f933b52c5094923e3673748ed2e58836a1a6744c0c224523b688ce21
>-SIZE (openvpn-201725.tar.xz) = 943804
>+TIMESTAMP = 1520994513
>+SHA256 (openvpn-201811.tar.xz) = e8235b3c86d29b5deabfc7d4bacaf32a1f8a76aad4c0872b14359a59db589015
>+SIZE (openvpn-201811.tar.xz) = 946392
>Index: files/extra-tunnelblick-openvpn_xorpatch
>===================================================================
>--- files/extra-tunnelblick-openvpn_xorpatch	(revision 464446)
>+++ 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 464446)
>+++ 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/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 464446)
>+++ files/pkg-message.in	(working copy)
>@@ -9,10 +9,3 @@
> ###  For compatibility notes when interoperating with older OpenVPN
> ###  versions, please, see <http://openvpn.net/relnotes.html>
> ### ------------------------------------------------------------------------
>-###  
>-###
>-###              THIS IS AN UNSTABLE DEVELOPMENT VERSION!
>-###
>-###
>-###  It may or may not be suitable for production. Use at your own risk.
>-### ------------------------------------------------------------------------
>Index: files/up-script.sample
>===================================================================
>--- files/up-script.sample	(revision 464446)
>+++ 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 226588: 191480