Attachment 127867 Details for Bug 171743 – ovpnd.diff

[patch] ovpnd.diff

ovpnd.diff (text/plain), 4.64 KB, created by Eric F Crist on 2012-09-18 14:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric F Crist

Created: 2012-09-18 14:30:09 UTC

Size: 4.64 KB

patch

obsolete

>Index: distinfo
>===================================================================
>--- distinfo	(revision 304446)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (openvpn-201230.tar.gz) = a92e577439bdadf149602f2059ab1d15a88c4db7f8784d8dd055bafd32d96c94
>-SIZE (openvpn-201230.tar.gz) = 1519953
>+SHA256 (openvpn-201237.tar.gz) = f6786994921acb6d207e0acdc410aa9c8096650390bcb0f36f7491cb7707a0a8
>+SIZE (openvpn-201237.tar.gz) = 1519381
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 304446)
>+++ files/pkg-message.in	(working copy)
>@@ -5,8 +5,18 @@
> ###  For compatibility notes when interoperating with older OpenVPN
> ###  versions, please, see <http://openvpn.net/relnotes.html>
> ### ------------------------------------------------------------------------
>-###  If you want to donate to OpenVPN: <http://openvpn.net/donate.html>
>-### ------------------------------------------------------------------------
>-###  NOTE THIS IS AN UNSTABLE VERSION UNDER DEVELOPMENT!
>+###  NOTE THIS IS AN UNSTABLE BETA VERSION UNDER DEVELOPMENT!
> ###  It may or may not be suitable for production. Use at your own risk.
> ### ------------------------------------------------------------------------
>+###
>+### PLUGIN LOCATION CHANGED!  
>+### The following plugin locations have changed.  There is a symlink to the
>+### new file for the duration of the 2.3 release.  This will be removed in
>+### OpenVPN 2.4+.
>+### Old Location:
>+### %%PREFIX%%/openvpn/plugins/openvpn-plugin-auth-pam.so
>+### %%PREFIX%%/openvpn/plugins/openvpn-plugin-down-root.so
>+###
>+### New Location:
>+### %%PREFIX%%/openvpn-plugin-auth-pam.so
>+### %%PREFIX%%/openvpn-plugin-down-root.so
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 304446)
>+++ pkg-plist	(working copy)
>@@ -4,6 +4,8 @@
> lib/openvpn/plugins/openvpn-plugin-down-root.so
> lib/openvpn-plugin-down-root.so
> lib/openvpn/plugins/openvpn-plugin-down-root.la
>+lib/openvpn-auth-pam.so
>+lib/openvpn-down-root.so
> include/openvpn-plugin.h
> sbin/openvpn
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>@@ -39,9 +41,9 @@
> %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-stop
> %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/ucn.pl
> %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/verify-cn
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample-scripts
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample-config-files
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/sample-scripts
>+@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/sample-config-files
>+@dirrmtry %%PORTDOCS%%%%DOCSDIR%%
> @dirrmtry %%PORTDOCS%%%%DOCSDIR%%/openvpn
> @dirrmtry lib/openvpn/plugins
> @dirrmtry lib/openvpn
>Index: Makefile
>===================================================================
>--- Makefile	(revision 304446)
>+++ Makefile	(working copy)
>@@ -1,12 +1,12 @@
> # New ports collection makefile for:	openvpn
> # Date created:		2010-02-19
> # Whom:			Eric F Crist <ecrist@secure-computing.net>
>-#
>+# 
> # $FreeBSD$
>-#
>+# 
> 
> PORTNAME=	openvpn
>-DISTVERSION=	201230
>+DISTVERSION=	201237
> CATEGORIES=	security net
> MASTER_SITES=	ftp://ftp.secure-computing.net/pub/FreeBSD/ports/openvpn-devel/ \
> 		ftp://ftp2.secure-computing.net/pub/FreeBSD/ports/openvpn-devel/
>@@ -32,10 +32,9 @@
> 
> OPTIONS=	PW_SAVE "Interactive passwords may be read from a file" off \
> 		PKCS11  "Use security/pkcs11-helper" off \
>-		EXAMPLES "Install sample configs and scripts" off \
> 		POLARSSL "Build will PolarSSL instead of OpenSSL" off
> 
>-USE_RC_SUBR=	openvpn
>+USE_RC_SUBR=	openvpn.sh
> USE_LDCONFIG=	${PREFIX}/lib
> 
> SUB_FILES=	pkg-message
>@@ -45,19 +44,20 @@
> WITHOUT_CHECK=	yes
> .endif
> 
>-.if defined (WITH_POLARSSL)
>-BUILD_DEPENDS+=		libpolarssl.so:${PORTSDIR}/security/polarssl
>-CONFIGURE_ARGS+=	--with-crypto-lib=polarssl
>-.else
>-USE_OPENSSL=	yes
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> .ifdef (LOG_OPENVPN)
> CFLAGS+=	-DLOG_OPENVPN=${LOG_OPENVPN}
> .endif
> 
>+.if defined (WITH_POLARSSL)
>+LIB_DEPENDS+=		polarssl:${PORTSDIR}/security/polarssl
>+CONFIGURE_ARGS+=	--with-crypto-library=polarssl
>+WITHOUT_CHECK=	yes
>+.else
>+USE_OPENSSL=	yes
>+.endif
>+
> pre-fetch:
> .ifdef (LOG_OPENVPN)
> 	@${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}"
>@@ -96,6 +96,8 @@
> 	${MKDIR} ${PREFIX}/lib
> 	${INSTALL_LIB} ${WRKSRC}/src/plugins/down-root/.libs/openvpn-plugin-down-root.so ${PREFIX}/lib/
> 	${INSTALL_LIB} ${WRKSRC}/src/plugins/auth-pam/.libs/openvpn-plugin-auth-pam.so ${PREFIX}/lib/
>+	${LN} -s ${WRKSRC}/src/plugins/down-root/.libs/openvpn-plugin-down-root.so ${PREFIX}/lib/openvpn-down-root.so
>+	${LN} -s ${WRKSRC}/src/plugins/down-root/.libs/openvpn-plugin-auth-pam.so ${PREFIX}/lib/openvpn-auth-pam.so
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${DOCSDIR}
> .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL \

Actions: View | Diff

Attachments on bug 171743: 127867