Index: head/security/openvpn-devel/Makefile =================================================================== --- head/security/openvpn-devel/Makefile (revision 174711) +++ head/security/openvpn-devel/Makefile (revision 174712) @@ -1,92 +1,93 @@ # New ports collection makefile for: openvpn # Date created: 2002-06-23 # Whom: Matthias Andree # # $FreeBSD$ # PORTNAME= openvpn -DISTVERSION= 2.1_beta15 +DISTVERSION= 2.1_beta16 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/ PKGNAMESUFFIX= -devel MAINTAINER= matthias.andree@gmx.de COMMENT= Secure IP/Ethernet tunnel daemon CONFLICTS= openvpn-[0-9]* GNU_CONFIGURE= yes USE_OPENSSL= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE}/lib \ --with-lzo-headers=${LOCALBASE}/include MAN8= openvpn.8 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_LIST+= OSVERSION=${OSVERSION} .include .if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101)) rcsuffix= .else rcsuffix= .sh .endif SUB_LIST+= RCSFX=${rcsuffix} # 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 post-patch: @${FIND} ${WRKSRC} -name \*.orig -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/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/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 \ PORTS README ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR} .endfor ( cd ${WRKSRC} \ && ${FIND} easy-rsa sample-config-files sample-scripts -depth \ | ${GREP} -v easy-rsa/Windows \ | ${CPIO} -pdmu ${DOCSDIR} ) .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/security/openvpn-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property Index: head/security/openvpn-devel/distinfo =================================================================== --- head/security/openvpn-devel/distinfo (revision 174711) +++ head/security/openvpn-devel/distinfo (revision 174712) @@ -1,3 +1,3 @@ -MD5 (openvpn-2.1_beta15.tar.gz) = 2ddc1878c99ea3a9b348275338f7d502 -SHA256 (openvpn-2.1_beta15.tar.gz) = 35daa28523095d637bc694d4e22f9a0e075f9e8b910998ca7bf2576fa9d8cc05 -SIZE (openvpn-2.1_beta15.tar.gz) = 776778 +MD5 (openvpn-2.1_beta16.tar.gz) = 3a53f55dafcfa4aab9e408e36326e236 +SHA256 (openvpn-2.1_beta16.tar.gz) = 1628613c52c6a16dd08f9f5079d4cdf0f408d6c92ffe969e3efaebb0aff7d1ad +SIZE (openvpn-2.1_beta16.tar.gz) = 778889 Property changes on: head/security/openvpn-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.17 \ No newline at end of property +1.18 \ No newline at end of property Index: head/security/openvpn-devel/files/patch-fix-cltsrv-timeout =================================================================== --- head/security/openvpn-devel/files/patch-fix-cltsrv-timeout (revision 174711) +++ head/security/openvpn-devel/files/patch-fix-cltsrv-timeout (nonexistent) @@ -1,19 +0,0 @@ -This fix was published by Paul Howarth on the OpenVPN-devel mailing list -on 2006-09-13 and fixes the TLS test's running indefinitely. - ---- ./sample-config-files/loopback-client~ 2006-09-12 18:21:43.000000000 +0100 -+++ ./sample-config-files/loopback-client 2006-09-12 18:22:40.000000000 +0100 -@@ -22,4 +22,4 @@ - cert sample-keys/client.crt - cipher DES-EDE3-CBC - ping 1 --inactive 120 -+inactive 120 10000000 ---- ./sample-config-files/loopback-server~ 2006-09-12 18:21:50.000000000 +0100 -+++ ./sample-config-files/loopback-server 2006-09-12 18:22:51.000000000 +0100 -@@ -23,4 +23,4 @@ - cert sample-keys/server.crt - cipher DES-EDE3-CBC - ping 1 --inactive 120 -+inactive 120 10000000 Property changes on: head/security/openvpn-devel/files/patch-fix-cltsrv-timeout ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/security/openvpn-devel/pkg-plist =================================================================== --- head/security/openvpn-devel/pkg-plist (revision 174711) +++ head/security/openvpn-devel/pkg-plist (revision 174712) @@ -1,78 +1,80 @@ 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%%/NEWS %%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%% Property changes on: head/security/openvpn-devel/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.10 \ No newline at end of property +1.11 \ No newline at end of property