diff options
22 files changed, 84 insertions, 536 deletions
@@ -4246,3 +4246,4 @@ databases/p5-DBD-mysql54|databases/p5-DBD-mysql55|2010-01-04|Updated to mileston misc/sword15|misc/sword|2010-01-06|Has expired: use misc/sword misc/bibletime-kde3|misc/bibletime|2010-01-06|Has expired: use misc/bibletime mail/squirrelmail-devel|use mail/squirrelmail|2010-01-06|Has expired: use mail/squirrelmail +security/openvpn-devel||2010-01-07|base port updated, use security/openvpn instead @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20100107: + AFFECTS: users of security/openvpn* + AUTHOR: mandree@FreeBSD.org + + security/openvpn has been moved to security/openvpn20 and upgraded to 2.0.9. + security/openvpn has been upgraded to 2.1.1, and security/openvpn-devel has + been removed. + 20100106: AFFECTS: users of devel/websvn AUTHOR: miwi@FreeBSD.org diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile deleted file mode 100644 index f1e985403e5c..000000000000 --- a/security/openvpn-devel/Makefile +++ /dev/null @@ -1,116 +0,0 @@ -# New ports collection makefile for: openvpn -# Date created: 2002-06-23 -# Whom: Matthias Andree <matthias.andree@gmx.de> -# -# $FreeBSD$ -# - -PORTNAME= openvpn -DISTVERSION= 2.1_rc20 -CATEGORIES= security net -MASTER_SITES= http://openvpn.net/release/ -PKGNAMESUFFIX= -devel - -MAINTAINER= matthias.andree@gmx.de -COMMENT= Secure IP/Ethernet tunnel daemon - -CONFLICTS= openvpn-[0-9]* - -GNU_CONFIGURE= yes -USE_OPENSSL= yes -CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE}/lib \ - --with-lzo-headers=${LOCALBASE}/include -INSTALL_TARGET= install mandir=${MANPREFIX}/man - -MAN8= openvpn.8 - -OPTIONS= PW_SAVE "Interactive passwords may be read from a file" off \ - PKCS11 "Use security/pkcs11-helper" off - -USE_RC_SUBR= openvpn.sh -USE_LDCONFIG= ${PREFIX}/lib - -SUB_FILES= pkg-message pkg-req -SUB_LIST+= OSVERSION=${OSVERSION} - -.include <bsd.port.pre.mk> - -SUB_LIST+= RCSFX=${RC_SUBR_SUFFIX} - -.ifdef (LOG_OPENVPN) -CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} -.endif - -pre-configure: -.ifdef (LOG_OPENVPN) - @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" -.else - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${ECHO} " LOG_OPENVPN={Valid syslog facility}" - @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_DAEMON" - @${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} -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) - 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/ -.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} \; -.endfor -.else - -@${RMDIR} ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo deleted file mode 100644 index bda9168c9099..000000000000 --- a/security/openvpn-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (openvpn-2.1_rc20.tar.gz) = 8187f8f21507faac5e320e32747203b8 -SHA256 (openvpn-2.1_rc20.tar.gz) = 4d423b48cb3ccc66b5669b9404dcb028cb62af410361c09e6056db0c5d2a1267 -SIZE (openvpn-2.1_rc20.tar.gz) = 844253 diff --git a/security/openvpn-devel/files/openvpn.sh.in b/security/openvpn-devel/files/openvpn.sh.in deleted file mode 100644 index ca66486c06ab..000000000000 --- a/security/openvpn-devel/files/openvpn.sh.in +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/sh -# -# openvpn.sh - load tun/tap driver and start OpenVPN daemon -# -# (C) Copyright 2005 - 2008 by Matthias Andree -# based on suggestions by Matthias Grimm and Dirk Gouders -# with multi-instance contribution from Denis Shaposhnikov, Gleb Kozyrev -# and Vasil Dimov -# -# $FreeBSD$ -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin -# Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# PROVIDE: openvpn -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# ----------------------------------------------------------------------------- -# -# This script supports running multiple instances of openvpn. -# To run additional instance link this script to something like -# % ln -s openvpn openvpn_foo -# and define additional openvpn_foo_* variables in one of -# /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/openvpn_foo -# -# Below NAME should be substituted with the name of this script. By default -# it is openvpn, so read as openvpn_enable. If you linked the script to -# openvpn_foo, then read as openvpn_foo_enable etc. -# -# The following variables are supported (defaults are shown). -# You can place them in any of -# /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME -# -# NAME_enable="NO" # set to YES to enable openvpn -# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap" -# -# # optional: -# NAME_flags="" # additional command line arguments -# NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file -# NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory -# -# You also need to set NAME_configfile and NAME_dir, if the configuration -# file and directory where keys and certificates reside differ from the above -# settings. -# -# Note that we deliberately refrain from unloading drivers. -# -# For further documentation, please see openvpn(8). -# - -. %%RC_SUBR%% - -case "$0" in -/etc/rc*) - # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown), - # so get the name of the script from $_file - name=$(basename "$_file" .sh) - ;; -*) - name=$(basename "$0" .sh) - ;; -esac - -rcvar=$(set_rcvar) - -openvpn_precmd() -{ - for i in $interfaces ; do - # FreeBSD <= 5.4 does not know kldstat's -m option - # FreeBSD >= 6.0 does not add debug.* sysctl information - # in the default build - we check both to keep things simple - if ! sysctl debug.if_${i}_debug >/dev/null 2>&1 \ - && ! kldstat -m if_${i} >/dev/null 2>&1 ; then - if ! kldload if_${i} ; then - warn "Could not load $i module." - return 1 - fi - fi - done - return 0 -} - -stop_postcmd() -{ - rm -f "$pidfile" || warn "Could not remove $pidfile." -} - -# support SIGHUP to reparse configuration file -extra_commands="reload" - -# pidfile -pidfile="/var/run/${name}.pid" - -# command and arguments -command="%%PREFIX%%/sbin/openvpn" - -# run this first -start_precmd="openvpn_precmd" -# and this last -stop_postcmd="stop_postcmd" - -load_rc_config ${name} - -eval ": \${${name}_enable:=\"NO\"}" -eval ": \${${name}_flags:=\"\"}" -eval ": \${${name}_if:=\"\"}" -eval ": \${${name}_configfile:=\"%%PREFIX%%/etc/openvpn/${name}.conf\"}" -eval ": \${${name}_dir:=\"%%PREFIX%%/etc/openvpn\"}" - -configfile="$(eval echo \${${name}_configfile})" -dir="$(eval echo \${${name}_dir})" -interfaces="$(eval echo \${${name}_if})" - -required_files=${configfile} -command_args="--cd ${dir} --daemon ${name} --config ${configfile} --writepid ${pidfile}" - -run_rc_command "$1" diff --git a/security/openvpn-devel/files/pkg-message.in b/security/openvpn-devel/files/pkg-message.in deleted file mode 100644 index 5abc9aad90e0..000000000000 --- a/security/openvpn-devel/files/pkg-message.in +++ /dev/null @@ -1,12 +0,0 @@ -### ------------------------------------------------------------------------ -### Edit /etc/rc.conf[.local] to start OpenVPN automatically at system -### startup. See %%PREFIX%%/etc/rc.d/openvpn%%RCSFX%% for details. -### ------------------------------------------------------------------------ -### 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! -### It may or may not be suitable for production. Use at your own risk. -### ------------------------------------------------------------------------ diff --git a/security/openvpn-devel/files/pkg-req.in b/security/openvpn-devel/files/pkg-req.in deleted file mode 100644 index 15c8242d8724..000000000000 --- a/security/openvpn-devel/files/pkg-req.in +++ /dev/null @@ -1,29 +0,0 @@ -set -e - -rcvers() { - # determine if we have "old" or "new" (rcorder integration) scheme - # for %%PREFIX%%/etc/rc.d/* files - if test $1 -ge 700007 || test $1 -lt 700000 -a $1 -ge 600101 ; then - echo 2 - else - echo 1 - fi -} - -if [ "$2" = INSTALL ] ; then - # check if the base system is new enough for us, - # which should only matter for package installs. - buildrc=$(rcvers %%OSVERSION%%) - execrc=$(rcvers $(sysctl -n kern.osreldate) ) - if test $buildrc -gt $execrc ; then - cat <<EOF - -Error: this package, $1, was compiled for a newer FreeBSD -====== version that uses different boot scripts. - Therefore, the rc.d script WILL NOT WORK. - Please update your ports tree and install security/openvpn from there. - -EOF - exit 1 - fi -fi diff --git a/security/openvpn-devel/pkg-descr b/security/openvpn-devel/pkg-descr deleted file mode 100644 index b527fa8fa75e..000000000000 --- a/security/openvpn-devel/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -OpenVPN is a robust, scalable and highly configurable VPN (Virtual Private -Network) daemon which can be used to securely link two or more private networks -using an encrypted tunnel over the internet. It can operate over UDP or TCP, -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@gmx.de diff --git a/security/openvpn-devel/pkg-plist b/security/openvpn-devel/pkg-plist deleted file mode 100644 index dbec65c3f248..000000000000 --- a/security/openvpn-devel/pkg-plist +++ /dev/null @@ -1,79 +0,0 @@ -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%% diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 152f2075947b..f1c5cf8d0007 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -6,37 +6,32 @@ # PORTNAME= openvpn -# ----------------------------------------------------- -# DO NOT BOTHER TO SEND NOTICES ABOUT OPENVPN 2.0.9 -# AS IT FIXES WINDOWS-ONLY BUGS THAT DON'T AFFECT *BSD -# AND THUS DOES NOT WARRANT A PORT UPGRADE! -# UPGRADE REQUESTS WILL BE DROPPED UNLESS BSD-RELATED. -# ----------------------------------------------------- -PORTVERSION= 2.0.6 -PORTREVISION= 9 +DISTVERSION= 2.1.1 CATEGORIES= security net # MASTER_SITES points to hosts in distinct data centers, # so just one MASTER_SITES entry should be OK. MASTER_SITES= http://openvpn.net/release/ -MAINTAINER= matthias.andree@gmx.de +MAINTAINER= mandree@FreeBSD.org COMMENT= Secure IP/Ethernet tunnel daemon -CONFLICTS= openvpn-devel-[0-9]* +CONFLICTS= openvpn-devel-[0-9]* openvpn-2.0* GNU_CONFIGURE= yes USE_OPENSSL= yes CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE}/lib \ --with-lzo-headers=${LOCALBASE}/include +INSTALL_TARGET= install mandir=${MANPREFIX}/man MAN8= openvpn.8 -OPTIONS= PW_SAVE "Interactive passwords may be read from a file" off +OPTIONS= PW_SAVE "Interactive passwords may be read from a file" off \ + PKCS11 "Use security/pkcs11-helper" off USE_RC_SUBR= openvpn.sh USE_LDCONFIG= ${PREFIX}/lib -SUB_FILES= pkg-message pkg-req +SUB_FILES= pkg-message SUB_LIST+= OSVERSION=${OSVERSION} .include <bsd.port.pre.mk> @@ -47,14 +42,14 @@ SUB_LIST+= RCSFX=${RC_SUBR_SUFFIX} CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} .endif -pre-fetch: +pre-configure: .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" .else @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " LOG_OPENVPN={Valid syslog facility}" + @${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}" @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_DAEMON" @${ECHO} "" .endif @@ -73,6 +68,16 @@ LIB_DEPENDS+= lzo.1:${PORTSDIR}/archivers/lzo 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} -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 @@ -81,22 +86,19 @@ post-build: 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_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 NEWS \ +.for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL \ PORTS README - ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}/ .endfor -.for dir in easy-rsa easy-rsa/2.0 sample-config-files +.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 @@ -104,6 +106,8 @@ post-install: ${MKDIR} ${DOCSDIR}/${dir} ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_SCRIPT} \{\} ${DOCSDIR}/${dir} \; .endfor +.else + -@${RMDIR} ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo index e36e6e490d74..6a79158b81da 100644 --- a/security/openvpn/distinfo +++ b/security/openvpn/distinfo @@ -1,3 +1,3 @@ -MD5 (openvpn-2.0.6.tar.gz) = 8d2f95fa825e58363a676b25d4815aa7 -SHA256 (openvpn-2.0.6.tar.gz) = 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003 -SIZE (openvpn-2.0.6.tar.gz) = 664816 +MD5 (openvpn-2.1.1.tar.gz) = b273ed2b5ec8616fb9834cde8634bce7 +SHA256 (openvpn-2.1.1.tar.gz) = a3180d7af5ff7b05196b2a26bad263291c1987f67e116ebbdcdaf5f678634842 +SIZE (openvpn-2.1.1.tar.gz) = 880115 diff --git a/security/openvpn-devel/files/patch-selftest-ports b/security/openvpn/files/patch-selftest-ports index 5e195261eecb..5e195261eecb 100644 --- a/security/openvpn-devel/files/patch-selftest-ports +++ b/security/openvpn/files/patch-selftest-ports diff --git a/security/openvpn/files/pkg-message.in b/security/openvpn/files/pkg-message.in index 64494e4d6a85..f79da215e039 100644 --- a/security/openvpn/files/pkg-message.in +++ b/security/openvpn/files/pkg-message.in @@ -1,20 +1,7 @@ ### ------------------------------------------------------------------------ -### The OpenVPN FreeBSD port, since v2.0.1, uses rcNG to start OpenVPN. -### Edit /etc/rc.conf to start OpenVPN automatically at system startup. -### See %%PREFIX%%/etc/rc.d/openvpn%%RCSFX%% for details. +### Edit /etc/rc.conf[.local] to start OpenVPN automatically at system +### startup. See %%PREFIX%%/etc/rc.d/openvpn%%RCSFX%% for details. ### ------------------------------------------------------------------------ -### To get OpenVPN 1.X to talk with the new 2.0 version, you may need to -### edit the 1.X configuration file by adding these lines: -### tun-mtu 1500 -### tun-mtu-extra 32 -### mssfix 1450 -### key-method 2 <- this key-method line only for TLS setups -### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -### WARNING: THE DEFAULT PORT HAS CHANGED AND IS NOW 1194! -### OpenVPN 1.6 and older used 5000 rather than 1194 as their default -### port, so add the proper port options to your configuration file! -### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -### For further compatibility, see <http://openvpn.net/relnotes.html> -### ------------------------------------------------------------------------ -### If you want to donate to OpenVPN: <http://openvpn.net/donate.html> +### For compatibility notes when interoperating with older OpenVPN +### versions, please, see <http://openvpn.net/relnotes.html> ### ------------------------------------------------------------------------ diff --git a/security/openvpn/files/pkg-req.in b/security/openvpn/files/pkg-req.in deleted file mode 100644 index 15c8242d8724..000000000000 --- a/security/openvpn/files/pkg-req.in +++ /dev/null @@ -1,29 +0,0 @@ -set -e - -rcvers() { - # determine if we have "old" or "new" (rcorder integration) scheme - # for %%PREFIX%%/etc/rc.d/* files - if test $1 -ge 700007 || test $1 -lt 700000 -a $1 -ge 600101 ; then - echo 2 - else - echo 1 - fi -} - -if [ "$2" = INSTALL ] ; then - # check if the base system is new enough for us, - # which should only matter for package installs. - buildrc=$(rcvers %%OSVERSION%%) - execrc=$(rcvers $(sysctl -n kern.osreldate) ) - if test $buildrc -gt $execrc ; then - cat <<EOF - -Error: this package, $1, was compiled for a newer FreeBSD -====== version that uses different boot scripts. - Therefore, the rc.d script WILL NOT WORK. - Please update your ports tree and install security/openvpn from there. - -EOF - exit 1 - fi -fi diff --git a/security/openvpn/pkg-descr b/security/openvpn/pkg-descr index b527fa8fa75e..54cd393b84b5 100644 --- a/security/openvpn/pkg-descr +++ b/security/openvpn/pkg-descr @@ -4,7 +4,7 @@ using an encrypted tunnel over the internet. It can operate over UDP or TCP, 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/ +WWW: http://openvpn.net/index.php/open-source.html - Matthias Andree -matthias.andree@gmx.de +mandree@FreeBSD.org diff --git a/security/openvpn/pkg-plist b/security/openvpn/pkg-plist index 4df2203dbd05..66f1ebc6b701 100644 --- a/security/openvpn/pkg-plist +++ b/security/openvpn/pkg-plist @@ -6,29 +6,29 @@ lib/openvpn-down-root.so %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/PORTS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.openvpn-auth-pam %%PORTDOCS%%%%DOCSDIR%%/README.openvpn-down-root -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/README -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-ca -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-dh -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-inter -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key-pass -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key-pkcs12 -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key-server -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-req -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-req-pass -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/clean-all -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/list-crl -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/make-crl -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/openssl.cnf -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/revoke-crt -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/revoke-full -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/sign-req -%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/vars +%%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 @@ -42,11 +42,13 @@ lib/openvpn-down-root.so %%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 @@ -66,10 +68,13 @@ lib/openvpn-down-root.so %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/auth-pam.pl %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-start %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-stop +%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bs %%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%% diff --git a/security/openvpn20/Makefile b/security/openvpn20/Makefile index 152f2075947b..b13eca2c3972 100644 --- a/security/openvpn20/Makefile +++ b/security/openvpn20/Makefile @@ -6,14 +6,7 @@ # PORTNAME= openvpn -# ----------------------------------------------------- -# DO NOT BOTHER TO SEND NOTICES ABOUT OPENVPN 2.0.9 -# AS IT FIXES WINDOWS-ONLY BUGS THAT DON'T AFFECT *BSD -# AND THUS DOES NOT WARRANT A PORT UPGRADE! -# UPGRADE REQUESTS WILL BE DROPPED UNLESS BSD-RELATED. -# ----------------------------------------------------- -PORTVERSION= 2.0.6 -PORTREVISION= 9 +PORTVERSION= 2.0.9 CATEGORIES= security net # MASTER_SITES points to hosts in distinct data centers, # so just one MASTER_SITES entry should be OK. @@ -22,7 +15,8 @@ MASTER_SITES= http://openvpn.net/release/ MAINTAINER= matthias.andree@gmx.de COMMENT= Secure IP/Ethernet tunnel daemon -CONFLICTS= openvpn-devel-[0-9]* +LATEST_LINK= openvpn20 +CONFLICTS= openvpn-2.[!0]* openvpn-devel-[0-9]* GNU_CONFIGURE= yes USE_OPENSSL= yes @@ -36,7 +30,7 @@ OPTIONS= PW_SAVE "Interactive passwords may be read from a file" off USE_RC_SUBR= openvpn.sh USE_LDCONFIG= ${PREFIX}/lib -SUB_FILES= pkg-message pkg-req +SUB_FILES= pkg-message SUB_LIST+= OSVERSION=${OSVERSION} .include <bsd.port.pre.mk> @@ -54,7 +48,7 @@ pre-fetch: @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" - @${ECHO} " LOG_OPENVPN={Valid syslog facility}" + @${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}" @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_DAEMON" @${ECHO} "" .endif @@ -81,9 +75,6 @@ post-build: 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 @@ -98,7 +89,7 @@ post-install: .endfor .for dir in easy-rsa easy-rsa/2.0 sample-config-files ${MKDIR} ${DOCSDIR}/${dir} - ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_DATA} \{\} ${DOCSDIR}/${dir} \; + ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f \( -name '.*' -o -name Makefile \) -o -exec ${INSTALL_DATA} \{\} ${DOCSDIR}/${dir} \; .endfor .for dir in sample-scripts ${MKDIR} ${DOCSDIR}/${dir} diff --git a/security/openvpn20/distinfo b/security/openvpn20/distinfo index e36e6e490d74..b73badbf2ff8 100644 --- a/security/openvpn20/distinfo +++ b/security/openvpn20/distinfo @@ -1,3 +1,3 @@ -MD5 (openvpn-2.0.6.tar.gz) = 8d2f95fa825e58363a676b25d4815aa7 -SHA256 (openvpn-2.0.6.tar.gz) = 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003 -SIZE (openvpn-2.0.6.tar.gz) = 664816 +MD5 (openvpn-2.0.9.tar.gz) = 60745008b90b7dbe25fe8337c550fec6 +SHA256 (openvpn-2.0.9.tar.gz) = 347c551e7c88affc1f4b7a4b715080253c9298dcc512ed29fe8ca5cd26d015d9 +SIZE (openvpn-2.0.9.tar.gz) = 669076 diff --git a/security/openvpn20/files/pkg-message.in b/security/openvpn20/files/pkg-message.in index 64494e4d6a85..4aec34fd990b 100644 --- a/security/openvpn20/files/pkg-message.in +++ b/security/openvpn20/files/pkg-message.in @@ -1,20 +1,6 @@ ### ------------------------------------------------------------------------ -### The OpenVPN FreeBSD port, since v2.0.1, uses rcNG to start OpenVPN. -### Edit /etc/rc.conf to start OpenVPN automatically at system startup. -### See %%PREFIX%%/etc/rc.d/openvpn%%RCSFX%% for details. +### Edit /etc/rc.conf[.local] to start OpenVPN automatically at system +### startup. See %%PREFIX%%/etc/rc.d/openvpn%%RCSFX%% for details. ### ------------------------------------------------------------------------ -### To get OpenVPN 1.X to talk with the new 2.0 version, you may need to -### edit the 1.X configuration file by adding these lines: -### tun-mtu 1500 -### tun-mtu-extra 32 -### mssfix 1450 -### key-method 2 <- this key-method line only for TLS setups -### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -### WARNING: THE DEFAULT PORT HAS CHANGED AND IS NOW 1194! -### OpenVPN 1.6 and older used 5000 rather than 1194 as their default -### port, so add the proper port options to your configuration file! -### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -### For further compatibility, see <http://openvpn.net/relnotes.html> -### ------------------------------------------------------------------------ -### If you want to donate to OpenVPN: <http://openvpn.net/donate.html> +### For compatibility information, see <http://openvpn.net/relnotes.html> ### ------------------------------------------------------------------------ diff --git a/security/openvpn20/files/pkg-req.in b/security/openvpn20/files/pkg-req.in deleted file mode 100644 index 15c8242d8724..000000000000 --- a/security/openvpn20/files/pkg-req.in +++ /dev/null @@ -1,29 +0,0 @@ -set -e - -rcvers() { - # determine if we have "old" or "new" (rcorder integration) scheme - # for %%PREFIX%%/etc/rc.d/* files - if test $1 -ge 700007 || test $1 -lt 700000 -a $1 -ge 600101 ; then - echo 2 - else - echo 1 - fi -} - -if [ "$2" = INSTALL ] ; then - # check if the base system is new enough for us, - # which should only matter for package installs. - buildrc=$(rcvers %%OSVERSION%%) - execrc=$(rcvers $(sysctl -n kern.osreldate) ) - if test $buildrc -gt $execrc ; then - cat <<EOF - -Error: this package, $1, was compiled for a newer FreeBSD -====== version that uses different boot scripts. - Therefore, the rc.d script WILL NOT WORK. - Please update your ports tree and install security/openvpn from there. - -EOF - exit 1 - fi -fi diff --git a/security/openvpn20/pkg-descr b/security/openvpn20/pkg-descr index b527fa8fa75e..54cd393b84b5 100644 --- a/security/openvpn20/pkg-descr +++ b/security/openvpn20/pkg-descr @@ -4,7 +4,7 @@ using an encrypted tunnel over the internet. It can operate over UDP or TCP, 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/ +WWW: http://openvpn.net/index.php/open-source.html - Matthias Andree -matthias.andree@gmx.de +mandree@FreeBSD.org diff --git a/security/openvpn20/pkg-plist b/security/openvpn20/pkg-plist index 4df2203dbd05..868afe6a6755 100644 --- a/security/openvpn20/pkg-plist +++ b/security/openvpn20/pkg-plist @@ -42,11 +42,13 @@ lib/openvpn-down-root.so %%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 |