From owner-svn-ports-all@FreeBSD.ORG Wed Jul 25 16:52:25 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 71199106566B; Wed, 25 Jul 2012 16:52:25 +0000 (UTC) (envelope-from scheidell@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5AD958FC14; Wed, 25 Jul 2012 16:52:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6PGqPLY078888; Wed, 25 Jul 2012 16:52:25 GMT (envelope-from scheidell@svn.freebsd.org) Received: (from scheidell@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6PGqPBh078884; Wed, 25 Jul 2012 16:52:25 GMT (envelope-from scheidell@svn.freebsd.org) Message-Id: <201207251652.q6PGqPBh078884@svn.freebsd.org> From: Michael Scheidell Date: Wed, 25 Jul 2012 16:52:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301523 - head/security/openvpn-devel X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jul 2012 16:52:25 -0000 Author: scheidell Date: Wed Jul 25 16:52:24 2012 New Revision: 301523 URL: http://svn.freebsd.org/changeset/ports/301523 Log: - Update to latest snapshot PR: ports/170111 Submitted by: Eric F Crist (maintainer) Modified: head/security/openvpn-devel/Makefile head/security/openvpn-devel/distinfo head/security/openvpn-devel/pkg-plist Modified: head/security/openvpn-devel/Makefile ============================================================================== --- head/security/openvpn-devel/Makefile Wed Jul 25 16:01:38 2012 (r301522) +++ head/security/openvpn-devel/Makefile Wed Jul 25 16:52:24 2012 (r301523) @@ -6,7 +6,7 @@ # PORTNAME= openvpn -DISTVERSION= 201208 +DISTVERSION= 201230 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/ @@ -22,9 +22,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMES CONFLICTS_INSTALL= openvpn-[0-9]* openvpn-beta-[0-9]* GNU_CONFIGURE= yes -USE_OPENSSL= yes -CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE}/lib \ - --with-lzo-headers=${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install mandir=${MANPREFIX}/man LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archivers/lzo2 @@ -32,7 +31,9 @@ LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archive 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 \ + EXAMPLES "Install sample configs and scripts" off \ + POLARSSL "Build will PolarSSL instead of OpenSSL" off USE_RC_SUBR= openvpn.sh USE_LDCONFIG= ${PREFIX}/lib @@ -44,6 +45,13 @@ SUB_LIST+= OSVERSION=${OSVERSION} 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 .ifdef (LOG_OPENVPN) @@ -77,8 +85,8 @@ post-patch: @${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 @@ -86,23 +94,16 @@ post-build: post-install: ${MKDIR} ${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/plugin/down-root/openvpn-down-root.so ${PREFIX}/lib/ - ${INSTALL_LIB} ${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/ .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} \; -.endfor -.for dir in sample-scripts - ${MKDIR} ${DOCSDIR}/${dir} - ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_SCRIPT} \{\} ${DOCSDIR}/${dir} \; +.for sample in sample-config-files sample-scripts + (cd ${WRKSRC}/sample/${sample} && ${COPYTREE_SHARE} \* ${DOCSDIR}/${sample}) .endfor .else -@${RMDIR} ${DOCSDIR} Modified: head/security/openvpn-devel/distinfo ============================================================================== --- head/security/openvpn-devel/distinfo Wed Jul 25 16:01:38 2012 (r301522) +++ head/security/openvpn-devel/distinfo Wed Jul 25 16:52:24 2012 (r301523) @@ -1,2 +1,2 @@ -SHA256 (openvpn-201208.tar.gz) = b49e92d1b060a1e9fc740cfc34445057d9c4d841ccee80c627eeb9468d4cdd1a -SIZE (openvpn-201208.tar.gz) = 1105648 +SHA256 (openvpn-201230.tar.gz) = a92e577439bdadf149602f2059ab1d15a88c4db7f8784d8dd055bafd32d96c94 +SIZE (openvpn-201230.tar.gz) = 1519953 Modified: head/security/openvpn-devel/pkg-plist ============================================================================== --- head/security/openvpn-devel/pkg-plist Wed Jul 25 16:01:38 2012 (r301522) +++ head/security/openvpn-devel/pkg-plist Wed Jul 25 16:52:24 2012 (r301523) @@ -1,5 +1,10 @@ -lib/openvpn-auth-pam.so -lib/openvpn-down-root.so +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 +include/openvpn-plugin.h sbin/openvpn %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING @@ -8,48 +13,10 @@ sbin/openvpn %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/PORTS %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-auth-pam -%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-down-root -%%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-0.9.8.cnf -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl-1.0.0.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%%/README.auth-pam +%%PORTDOCS%%%%DOCSDIR%%/README.down-root +%%PORTDOCS%%%%DOCSDIR%%/README.IPv6 +%%PORTDOCS%%%%DOCSDIR%%/README.polarssl %%PORTDOCS%%%%DOCSDIR%%/management-notes.txt %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/README %%PORTDOCS%%%%DOCSDIR%%/sample-config-files/client.conf @@ -70,12 +37,11 @@ sbin/openvpn %%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%%/openvpn +@dirrmtry lib/openvpn/plugins +@dirrmtry lib/openvpn