CVS commit: pkgsrc/net

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed May 24 20:35:12 UTC 2017

Modified Files:
        pkgsrc/net/openvpn: Makefile Makefile.common PLIST distinfo
        pkgsrc/net/openvpn-acct-wtmpx: Makefile distinfo
        pkgsrc/net/openvpn-nagios: Makefile distinfo
        pkgsrc/net/openvpn-nagios/patches: patch-openvpn-nagios.c
Added Files:
        pkgsrc/net/openvpn-acct-wtmpx/patches: patch-Makefile
        pkgsrc/net/openvpn-nagios/patches: patch-Makefile
        pkgsrc/net/openvpn/patches: patch-configure
Removed Files:
        pkgsrc/net/openvpn-acct-wtmpx/patches: patch-aa
        pkgsrc/net/openvpn-nagios/patches: patch-aa
        pkgsrc/net/openvpn/patches: patch-ac patch-ad patch-ae patch-af
            patch-src_openvpn_socket.c patch-src_openvpn_socket.h

Log Message:
OpenVPN 2.4.2

Compared to OpenVPN 2.3 this is a major update with a large number of new features, improvements and fixes. Some of the major features are AEAD (GCM) cipher and Elliptic Curve DH key exchange 
support, improved IPv4/IPv6 dual stack support and more seamless connection migration when client's IP address changes (Peer-ID). Also, the new --tls-crypt feature can be used to increase users' 
connection privacy.

Compared to OpenVPN 2.4.1 there are several bugfixes and small enhancements. A summary of the changes is available in Changes.rst.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/net/openvpn/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/openvpn/Makefile.common
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/openvpn/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/openvpn/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/openvpn-acct-wtmpx/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/openvpn-acct-wtmpx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/openvpn-acct-wtmpx/patches/patch-Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/net/openvpn-acct-wtmpx/patches/patch-aa
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/openvpn-nagios/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/openvpn-nagios/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/openvpn-nagios/patches/patch-Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/net/openvpn-nagios/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c
cvs rdiff -u -r1.11 -r0 pkgsrc/net/openvpn/patches/patch-ac
cvs rdiff -u -r1.6 -r0 pkgsrc/net/openvpn/patches/patch-ad
cvs rdiff -u -r1.8 -r0 pkgsrc/net/openvpn/patches/patch-ae
cvs rdiff -u -r1.9 -r0 pkgsrc/net/openvpn/patches/patch-af
cvs rdiff -u -r0 -r1.1 pkgsrc/net/openvpn/patches/patch-configure
cvs rdiff -u -r1.3 -r0 pkgsrc/net/openvpn/patches/patch-src_openvpn_socket.c
cvs rdiff -u -r1.1 -r0 pkgsrc/net/openvpn/patches/patch-src_openvpn_socket.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/openvpn/Makefile
diff -u pkgsrc/net/openvpn/Makefile:1.61 pkgsrc/net/openvpn/Makefile:1.62
--- pkgsrc/net/openvpn/Makefile:1.61    Fri May 19 18:11:04 2017
+++ pkgsrc/net/openvpn/Makefile Wed May 24 20:35:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2017/05/19 18:11:04 spz Exp $
+# $NetBSD: Makefile,v 1.62 2017/05/24 20:35:12 adam Exp $
 
 DISTNAME=      ${OPENVPN_DISTNAME}
 CATEGORIES=    net
@@ -13,18 +13,16 @@ LICENSE=    gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_LIBTOOL=           yes
-USE_TOOLS+=            aclocal autoconf autom4te grep:run pkg-config
+USE_TOOLS+=            grep:run pkg-config
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-debug
 CONFIGURE_ARGS+=       --disable-dependency-tracking
-CONFIGURE_ARGS+=       --enable-password-save
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
 USE_OLD_DES_API=       yes
 TEST_TARGET=           check
 
 PKG_SYSCONFSUBDIR=     openvpn
-DATADIR=               ${PREFIX}/share/${PKGBASE}
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 RCD_SCRIPTS=           openvpn
 
@@ -32,13 +30,13 @@ INSTALLATION_DIRS+= ${EGDIR}/config
 INSTALLATION_DIRS+=    ${EGDIR}/keys
 INSTALLATION_DIRS+=    ${EGDIR}/scripts
 
