Date: Fri, 11 Jan 2013 23:09:37 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310252 - in head/security: . openvpn openvpn/files openvpn20 openvpn20/files openvpn22 openvpn22/files Message-ID: <201301112309.r0BN9bx2093988@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Fri Jan 11 23:09:37 2013 New Revision: 310252 URL: http://svnweb.freebsd.org/changeset/ports/310252 Log: OpenVPN changes, upgrades and fixes: - Upgrade security/openvpn to v2.3.0 (changes installed layout a bit), splitting and re-diffing patches. - Retain v2.2.2 as security/openvpn22 - Mark security/openvpn20 as deprecated and to expire 6 months from now - Fix TCP_NODELAY option (openvpn 2.3, 2.2), see <http://community.openvpn.net/openvpn/ticket/158>; - Fix PassTOS option (openvpn 2.2, 2.0), see http://community.openvpn.net/openvpn/ticket/135 Added: head/security/openvpn/files/patch-sample__sample-config-files__loopback-client (contents, props changed) head/security/openvpn/files/patch-sample__sample-config-files__loopback-server (contents, props changed) head/security/openvpn/files/patch-src__openvpn__syshead.h (contents, props changed) head/security/openvpn20/files/patch-socket.h (contents, props changed) head/security/openvpn22/ - copied from r310202, head/security/openvpn/ head/security/openvpn22/files/patch-socket.h (contents, props changed) head/security/openvpn22/files/patch-syshead.h (contents, props changed) Deleted: head/security/openvpn/files/patch-selftest-ports head/security/openvpn/files/patch-t_cltsrv.sh Modified: head/security/Makefile head/security/openvpn/Makefile (contents, props changed) head/security/openvpn/distinfo (contents, props changed) head/security/openvpn/pkg-plist (contents, props changed) head/security/openvpn20/Makefile (contents, props changed) head/security/openvpn22/Makefile (contents, props changed) Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Fri Jan 11 22:29:10 2013 (r310251) +++ head/security/Makefile Fri Jan 11 23:09:37 2013 (r310252) @@ -363,6 +363,7 @@ SUBDIR += openvpn-beta SUBDIR += openvpn-devel SUBDIR += openvpn20 + SUBDIR += openvpn22 SUBDIR += ophcrack SUBDIR += opieprint SUBDIR += osiris Modified: head/security/openvpn/Makefile ============================================================================== --- head/security/openvpn/Makefile Fri Jan 11 22:29:10 2013 (r310251) +++ head/security/openvpn/Makefile Fri Jan 11 23:09:37 2013 (r310252) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 2.2.2 +DISTVERSION= 2.3.0 CATEGORIES= security net # MASTER_SITES points to hosts in distinct data centers, # so just one MASTER_SITES entry should be OK. @@ -14,15 +14,17 @@ COMMENT= Secure IP/Ethernet tunnel daemo LICENSE= GPLv2 -CONFLICTS_INSTALL= openvpn-devel-[0-9]* openvpn-2.0* openvpn-beta-[0-9]* +CONFLICTS_INSTALL= openvpn-2.[!3].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* GNU_CONFIGURE= yes USE_OPENSSL= yes USE_XZ= yes -CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE}/lib \ - --with-lzo-headers=${LOCALBASE}/include +# let OpenVPN's configure script pick up the libraries +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= PW_SAVE PKCS11 +# PolarSSL missing: OpenVPN does not currently compile with PolarSSL 1.2.0+ +OPTIONS_DEFINE= PW_SAVE PKCS11 PW_SAVE_DESC= Interactive passwords may be read from a file PKCS11_DESC= Use security/pkcs11-helper @@ -63,14 +65,6 @@ LIB_DEPENDS+= pkcs11-helper:${PORTSDIR}/ 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}/plugin -name Makefile \ - -exec ${REINPLACE_CMD} -e 's;gcc;${CC};g' '{}' + - @${FIND} ${WRKSRC} \( -name \*.orig -o -name \*.bak \) -delete - pre-configure: .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" @@ -84,8 +78,6 @@ pre-configure: .endif post-build: - cd ${WRKSRC}/plugin/down-root && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} - 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} @@ -94,21 +86,18 @@ post-build: 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 ${PORT_OPTIONS:MDOCS} ${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 +.for dir in sample/sample-config-files + ${RM} -f ${WRKSRC}/${dir}/*.orig ${MKDIR} ${DOCSDIR}/${dir} ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_DATA} \{\} ${DOCSDIR}/${dir} \; .endfor -.for dir in sample-scripts +.for dir in sample/sample-scripts ${MKDIR} ${DOCSDIR}/${dir} ${FIND} ${WRKSRC}/${dir}/ -maxdepth 1 -type f -exec ${INSTALL_SCRIPT} \{\} ${DOCSDIR}/${dir} \; .endfor Modified: head/security/openvpn/distinfo ============================================================================== --- head/security/openvpn/distinfo Fri Jan 11 22:29:10 2013 (r310251) +++ head/security/openvpn/distinfo Fri Jan 11 23:09:37 2013 (r310252) @@ -1,2 +1,2 @@ -SHA256 (openvpn-2.2.2.tar.xz) = a694b9f661a0db30c048c94a4b4fc63d1460aea4dbc504a4f233f3c15997f4cd -SIZE (openvpn-2.2.2.tar.xz) = 649356 +SHA256 (openvpn-2.3.0.tar.xz) = a9fcf7bc1c1cd88cd8867ff567e8f8df5e695f0e983bd0aed3a3e1f6ae14d107 +SIZE (openvpn-2.3.0.tar.xz) = 762052 Added: head/security/openvpn/files/patch-sample__sample-config-files__loopback-client ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvpn/files/patch-sample__sample-config-files__loopback-client Fri Jan 11 23:09:37 2013 (r310252) @@ -0,0 +1,13 @@ +--- ./sample/sample-config-files/loopback-client.orig 2012-09-10 17:01:08.000000000 +0200 ++++ ./sample/sample-config-files/loopback-client 2013-01-11 21:30:07.000000000 +0100 +@@ -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 Added: head/security/openvpn/files/patch-sample__sample-config-files__loopback-server ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvpn/files/patch-sample__sample-config-files__loopback-server Fri Jan 11 23:09:37 2013 (r310252) @@ -0,0 +1,13 @@ +--- ./sample/sample-config-files/loopback-server.orig 2012-09-10 17:01:08.000000000 +0200 ++++ ./sample/sample-config-files/loopback-server 2013-01-11 21:30:07.000000000 +0100 +@@ -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 Added: head/security/openvpn/files/patch-src__openvpn__syshead.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvpn/files/patch-src__openvpn__syshead.h Fri Jan 11 23:09:37 2013 (r310252) @@ -0,0 +1,16 @@ +Work around "missing" TCP_NODELAY, +obtained from: http://community.openvpn.net/openvpn/ticket/158 + +--- ./src/openvpn/syshead.h.orig 2012-11-22 13:07:51.000000000 +0100 ++++ ./src/openvpn/syshead.h 2013-01-11 21:30:07.000000000 +0100 +@@ -307,6 +307,10 @@ + #include <netinet/ip.h> + #endif + ++#ifdef HAVE_NETINET_TCP_H ++#include <netinet/tcp.h> ++#endif ++ + #ifdef HAVE_NET_IF_TUN_H + #include <net/if_tun.h> + #endif Modified: head/security/openvpn/pkg-plist ============================================================================== --- head/security/openvpn/pkg-plist Fri Jan 11 22:29:10 2013 (r310251) +++ head/security/openvpn/pkg-plist Fri Jan 11 23:09:37 2013 (r310252) @@ -1,81 +1,45 @@ +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 sbin/openvpn -lib/openvpn-auth-pam.so -lib/openvpn-down-root.so %%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/management-notes.txt %%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%%/management-notes.txt -%%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%%%%DOCSDIR%%/README.auth-pam +%%PORTDOCS%%%%DOCSDIR%%/README.down-root +%%PORTDOCS%%%%DOCSDIR%%/README.IPv6 +%%PORTDOCS%%%%DOCSDIR%%/README.polarssl +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/README +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/client.conf +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/firewall.sh +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/home.up +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/loopback-client +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/loopback-server +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/office.up +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/openvpn-shutdown.sh +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/openvpn-startup.sh +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/server.conf +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/static-home.conf +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/static-office.conf +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/tls-home.conf +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/tls-office.conf +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/xinetd-client-config +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-config-files/xinetd-server-config +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-scripts/auth-pam.pl +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-scripts/bridge-start +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-scripts/bridge-stop +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-scripts/ucn.pl +%%PORTDOCS%%%%DOCSDIR%%/sample/sample-scripts/verify-cn +%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample/sample-scripts +%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample/sample-config-files +%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm lib/openvpn/plugins +@dirrm lib/openvpn Modified: head/security/openvpn20/Makefile ============================================================================== --- head/security/openvpn20/Makefile Fri Jan 11 22:29:10 2013 (r310251) +++ head/security/openvpn20/Makefile Fri Jan 11 23:09:37 2013 (r310252) @@ -3,7 +3,7 @@ PORTNAME= openvpn PORTVERSION= 2.0.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net # MASTER_SITES points to hosts in distinct data centers, # so just one MASTER_SITES entry should be OK. @@ -12,6 +12,9 @@ MASTER_SITES= http://openvpn.net/release MAINTAINER= mandree@FreeBSD.org COMMENT= Secure IP/Ethernet tunnel daemon +DEPRECATED= Please migrate to a newer OpenVPN version +EXPIRATION_DATE= 2013-07-11 + LATEST_LINK= openvpn20 CONFLICTS_INSTALL= openvpn-2.[!0]* openvpn-beta-[0-9]* openvpn-devel-[0-9]* Added: head/security/openvpn20/files/patch-socket.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvpn20/files/patch-socket.h Fri Jan 11 23:09:37 2013 (r310252) @@ -0,0 +1,11 @@ +--- ./socket.h.orig 2005-11-01 12:06:11.000000000 +0100 ++++ ./socket.h 2013-01-11 21:51:45.000000000 +0100 +@@ -204,7 +204,7 @@ + + #if PASSTOS_CAPABILITY + /* used to get/set TOS. */ +- uint8_t ptos; ++ int ptos; + bool ptos_defined; + #endif + Modified: head/security/openvpn22/Makefile ============================================================================== --- head/security/openvpn/Makefile Thu Jan 10 19:46:40 2013 (r310202) +++ head/security/openvpn22/Makefile Fri Jan 11 23:09:37 2013 (r310252) @@ -3,6 +3,7 @@ PORTNAME= openvpn DISTVERSION= 2.2.2 +PORTREVISION= 1 CATEGORIES= security net # MASTER_SITES points to hosts in distinct data centers, # so just one MASTER_SITES entry should be OK. @@ -14,7 +15,8 @@ COMMENT= Secure IP/Ethernet tunnel daemo LICENSE= GPLv2 -CONFLICTS_INSTALL= openvpn-devel-[0-9]* openvpn-2.0* openvpn-beta-[0-9]* +LATEST_LINK= openvpn22 +CONFLICTS_INSTALL= openvpn-devel-[0-9]* openvpn-2.[!2]* openvpn-beta-[0-9]* GNU_CONFIGURE= yes USE_OPENSSL= yes Added: head/security/openvpn22/files/patch-socket.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvpn22/files/patch-socket.h Fri Jan 11 23:09:37 2013 (r310252) @@ -0,0 +1,11 @@ +--- ./socket.h.orig 2011-12-13 17:58:56.000000000 +0100 ++++ ./socket.h 2013-01-11 21:50:11.000000000 +0100 +@@ -225,7 +225,7 @@ + + #if PASSTOS_CAPABILITY + /* used to get/set TOS. */ +- uint8_t ptos; ++ int ptos; + bool ptos_defined; + #endif + Added: head/security/openvpn22/files/patch-syshead.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openvpn22/files/patch-syshead.h Fri Jan 11 23:09:37 2013 (r310252) @@ -0,0 +1,16 @@ +Work around "missing" TCP_NODELAY, +obtained from: http://community.openvpn.net/openvpn/ticket/158 + +--- ./syshead.h.orig 2012-11-22 13:07:51.000000000 +0100 ++++ ./syshead.h 2013-01-11 21:30:07.000000000 +0100 +@@ -298,6 +298,10 @@ + #include <netinet/ip.h> + #endif + ++#ifdef HAVE_NETINET_TCP_H ++#include <netinet/tcp.h> ++#endif ++ + #ifdef HAVE_NET_IF_TUN_H + #include <net/if_tun.h> + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301112309.r0BN9bx2093988>