Date: Tue, 18 Sep 2012 08:47:06 -0400 (EDT) From: Eric F Crist <ecrist@secure-computing.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Josh Paetzel <jpaetzel@FreeBSD.org> Subject: ports/171738: security/openvpn-beta: update to 2.3-beta1 Message-ID: <201209181247.q8ICl6L7092756@terrance.secure-computing.net> Resent-Message-ID: <201209181250.q8ICo7TH023386@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171738 >Category: ports >Synopsis: security/openvpn-beta: update to 2.3-beta1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Sep 18 12:50:07 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Eric F Crist >Release: FreeBSD 9.0-CURRENT amd64 >Organization: Secure Computing Networks & ClaimLynx, Inc >Environment: FreeBSD cartman.secure-computing.net 9.0-CURRENT FreeBSD 9.0-CURRENT #5: Fri Jan 21 12:06:32 CST 2011 root@cartman.secure-computing.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update the openvpn-beta port 2.3-beta1 >How-To-Repeat: >Fix: --- ovpnb.diff begins here --- Index: distinfo =================================================================== --- distinfo (revision 304444) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (openvpn-2.2-RC2.tar.xz) = 8fdfab6be1ba6d0101601966123cd108536ca08259503c131bf270132c7d15b4 -SIZE (openvpn-2.2-RC2.tar.xz) = 639196 +SHA256 (openvpn-2.3_beta1.tar.xz) = 885c332fe5527ecefd2b69f8f190877d477731b578c4c7283dc989a5ea686a25 +SIZE (openvpn-2.3_beta1.tar.xz) = 763628 Index: files/pkg-message.in =================================================================== --- files/pkg-message.in (revision 304444) +++ files/pkg-message.in (working copy) @@ -8,3 +8,15 @@ ### 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 304444) +++ pkg-plist (working copy) @@ -1,6 +1,13 @@ -sbin/openvpn +lib/openvpn/plugins/openvpn-plugin-auth-pam.so +lib/openvpn-plugin-auth-pam.so +lib/openvpn/plugins/openvpn-plugin-auth-pam.la +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 %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL @@ -8,48 +15,11 @@ %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/PORTS %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-auth-pam -%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-down-root +%%PORTDOCS%%%%DOCSDIR%%/README.auth-pam +%%PORTDOCS%%%%DOCSDIR%%/README.down-root +%%PORTDOCS%%%%DOCSDIR%%/README.IPv6 +%%PORTDOCS%%%%DOCSDIR%%/README.polarssl %%PORTDOCS%%%%DOCSDIR%%/management-notes.txt -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/README -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-ca -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-dh -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-inter -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-key -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-key-pass -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-key-pkcs12 -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-key-server -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-req -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/build-req-pass -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/clean-all -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/list-crl -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/make-crl -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/openssl.cnf -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/revoke-crt -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/revoke-full -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/sign-req -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/1.0/vars -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/Makefile -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/README -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-ca -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-dh -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-inter -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key-pass -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key-pkcs12 -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key-server -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-req -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-req-pass -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/clean-all -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/inherit-inter -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/list-crl -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl-0.9.6.cnf -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl.cnf -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/pkitool -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/revoke-full -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/sign-req -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/vars -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/whichopensslcnf %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/README %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/client.conf %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/firewall.sh @@ -69,12 +39,11 @@ %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/auth-pam.pl %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-start %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-stop -%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/openvpn.init %%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%%/easy-rsa/2.0 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/easy-rsa/1.0 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/easy-rsa -%%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 304444) +++ Makefile (working copy) @@ -2,10 +2,11 @@ # Date created: 2010-08-13 # Whom: Eric F Crist <ecrist@secure-computing.net> # -# $FreeBSD$ +# $FreeBSD$ +# PORTNAME= openvpn -DISTVERSION= 2.2-RC2 +DISTVERSION= 2.3_beta1 CATEGORIES= security net MASTER_SITES= http://swupdate.openvpn.net/community/releases/ PKGNAMESUFFIX= -beta @@ -13,32 +14,31 @@ MAINTAINER= ecrist@secure-computing.net COMMENT= Secure IP/Ethernet tunnel daemon -# ecrist will update the -beta port as soon as there are formal -# upstream test releases derived from openvpn-devel; in the meanwhile, -# move users to -devel. -IGNORE= use openvpn-devel instead for now, there are currently no formal -betas. +LICENSE= GPLv2 -CONFLICTS= openvpn-devel-[0-9]* openvpn-2.0* +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} +CONFLICTS_INSTALL= openvpn-[0-9]* openvpn-beta-[0-9]* + USE_XZ= yes + GNU_CONFIGURE= yes -USE_OPENSSL= yes -CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE}/lib \ - --with-lzo-headers=${LOCALBASE}/include \ - --disable-depr-random-resolv +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install mandir=${MANPREFIX}/man +LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archivers/lzo2 + MAN8= openvpn.8 OPTIONS= PW_SAVE "Interactive passwords may be read from a file" off \ - PKCS11 "Use security/pkcs11-helper" off + PKCS11 "Use security/pkcs11-helper" off \ + POLARSSL "Build will PolarSSL instead of OpenSSL" off -USE_RC_SUBR= openvpn +USE_RC_SUBR= openvpn.sh USE_LDCONFIG= ${PREFIX}/lib -LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archivers/lzo2 - -SUB_FILES= pkg-message pkg-req +SUB_FILES= pkg-message SUB_LIST+= OSVERSION=${OSVERSION} .if defined(PACKAGE_BUILDING) @@ -51,6 +51,14 @@ 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}" @@ -78,36 +86,28 @@ @${FIND} ${WRKSRC} -name \*.bak -delete post-build: - cd ${WRKSRC}/plugin/down-root && ${MAKE} - cd ${WRKSRC}/plugin/auth-pam && ${CC} ${CPPFLAGS} -I../.. -DDLOPEN_PAM=0 ${CFLAGS} -fPIC -shared -Wl,-soname,openvpn-auth-pam.so -o openvpn-auth-pam.so auth-pam.c pamdl.c -lc -lpam + cd ${WRKSRC}/src/plugins/down-root && ${MAKE} + cd ${WRKSRC}/src/plugins/auth-pam && ${CC} ${CPPFLAGS} -I../../../include -DDLOPEN_PAM=0 ${CFLAGS} -fPIC -shared -Wl,-soname,openvpn-auth-pam.so -o openvpn-auth-pam.so auth-pam.c pamdl.c -lc -lpam @# self-tests here .if !defined(WITHOUT_CHECK) cd ${WRKSRC} && ${MAKE} check .endif -pre-install: - PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL - post-install: ${MKDIR} ${PREFIX}/lib - ${INSTALL_PROGRAM} ${WRKSRC}/plugin/down-root/openvpn-down-root.so ${PREFIX}/lib/ - ${INSTALL_PROGRAM} ${WRKSRC}/plugin/auth-pam/openvpn-auth-pam.so ${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} - ${INSTALL_DATA} ${WRKSRC}/plugin/down-root/README ${DOCSDIR}/README.openvpn-down-root - ${INSTALL_DATA} ${WRKSRC}/plugin/auth-pam/README ${DOCSDIR}/README.openvpn-auth-pam .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL \ PORTS README ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}/ .endfor -.for dir in easy-rsa easy-rsa/1.0 easy-rsa/2.0 sample-config-files - ${MKDIR} ${DOCSDIR}/${dir} - ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_DATA} \{\} ${DOCSDIR}/${dir} \; +.for sample in sample-config-files sample-scripts + (cd ${WRKSRC}/sample/${sample} && ${COPYTREE_SHARE} \* ${DOCSDIR}/${sample}) .endfor -.for dir in sample-scripts - ${MKDIR} ${DOCSDIR}/${dir} - ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_SCRIPT} \{\} ${DOCSDIR}/${dir} \; -.endfor .else -@${RMDIR} ${DOCSDIR} .endif --- ovpnb.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209181247.q8ICl6L7092756>