-SMF_METHODS+=  openvpn
+SMF_METHODS=   openvpn
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_GROUPS=            ${OPENVPN_GROUP}
 PKG_USERS=             ${OPENVPN_USER}:${OPENVPN_GROUP}
-PKG_GECOS.${OPENVPN_USER}=     OpenVPN\ server\ user
+PKG_GECOS.${OPENVPN_USER}=OpenVPN\ server\ user
 
 MESSAGE_SUBST+=        OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
 
@@ -61,10 +59,10 @@ post-install:
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"
 
-.include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "SunOS"
 .include "../../net/solaris-tap/buildlink3.mk"
 .endif
+.include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/net/openvpn/Makefile.common
diff -u pkgsrc/net/openvpn/Makefile.common:1.7 pkgsrc/net/openvpn/Makefile.common:1.8
--- pkgsrc/net/openvpn/Makefile.common:1.7      Mon May 22 06:25:19 2017
+++ pkgsrc/net/openvpn/Makefile.common  Wed May 24 20:35:12 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2017/05/22 06:25:19 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2017/05/24 20:35:12 adam Exp $
 # used by net/openvpn/Makefile
 # used by net/openvpn-acct-wtmpx/Makefile
 # used by net/openvpn-nagios/Makefile
 
-OPENVPN_DISTNAME=      openvpn-2.3.16
+OPENVPN_DISTNAME=      openvpn-2.4.2
 OPENVPN_DISTFILE=      ${OPENVPN_DISTNAME}.tar.xz
 OPENVPN_MASTER_SITES=  http://swupdate.openvpn.net/community/releases/
 SITES.${OPENVPN_DISTFILE}=     ${OPENVPN_MASTER_SITES}

Index: pkgsrc/net/openvpn/PLIST
diff -u pkgsrc/net/openvpn/PLIST:1.18 pkgsrc/net/openvpn/PLIST:1.19
--- pkgsrc/net/openvpn/PLIST:1.18       Wed Dec  3 10:09:01 2014
+++ pkgsrc/net/openvpn/PLIST    Wed May 24 20:35:12 2017
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.18 2014/12/03 10:09:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/05/24 20:35:12 adam Exp $
+include/openvpn-msg.h
 include/openvpn-plugin.h
 ${PLIST.pam}lib/openvpn/plugins/openvpn-plugin-auth-pam.la
 lib/openvpn/plugins/openvpn-plugin-down-root.la
@@ -6,6 +7,7 @@ man/man8/openvpn.8
 sbin/openvpn
 share/doc/openvpn/COPYING
 share/doc/openvpn/COPYRIGHT.GPL
+share/doc/openvpn/Changes.rst
 share/doc/openvpn/README
 share/doc/openvpn/README.IPv6
 ${PLIST.pam}share/doc/openvpn/README.auth-pam
@@ -44,6 +46,7 @@ share/examples/openvpn/keys/server-ec.cr
 share/examples/openvpn/keys/server-ec.key
 share/examples/openvpn/keys/server.crt
 share/examples/openvpn/keys/server.key
+share/examples/openvpn/keys/ta.key
 share/examples/openvpn/scripts/auth-pam.pl
 share/examples/openvpn/scripts/bridge-start
 share/examples/openvpn/scripts/bridge-stop

Index: pkgsrc/net/openvpn/distinfo
diff -u pkgsrc/net/openvpn/distinfo:1.35 pkgsrc/net/openvpn/distinfo:1.36
--- pkgsrc/net/openvpn/distinfo:1.35    Mon May 22 06:25:19 2017
+++ pkgsrc/net/openvpn/distinfo Wed May 24 20:35:12 2017
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.35 2017/05/22 06:25:19 adam Exp $
+$NetBSD: distinfo,v 1.36 2017/05/24 20:35:12 adam Exp $
 
