[Midnightbsd-cvs] mports [16351] trunk/security/openvpn: openvpn 2.3.3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Apr 20 21:35:04 EDT 2014
Revision: 16351
http://svnweb.midnightbsd.org/mports/?rev=16351
Author: laffer1
Date: 2014-04-20 21:35:03 -0400 (Sun, 20 Apr 2014)
Log Message:
-----------
openvpn 2.3.3
Modified Paths:
--------------
trunk/security/openvpn/Makefile
trunk/security/openvpn/distinfo
trunk/security/openvpn/pkg-descr
trunk/security/openvpn/pkg-plist
Removed Paths:
-------------
trunk/security/openvpn/files/patch-selftest-ports
Modified: trunk/security/openvpn/Makefile
===================================================================
--- trunk/security/openvpn/Makefile 2014-04-20 18:33:05 UTC (rev 16350)
+++ trunk/security/openvpn/Makefile 2014-04-21 01:35:03 UTC (rev 16351)
@@ -1,16 +1,16 @@
# $MidnightBSD$
-# $FreeBSD: ports/security/openvpn/Makefile,v 1.28 2006/09/14 01:22:01 rafan Exp $
-PORTNAME= openvpn
-DISTVERSION= 2.1.4
-CATEGORIES= security net
-MASTER_SITES= http://swupdate.openvpn.net/community/releases/
+PORTNAME= openvpn
+DISTVERSION= 2.3.3
+CATEGORIES= security net
+MASTER_SITES= http://swupdate.openvpn.net/community/releases/ \
+ http://build.openvpn.net/downloads/releases/
-MAINTAINER= matthias.andree at gmx.de
+MAINTAINER= ports at MidnightBSD.org
COMMENT= Secure IP/Ethernet tunnel daemon
-LICENSE= agg
-# gpl2, MSFT, BSDL, etc
+LICENSE= gpl2
+
CONFLICTS= openvpn-devel-[0-9]* openvpn-2.0* openvpn-beta-[0-9]*
GNU_CONFIGURE= yes
@@ -21,23 +21,52 @@
--with-lzo-headers=${LOCALBASE}/include
INSTALL_TARGET= install mandir=${MANPREFIX}/man
-MAN8= openvpn.8
+# let OpenVPN's configure script pick up the requisite libraries:
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS= PW_SAVE "Interactive passwords may be read from a file" off \
- PKCS11 "Use security/pkcs11-helper" off
+OPTIONS_DEFINE= PW_SAVE PKCS11 EASYRSA
+OPTIONS_DEFAULT= EASYRSA OPENSSL
+OPTIONS_SINGLE= SSL
+OPTIONS_SINGLE_SSL= OPENSSL POLARSSL
+PW_SAVE_DESC= Interactive passwords may be read from a file
+PKCS11_DESC= Use security/pkcs11-helper
+EASYRSA_DESC= Install security/easy-rsa RSA helper package
+POLARSSL_DESC= SSL/TLS support via PolarSSL
-USE_RC_SUBR= openvpn.sh
-USE_LDCONFIG= ${PREFIX}/lib
+EASYRSA_RUN_DEPENDS= easy-rsa>=0:${PORTSDIR}/security/easy-rsa
-SUB_FILES= pkg-message
-SUB_LIST+= OSVERSION=${OSVERSION}
+PKCS11_LIB_DEPENDS= libpkcs11-helper.so:${PORTSDIR}/security/pkcs11-helper
+PKCS11_CONFIGURE_ENABLE= pkcs11
+PW_SAVE_CONFIGURE_ENABLE= password-save
+
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MPOLARSSL}
+LIB_DEPENDS+= libpolarssl.so:${PORTSDIR}/security/polarssl
+CONFIGURE_ARGS+= --with-crypto-library=polarssl
+.else
+USE_OPENSSL= yes
+CONFIGURE_ARGS+= --with-crypto-library=openssl
+.endif
+
+USE_RC_SUBR= openvpn
+USE_LDCONFIG= ${PREFIX}/lib
+
+SUB_FILES= pkg-message
+
.include <bsd.port.pre.mk>
.ifdef (LOG_OPENVPN)
-CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN}
+CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN}
.endif
+LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2
+
+PORTDOCS= *
+PORTEXAMPLES= *
+
pre-configure:
.ifdef (LOG_OPENVPN)
@${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}"
@@ -46,68 +75,30 @@
@${ECHO} "You may use the following build options:"
@${ECHO} ""
@${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}"
- @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_DAEMON"
+ @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_LOCAL6"
@${ECHO} ""
.endif
-# NOTE: there is no way to explicitly specify the LZO version to OpenVPN,
-# if LZO2 and LZO1 are installed, OpenVPN will pick LZO2.
-# So depend on LZO1 only if it's already there and LZO2 isn't.
-# PACKAGE_BUILDING will also force LZO2.
-.if exists(${LOCALBASE}/lib/liblzo2.so.2) || !exists(${LOCALBASE}/lib/liblzo.so.1) || defined(PACKAGE_BUILDING)
-LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archivers/lzo2
-.else
-LIB_DEPENDS+= lzo.1:${PORTSDIR}/archivers/lzo
-.endif
-
-.if defined(WITH_PW_SAVE)
-CONFIGURE_ARGS+= --enable-password-save
-.endif
-
-.if defined(WITH_PKCS11)
-LIB_DEPENDS+= pkcs11-helper.1:${PORTSDIR}/security/pkcs11-helper
-.else
-CONFIGURE_ARGS+= --disable-pkcs11
-.endif
-
-post-patch:
- @${FIND} ${WRKSRC}/easy-rsa/?.0 -type f \
- -exec ${REINPLACE_CMD} -e 's;#!/bin/bash;#!/bin/sh;' \
- -e 's,source ./vars,. ./vars,' \{\} +
- @${FIND} ${WRKSRC} -name \*.orig -delete
- @${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
@# self-tests here
.if !defined(WITHOUT_CHECK)
@${ECHO} ; ${ECHO} "### Note that you can skip these lengthy selftests with WITHOUT_CHECK=yes ###" ; ${ECHO}
- cd ${WRKSRC} && ${MAKE} check
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} check
.endif
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/
-.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}/
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-down-root.so
+ ${MKDIR} ${STAGEDIR}${PREFIX}/include
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/
+.for i in AUTHORS ChangeLog PORTS
+ ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${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} \;
-.endfor
-.else
- -@${RMDIR} ${DOCSDIR}
.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+ (cd ${WRKSRC}/sample && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/)
+ ${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/sample-scripts/*
+.endif
.include <bsd.port.post.mk>
Modified: trunk/security/openvpn/distinfo
===================================================================
--- trunk/security/openvpn/distinfo 2014-04-20 18:33:05 UTC (rev 16350)
+++ trunk/security/openvpn/distinfo 2014-04-21 01:35:03 UTC (rev 16351)
@@ -1,3 +1,2 @@
-SHA256 (openvpn-2.1.4.tar.xz) = 6c68b26ce0e0cd64ec62d3f42edbca2dca2c671cae405d7c86e352ffa76b01be
-RMD160 (openvpn-2.1.4.tar.xz) = 637d245b23f84f1842602ee2882aa62726e5590c
-SIZE (openvpn-2.1.4.tar.xz) = 621364
+SHA256 (openvpn-2.3.3.tar.xz) = 19693ac1db8e99a73a0fe1de5809f34a5693109d4fdb929449a0c457986440f7
+SIZE (openvpn-2.3.3.tar.xz) = 781240
Deleted: trunk/security/openvpn/files/patch-selftest-ports
===================================================================
--- trunk/security/openvpn/files/patch-selftest-ports 2014-04-20 18:33:05 UTC (rev 16350)
+++ trunk/security/openvpn/files/patch-selftest-ports 2014-04-21 01:35:03 UTC (rev 16351)
@@ -1,26 +0,0 @@
---- sample-config-files/loopback-client.orig Mon Oct 16 00:30:20 2006
-+++ sample-config-files/loopback-client Wed Apr 4 00:51:31 2007
-@@ -9,8 +9,8 @@
- # ./openvpn --config sample-config-files/loopback-client (In one window)
- # ./openvpn --config sample-config-files/loopback-server (Simultaneously in another window)
-
--rport 16000
--lport 16001
-+rport 16100
-+lport 16101
- remote localhost
- local localhost
- dev null
---- sample-config-files/loopback-server.orig Mon Oct 16 00:30:20 2006
-+++ sample-config-files/loopback-server Wed Apr 4 00:51:31 2007
-@@ -9,8 +9,8 @@
- # ./openvpn --config sample-config-files/loopback-client (In one window)
- # ./openvpn --config sample-config-files/loopback-server (Simultaneously in another window)
-
--rport 16001
--lport 16000
-+rport 16101
-+lport 16100
- remote localhost
- local localhost
- dev null
Modified: trunk/security/openvpn/pkg-descr
===================================================================
--- trunk/security/openvpn/pkg-descr 2014-04-20 18:33:05 UTC (rev 16350)
+++ trunk/security/openvpn/pkg-descr 2014-04-21 01:35:03 UTC (rev 16351)
@@ -4,7 +4,4 @@
can use SSL or a pre-shared secret to authenticate peers, and in SSL mode, one
server can handle many clients.
-WWW: http://openvpn.net/
-
-- Matthias Andree
-matthias.andree at gmx.de
+WWW: http://openvpn.net/index.php/open-source.html
Modified: trunk/security/openvpn/pkg-plist
===================================================================
--- trunk/security/openvpn/pkg-plist 2014-04-20 18:33:05 UTC (rev 16350)
+++ trunk/security/openvpn/pkg-plist 2014-04-21 01:35:03 UTC (rev 16351)
@@ -1,79 +1,9 @@
+include/openvpn-plugin.h
+lib/openvpn/plugins/openvpn-plugin-auth-pam.la
+lib/openvpn/plugins/openvpn-plugin-auth-pam.so
+lib/openvpn/plugins/openvpn-plugin-down-root.la
+lib/openvpn/plugins/openvpn-plugin-down-root.so
+man/man8/openvpn.8.gz
sbin/openvpn
-lib/openvpn-auth-pam.so
-lib/openvpn-down-root.so
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%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.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
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/home.up
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/loopback-client
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/loopback-server
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/office.up
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/openvpn-shutdown.sh
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/openvpn-startup.sh
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/server.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/static-home.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/static-office.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/tls-home.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/tls-office.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/xinetd-client-config
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/xinetd-server-config
-%%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%%
+ at dirrm lib/openvpn/plugins
+ at dirrm lib/openvpn
More information about the Midnightbsd-cvs
mailing list