Index: head/security/openvpn/Makefile =================================================================== --- head/security/openvpn/Makefile (revision 387082) +++ head/security/openvpn/Makefile (revision 387083) @@ -1,131 +1,138 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= openvpn DISTVERSION= 2.3.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security net MASTER_SITES= http://swupdate.openvpn.net/community/releases/ \ http://build.openvpn.net/downloads/releases/ MAINTAINER= mandree@FreeBSD.org COMMENT= Secure IP/Ethernet tunnel daemon LICENSE= GPLv2 CONFLICTS_INSTALL= openvpn-2.[!3].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* GNU_CONFIGURE= yes USES= cpe libtool pkgconfig shebangfix tar:xz SHEBANG_FILES= sample/sample-scripts/verify-cn \ sample/sample-scripts/auth-pam.pl \ sample/sample-scripts/ucn.pl # let OpenVPN's configure script pick up the requisite libraries: CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib # set PLUGIN_LIBDIR so that unqualified plugin paths are found: CPPFLAGS+= -DPLUGIN_LIBDIR=\\\"${PREFIX}/lib/openvpn/plugins\\\" -OPTIONS_DEFINE= PW_SAVE PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME ENGINEFIX2 +OPTIONS_DEFINE= PW_SAVE PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \ + ENGINEFIX2 SUBNETFIX 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 X509ALTUSERNAME_DESC= Enable --x509-username-field (only with OpenSSL) ENGINEFIX2_DESC= New EXPERIMENTAL patchset for SSL engine use (OpenSSL) +SUBNETFIX_DESC= EXPERIMENTAL patch to fix subnet mode (tkt \#481) EASYRSA_RUN_DEPENDS= easy-rsa>=0:${PORTSDIR}/security/easy-rsa PKCS11_LIB_DEPENDS= libpkcs11-helper.so:${PORTSDIR}/security/pkcs11-helper PKCS11_CONFIGURE_ENABLE= pkcs11 PW_SAVE_CONFIGURE_ENABLE= password-save X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username .include # patches to fix PR 195004, https://community.openvpn.net/openvpn/ticket/480 .if ${PORT_OPTIONS:MENGINEFIX2} EXTRA_PATCHES+= ${FILESDIR}/EF1.patch:-p1 \ ${FILESDIR}/EF2.patch:-p1 \ ${FILESDIR}/EF3.patch:-p1 +.endif + +# patch to fix PR 194745, https://community.openvpn.net/openvpn/ticket/481 +.if ${PORT_OPTIONS:MSUBNETFIX} +EXTRA_PATCHES+= ${FILESDIR}/EF-subnet.patch:-p1 .endif .if ${PORT_OPTIONS:MPOLARSSL} . if ${PORT_OPTIONS:MX509ALTUSERNAME} BROKEN= OpenVPN ${DISTVERSION} cannot use --x509-username-field with PolarSSL. Disable X509ALTUSERNAME, or use OpenSSL instead . else LIB_DEPENDS+= libpolarssl.so:${PORTSDIR}/security/polarssl CONFIGURE_ARGS+= --with-crypto-library=polarssl . endif .else USE_OPENSSL= yes CONFIGURE_ARGS+= --with-crypto-library=openssl .endif USE_RC_SUBR= openvpn USE_LDCONFIG= ${PREFIX}/lib SUB_FILES= pkg-message openvpn-client .include .ifdef (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}" .else @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" @${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}" @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_LOCAL6" @${ECHO} "" .endif post-configure: ${REINPLACE_CMD} '/^CFLAGS =/s/$$/ -fPIC/' \ ${WRKSRC}/src/plugins/auth-pam/Makefile \ ${WRKSRC}/src/plugins/down-root/Makefile post-build: @# self-tests here .if !defined(WITHOUT_CHECK) @${ECHO} ; ${ECHO} "### Note that you can skip these lengthy selftests with WITHOUT_CHECK=yes ###" ; ${ECHO} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} check .endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-down-root.so ${INSTALL_SCRIPT} ${WRKSRC}/contrib/pull-resolv-conf/client.up ${STAGEDIR}${PREFIX}/libexec/openvpn-client.up ${INSTALL_SCRIPT} ${WRKSRC}/contrib/pull-resolv-conf/client.down ${STAGEDIR}${PREFIX}/libexec/openvpn-client.down @${REINPLACE_CMD} 's|resolvconf -p -a|resolvconf -a|' ${STAGEDIR}${PREFIX}/libexec/openvpn-client.up ${INSTALL_SCRIPT} ${WRKDIR}/openvpn-client ${STAGEDIR}${PREFIX}/sbin/openvpn-client ${MKDIR} ${STAGEDIR}${PREFIX}/include .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR}/ .for i in AUTHORS ChangeLog PORTS ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor .endif .if ${PORT_OPTIONS:MEXAMPLES} (cd ${WRKSRC}/sample && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/) ${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/sample-scripts/* .endif .include Index: head/security/openvpn/files/EF-subnet.patch =================================================================== --- head/security/openvpn/files/EF-subnet.patch (nonexistent) +++ head/security/openvpn/files/EF-subnet.patch (revision 387083) @@ -0,0 +1,63 @@ +From b8f70b0f25c44e6d6a17b9f76756de87146a55d9 Mon Sep 17 00:00:00 2001 +From: Gert Doering +Date: Sun, 26 Apr 2015 18:16:39 +0200 +Subject: [PATCH] Fix FreeBSD ifconfig for topology subnet tunnels. + +For "topology subnet", we only pretend to have a subnet and keep +using the tun if in point-to-point mode - but for that to fully +work, the "remote" address needs to be different from the "local" +address. So just arbitrarily construct one from the on-link +subnet - base+1, if "that is not us", base+2, otherwise. + +Fix trac #481 + +Signed-off-by: Gert Doering +--- + src/openvpn/tun.c | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c +index 11a6d71..aa7a9f0 100644 +--- a/src/openvpn/tun.c ++++ b/src/openvpn/tun.c +@@ -626,6 +626,28 @@ void delete_route_connected_v6_net(struct tuntap * tt, + } + #endif + ++#if defined(TARGET_FREEBSD)||defined(TARGET_DRAGONFLY) ++/* we can't use true subnet mode on tun on all platforms, as that ++ * conflicts with IPv6 (wants to use ND then, which we don't do), ++ * but the OSes want "a remote address that is different from ours" ++ * - so we construct one, normally the first in the subnet, but if ++ * this is the same as ours, use the second one. ++ * The actual address does not matter at all, as the tun interface ++ * is still point to point and no layer 2 resolution is done... ++ */ ++ ++char * ++create_arbitrary_remote( struct tuntap *tt, struct gc_arena * gc ) ++{ ++ in_addr_t remote; ++ ++ remote = (tt->local & tt->remote_netmask) +1; ++ ++ if ( remote == tt->local ) remote ++; ++ ++ return print_in_addr_t (remote, 0, &gc); ++} ++#endif + + /* execute the ifconfig command through the shell */ + void +@@ -1150,7 +1172,7 @@ do_ifconfig (struct tuntap *tt, + IFCONFIG_PATH, + actual, + ifconfig_local, +- ifconfig_local, ++ create_arbitrary_remote( tt, &gc ), + tun_mtu, + ifconfig_remote_netmask + ); +-- +2.2.2 + Property changes on: head/security/openvpn/files/EF-subnet.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property