-SHA1 (openvpn-2.3.16.tar.xz) = 2dcd98bb9f994daf9f2fbad40f4be1a05b2f5955
-RMD160 (openvpn-2.3.16.tar.xz) = e09871e30e1d08228ef955c6026e100d7dc30c2f
-SHA512 (openvpn-2.3.16.tar.xz) = 9afd91f60506239a158e3cd181ca0e1a541441575d1a76cbdbaba5e6357aabe195ab26fa83b0d5c33511e6d356964af31e5ac954f3561bff9448be086531038f
-Size (openvpn-2.3.16.tar.xz) = 831428 bytes
-SHA1 (patch-ac) = 3071423ae978dd7d1d79cb140325bde96ba8d21b
-SHA1 (patch-ad) = 1e2c34a37157ff9c091e0120817a8c8bae9aef4e
-SHA1 (patch-ae) = fce5d2b7c8ef830cba3df4408af79301f347cafd
-SHA1 (patch-af) = 8d728c36a6eccdebf6c7e5a02d457903b255f4fb
+SHA1 (openvpn-2.4.2.tar.xz) = 64395346fa6c7f52a350073acf6acfe5c0658bc8
+RMD160 (openvpn-2.4.2.tar.xz) = a87b04e515434f03be49a9c9ae501e6d3267dc36
+SHA512 (openvpn-2.4.2.tar.xz) = 438f16ac2d12dfd9f11ebcddebf709102046c71b4c4608a294da552587ea346d6ebb8c916f717bce992057754d6bc35ca1df5653fc907cc0003d9e34c92da963
+Size (openvpn-2.4.2.tar.xz) = 918448 bytes
+SHA1 (patch-configure) = 240342a88baed7642dfd63ed0a2ab4c0a75adbd4
 SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143
-SHA1 (patch-src_openvpn_socket.c) = d091fdf614c7673755b9f1fdbdd11ce33276cfda
-SHA1 (patch-src_openvpn_socket.h) = b4b952af347e0f2d0aff307a5025b3d27a2e6ee5

Index: pkgsrc/net/openvpn-acct-wtmpx/Makefile
diff -u pkgsrc/net/openvpn-acct-wtmpx/Makefile:1.8 pkgsrc/net/openvpn-acct-wtmpx/Makefile:1.9
--- pkgsrc/net/openvpn-acct-wtmpx/Makefile:1.8  Fri May 19 18:11:04 2017
+++ pkgsrc/net/openvpn-acct-wtmpx/Makefile      Wed May 24 20:35:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/05/19 18:11:04 spz Exp $
+# $NetBSD: Makefile,v 1.9 2017/05/24 20:35:12 adam Exp $
 
 .include "../../net/openvpn/Makefile.common"
 
@@ -18,12 +18,14 @@ PKG_DESTDIR_SUPPORT=        user-destdir
 USE_LIBTOOL=   yes
 USE_TOOLS+=    install
 
-MAKE_ENV+=     OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q}
-MAKE_ENV+=     OPENVPN_DISTNAME=${OPENVPN_DISTNAME:Q}
+MAKE_ENV+=     OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
+MAKE_ENV+=     OPENVPN_DISTNAME=${OPENVPN_DISTNAME}
 
-PLIST_SUBST+=  OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR:Q}
-MESSAGE_SUBST+=        OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q}
+PLIST_SUBST+=  OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR}
+MESSAGE_SUBST+=        OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
 
 SPECIAL_PERMS+=        bin/logwtmpx ${SETUID_ROOT_PERMS}
 
+DEPENDS+=      openvpn>=2.4.2:../../net/openvpn
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/openvpn-acct-wtmpx/distinfo
diff -u pkgsrc/net/openvpn-acct-wtmpx/distinfo:1.12 pkgsrc/net/openvpn-acct-wtmpx/distinfo:1.13
--- pkgsrc/net/openvpn-acct-wtmpx/distinfo:1.12 Mon May 22 06:25:19 2017
+++ pkgsrc/net/openvpn-acct-wtmpx/distinfo      Wed May 24 20:35:12 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2017/05/22 06:25:19 adam Exp $
+$NetBSD: distinfo,v 1.13 2017/05/24 20:35:12 adam Exp $
 
-SHA1 (openvpn-2.3.16.tar.xz) = 2dcd98bb9f994daf9f2fbad40f4be1a05b2f5955
-RMD160 (openvpn-2.3.16.tar.xz) = e09871e30e1d08228ef955c6026e100d7dc30c2f
-SHA512 (openvpn-2.3.16.tar.xz) = 9afd91f60506239a158e3cd181ca0e1a541441575d1a76cbdbaba5e6357aabe195ab26fa83b0d5c33511e6d356964af31e5ac954f3561bff9448be086531038f
-Size (openvpn-2.3.16.tar.xz) = 831428 bytes
+SHA1 (openvpn-2.4.2.tar.xz) = 64395346fa6c7f52a350073acf6acfe5c0658bc8
+RMD160 (openvpn-2.4.2.tar.xz) = a87b04e515434f03be49a9c9ae501e6d3267dc36
+SHA512 (openvpn-2.4.2.tar.xz) = 438f16ac2d12dfd9f11ebcddebf709102046c71b4c4608a294da552587ea346d6ebb8c916f717bce992057754d6bc35ca1df5653fc907cc0003d9e34c92da963
+Size (openvpn-2.4.2.tar.xz) = 918448 bytes
 SHA1 (openvpn-acct-wtmpx-20130210.tgz) = cf7bc26b12a65493cdf5db93b03bbb938a2f0f33
 RMD160 (openvpn-acct-wtmpx-20130210.tgz) = d9000789f04606bfa17db1597a45a4235b1119ea
 SHA512 (openvpn-acct-wtmpx-20130210.tgz) = 7b8fd4929e65d8d84158f62e5a17ff3adb3b4a6cff63b29038acfb368750719f2f593786ed9b02402824c19d872b188d2a46740a5c5f853e8873a71481b13aaf
 Size (openvpn-acct-wtmpx-20130210.tgz) = 2778 bytes
-SHA1 (patch-aa) = 95d9382b74d791306766433506eb0228a806dbdc
+SHA1 (patch-Makefile) = 4ed829df8d43a6e6b9b0242c749630079a41f5e4

Index: pkgsrc/net/openvpn-nagios/Makefile
diff -u pkgsrc/net/openvpn-nagios/Makefile:1.7 pkgsrc/net/openvpn-nagios/Makefile:1.8
--- pkgsrc/net/openvpn-nagios/Makefile:1.7      Fri May 19 18:11:04 2017
+++ pkgsrc/net/openvpn-nagios/Makefile  Wed May 24 20:35:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/05/19 18:11:04 spz Exp $
+# $NetBSD: Makefile,v 1.8 2017/05/24 20:35:12 adam Exp $
 
 .include "../../net/openvpn/Makefile.common"
 
@@ -18,13 +18,13 @@ PKG_DESTDIR_SUPPORT=        user-destdir
 USE_LIBTOOL=   yes
 USE_TOOLS+=    install
 
-MAKE_ENV+=     OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q}
-MAKE_ENV+=     OPENVPN_DISTNAME=${OPENVPN_DISTNAME:Q}
+MAKE_ENV+=     OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
+MAKE_ENV+=     OPENVPN_DISTNAME=${OPENVPN_DISTNAME}
 
-PLIST_SUBST+=  OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR:Q}
-MESSAGE_SUBST+=        OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q}
+PLIST_SUBST+=  OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR}
+MESSAGE_SUBST+=        OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
 
-DEPENDS+=      openvpn>=2.3.0<2.4:../../net/openvpn
+DEPENDS+=      openvpn>=2.4.2:../../net/openvpn
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/openvpn-nagios/distinfo
diff -u pkgsrc/net/openvpn-nagios/distinfo:1.9 pkgsrc/net/openvpn-nagios/distinfo:1.10
--- pkgsrc/net/openvpn-nagios/distinfo:1.9      Mon May 22 06:25:19 2017
+++ pkgsrc/net/openvpn-nagios/distinfo  Wed May 24 20:35:12 2017
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2017/05/22 06:25:19 adam Exp $
+$NetBSD: distinfo,v 1.10 2017/05/24 20:35:12 adam Exp $
 
-SHA1 (openvpn-2.3.16.tar.xz) = 2dcd98bb9f994daf9f2fbad40f4be1a05b2f5955
-RMD160 (openvpn-2.3.16.tar.xz) = e09871e30e1d08228ef955c6026e100d7dc30c2f
-SHA512 (openvpn-2.3.16.tar.xz) = 9afd91f60506239a158e3cd181ca0e1a541441575d1a76cbdbaba5e6357aabe195ab26fa83b0d5c33511e6d356964af31e5ac954f3561bff9448be086531038f
-Size (openvpn-2.3.16.tar.xz) = 831428 bytes
+SHA1 (openvpn-2.4.2.tar.xz) = 64395346fa6c7f52a350073acf6acfe5c0658bc8
+RMD160 (openvpn-2.4.2.tar.xz) = a87b04e515434f03be49a9c9ae501e6d3267dc36
+SHA512 (openvpn-2.4.2.tar.xz) = 438f16ac2d12dfd9f11ebcddebf709102046c71b4c4608a294da552587ea346d6ebb8c916f717bce992057754d6bc35ca1df5653fc907cc0003d9e34c92da963
+Size (openvpn-2.4.2.tar.xz) = 918448 bytes
 SHA1 (openvpn-nagios-20130210.tgz) = 8a0fd4e3eba27584aa53c5589c13d4b38af43ba2
 RMD160 (openvpn-nagios-20130210.tgz) = 2a47893ec2db2c280adc7b9fbbea97794ec1a6f4
 SHA512 (openvpn-nagios-20130210.tgz) = 80e565f32379c39eb6c7f3b4744af221ae882ff07dce9dae5bd7feb73b0edcfc7c7ac7f70d23fdcd4f492b66f095f09833deb122449840b36ea606ce91900358
 Size (openvpn-nagios-20130210.tgz) = 3034 bytes
-SHA1 (patch-aa) = fe38ed54931c34903a1b25f387d59dc1b5e042f6
-SHA1 (patch-openvpn-nagios.c) = e1700e4f648eaca87fdcedc9d9490c9badd6c33b
+SHA1 (patch-Makefile) = accc6a2a49530a504897451f2a2f45c528b7b131
+SHA1 (patch-openvpn-nagios.c) = 36e9ee6e652051b3b047710666998052bef637db

Index: pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c
diff -u pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c:1.1 pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c:1.2
--- pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c:1.1        Tue Mar 26 23:32:50 2013
+++ pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c    Wed May 24 20:35:12 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-openvpn-nagios.c,v 1.1 2013/03/26 23:32:50 joerg Exp $
+$NetBSD: patch-openvpn-nagios.c,v 1.2 2017/05/24 20:35:12 adam Exp $
 
---- openvpn-nagios.c.orig      2013-03-25 15:45:11.000000000 +0000
+--- openvpn-nagios.c.orig      2013-02-10 01:33:07.000000000 +0000
 +++ openvpn-nagios.c
 @@ -87,12 +87,11 @@ strmatch(s, match)
  #endif
@@ -17,3 +17,12 @@ $NetBSD: patch-openvpn-nagios.c,v 1.1 20
        return mktime(&tm);
  }
  
+@@ -112,7 +111,7 @@ openvpn_plugin_open_v3(vers, in, out)
+       struct ctx *ctx;
+       pthread_t thread;
+       int ac = 0;
+-      char **av = __UNCONST(in->argv);
++      char **av = (void *)(unsigned long)(const void *)(in->argv);
+       int i, ch;
+       time_t now;
+ 

Added files:

Index: pkgsrc/net/openvpn-acct-wtmpx/patches/patch-Makefile
diff -u /dev/null pkgsrc/net/openvpn-acct-wtmpx/patches/patch-Makefile:1.1
--- /dev/null   Wed May 24 20:35:12 2017
+++ pkgsrc/net/openvpn-acct-wtmpx/patches/patch-Makefile        Wed May 24 20:35:12 2017
@@ -0,0 +1,40 @@
+$NetBSD: patch-Makefile,v 1.1 2017/05/24 20:35:12 adam Exp $
+
+--- Makefile.orig      2009-11-07 05:12:24.000000000 +0100
++++ Makefile   2013-02-09 18:22:49.000000000 +0100
+@@ -1,14 +1,14 @@
+-prefix=/usr/pkg
+-PLUGINDIR=$(prefix)/lib/openvpn
+-bindir=/usr/local/bin
++#prefix=/usr/pkg
++PLUGINDIR=${DESTDIR}${OPENVPN_PLUGINSDIR}
++bindir=${DESTDIR}${PREFIX}/bin
+ 
+-OPENVPN_SRC=../openvpn-2.1_rc20
+-CFLAGS= -Wall -Werror -ansi -g -I$(OPENVPN_SRC) -DBINDIR=\"$(bindir)\"
++OPENVPN_SRC=../${OPENVPN_DISTNAME}
++CFLAGS=-Wall -Werror -DENABLE_CRYPTO=1 -I$(OPENVPN_SRC)/include -DBINDIR=\"$(bindir)\"
+ OPENVPN_GROUP=nobody
+ 
+-LIBTOOL=libtool
+-INSTALL=install
++#LIBTOOL=libtool
++#INSTALL=install
+ 
+ 
+ all: openvpn-acct-wtmpx.la logwtmpx
+ 
+@@ -22,10 +22,11 @@
+ logwtmpx:     logwtmpx.o
+       $(CC) -o $@ -lutil $?
+ 
+ install:      openvpn-acct-wtmpx.la logwtmpx
++      $(INSTALL) -d -m 0755 $(PLUGINDIR)
+       $(LIBTOOL) --mode=install cp openvpn-acct-wtmpx.la $(PLUGINDIR)/
+-      $(LIBTOOL) --mode=finish
+-      $(INSTALL) -c -m 4754 -o root -g $(OPENVPN_GROUP) logwtmpx $(bindir)/
++      $(INSTALL) -d -m 0755 $(bindir)
++      $(INSTALL) -c -m 0555 logwtmpx $(bindir)/
+ 
+ clean:
+       rm -rf logwtmpx *.o *.so *.la *.lo .libs

Index: pkgsrc/net/openvpn-nagios/patches/patch-Makefile
diff -u /dev/null pkgsrc/net/openvpn-nagios/patches/patch-Makefile:1.1
--- /dev/null   Wed May 24 20:35:12 2017
+++ pkgsrc/net/openvpn-nagios/patches/patch-Makefile    Wed May 24 20:35:12 2017
@@ -0,0 +1,29 @@
+$NetBSD: patch-Makefile,v 1.1 2017/05/24 20:35:12 adam Exp $
+
+--- Makefile.orig      2013-02-09 05:44:43.000000000 +0000
++++ Makefile
+@@ -1,9 +1,9 @@
+-prefix=/usr/pkg
+-PLUGINDIR=$(prefix)/lib/openvpn
+-bindir=/usr/local/bin
++#prefix=/usr/pkg
++PLUGINDIR=${DESTDIR}${OPENVPN_PLUGINSDIR}
++bindir=${DESTDIR}${PREFIX}/bin
+ 
+-OPENVPN_SRC=../openvpn-2.3.0
+-CFLAGS= -Wall -Werror -ansi -g -I$(OPENVPN_SRC)/include -DBINDIR=\"$(bindir)\"
++OPENVPN_SRC=../${OPENVPN_DISTNAME}
++CFLAGS+=-Wall -Werror -DENABLE_CRYPTO=1 -I$(OPENVPN_SRC)/include -DBINDIR=\"$(bindir)\"
+ OPENVPN_GROUP=nobody
+ 
+ LIBTOOL=libtool
+@@ -20,8 +20,8 @@ openvpn-nagios.la:  openvpn-nagios.lo
+                  -rpath $(PLUGINDIR) -module -o $@ $? -lc -lutil
+ 
+ install:      openvpn-nagios.la
++      $(INSTALL) -d -m 0755 $(PLUGINDIR)
+       $(LIBTOOL) --mode=install cp openvpn-nagios.la $(PLUGINDIR)/
+-      $(LIBTOOL) --mode=finish
+ 
+ clean:
+       rm -rf *.o *.so *.la *.lo .libs

Index: pkgsrc/net/openvpn/patches/patch-configure
diff -u /dev/null pkgsrc/net/openvpn/patches/patch-configure:1.1
--- /dev/null   Wed May 24 20:35:12 2017
+++ pkgsrc/net/openvpn/patches/patch-configure  Wed May 24 20:35:12 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2017/05/24 20:35:12 adam Exp $
+
+Support net/if_tap.h
+
+--- configure.orig     2017-05-11 00:51:16.000000000 +0000
++++ configure
+@@ -14419,6 +14419,7 @@ for ac_header in  \
+       sys/mman.h sys/file.h sys/wait.h \
+       unistd.h signal.h libgen.h stropts.h \
+       syslog.h pwd.h grp.h \
++      net/if_tap.h \
+       sys/sockio.h sys/uio.h linux/sockios.h \
+       linux/types.h sys/poll.h sys/epoll.h err.h \
+