Wed May 24 20:35:12 2017 UTC ()
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.


(adam)
diff -r1.61 -r1.62 pkgsrc/net/openvpn/Makefile
diff -r1.7 -r1.8 pkgsrc/net/openvpn/Makefile.common
diff -r1.18 -r1.19 pkgsrc/net/openvpn/PLIST
diff -r1.35 -r1.36 pkgsrc/net/openvpn/distinfo
diff -r1.8 -r1.9 pkgsrc/net/openvpn-acct-wtmpx/Makefile
diff -r1.12 -r1.13 pkgsrc/net/openvpn-acct-wtmpx/distinfo
diff -r0 -r1.1 pkgsrc/net/openvpn-acct-wtmpx/patches/patch-Makefile
diff -r1.4 -r0 pkgsrc/net/openvpn-acct-wtmpx/patches/patch-aa
diff -r1.7 -r1.8 pkgsrc/net/openvpn-nagios/Makefile
diff -r1.9 -r1.10 pkgsrc/net/openvpn-nagios/distinfo
diff -r0 -r1.1 pkgsrc/net/openvpn-nagios/patches/patch-Makefile
diff -r1.2 -r0 pkgsrc/net/openvpn-nagios/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c
diff -r1.11 -r0 pkgsrc/net/openvpn/patches/patch-ac
diff -r1.6 -r0 pkgsrc/net/openvpn/patches/patch-ad
diff -r1.8 -r0 pkgsrc/net/openvpn/patches/patch-ae
diff -r1.9 -r0 pkgsrc/net/openvpn/patches/patch-af
diff -r0 -r1.1 pkgsrc/net/openvpn/patches/patch-configure
diff -r1.3 -r0 pkgsrc/net/openvpn/patches/patch-src_openvpn_socket.c
diff -r1.1 -r0 pkgsrc/net/openvpn/patches/patch-src_openvpn_socket.h

cvs diff -r1.61 -r1.62 pkgsrc/net/openvpn/Makefile (expand / switch to unified diff)

--- pkgsrc/net/openvpn/Makefile 2017/05/19 18:11:04 1.61
+++ pkgsrc/net/openvpn/Makefile 2017/05/24 20:35:12 1.62
@@ -1,71 +1,69 @@ @@ -1,71 +1,69 @@
1# $NetBSD: Makefile,v 1.61 2017/05/19 18:11:04 spz Exp $ 1# $NetBSD: Makefile,v 1.62 2017/05/24 20:35:12 adam Exp $
2 2
3DISTNAME= ${OPENVPN_DISTNAME} 3DISTNAME= ${OPENVPN_DISTNAME}
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ${OPENVPN_MASTER_SITES} 5MASTER_SITES= ${OPENVPN_MASTER_SITES}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://openvpn.net/ 9HOMEPAGE= http://openvpn.net/
10COMMENT= Easy-to-use SSL VPN daemon 10COMMENT= Easy-to-use SSL VPN daemon
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= aclocal autoconf autom4te grep:run pkg-config 16USE_TOOLS+= grep:run pkg-config
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --disable-debug 18CONFIGURE_ARGS+= --disable-debug
19CONFIGURE_ARGS+= --disable-dependency-tracking 19CONFIGURE_ARGS+= --disable-dependency-tracking
20CONFIGURE_ARGS+= --enable-password-save 
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
22 21
23USE_OLD_DES_API= yes 22USE_OLD_DES_API= yes
24TEST_TARGET= check 23TEST_TARGET= check
25 24
26PKG_SYSCONFSUBDIR= openvpn 25PKG_SYSCONFSUBDIR= openvpn
27DATADIR= ${PREFIX}/share/${PKGBASE} 
28EGDIR= ${PREFIX}/share/examples/${PKGBASE} 26EGDIR= ${PREFIX}/share/examples/${PKGBASE}
29RCD_SCRIPTS= openvpn 27RCD_SCRIPTS= openvpn
30 28
31INSTALLATION_DIRS+= ${EGDIR}/config 29INSTALLATION_DIRS+= ${EGDIR}/config
32INSTALLATION_DIRS+= ${EGDIR}/keys 30INSTALLATION_DIRS+= ${EGDIR}/keys
33INSTALLATION_DIRS+= ${EGDIR}/scripts 31INSTALLATION_DIRS+= ${EGDIR}/scripts
34 32
35SMF_METHODS+= openvpn 33SMF_METHODS= openvpn
36 34
37.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
38 36
39PKG_GROUPS= ${OPENVPN_GROUP} 37PKG_GROUPS= ${OPENVPN_GROUP}
40PKG_USERS= ${OPENVPN_USER}:${OPENVPN_GROUP} 38PKG_USERS= ${OPENVPN_USER}:${OPENVPN_GROUP}
41PKG_GECOS.${OPENVPN_USER}= OpenVPN\ server\ user 39PKG_GECOS.${OPENVPN_USER}=OpenVPN\ server\ user
42 40
43MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR} 41MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
44 42
45post-install: 43post-install:
46 set -e; cd ${WRKSRC}/sample/sample-config-files; for file in *; do \ 44 set -e; cd ${WRKSRC}/sample/sample-config-files; for file in *; do \
47 ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/config; \ 45 ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/config; \
48 done 46 done
49 set -e; cd ${WRKSRC}/sample/sample-scripts; for file in *; do \ 47 set -e; cd ${WRKSRC}/sample/sample-scripts; for file in *; do \
50 ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/scripts; \ 48 ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/scripts; \
51 done 49 done
52 set -e; cd ${WRKSRC}/sample/sample-keys; for file in *; do \ 50 set -e; cd ${WRKSRC}/sample/sample-keys; for file in *; do \
53 ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/keys; \ 51 ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR}/keys; \
54 done 52 done
55 53
56.include "options.mk" 54.include "options.mk"
57.include "../../net/openvpn/Makefile.common" 55.include "../../net/openvpn/Makefile.common"
58 56
59# OpenVPN 2.x has a shared module "plugin" architecture that allows 57# OpenVPN 2.x has a shared module "plugin" architecture that allows
60# inserting callbacks into the server for various tasks. 58# inserting callbacks into the server for various tasks.
61DL_AUTO_VARS= yes 59DL_AUTO_VARS= yes
62.include "../../mk/dlopen.buildlink3.mk" 60.include "../../mk/dlopen.buildlink3.mk"
63 61
64.include "../../mk/bsd.prefs.mk" 
65.if ${OPSYS} == "SunOS" 62.if ${OPSYS} == "SunOS"
66.include "../../net/solaris-tap/buildlink3.mk" 63.include "../../net/solaris-tap/buildlink3.mk"
67.endif 64.endif
 65.include "../../archivers/lz4/buildlink3.mk"
68.include "../../archivers/lzo/buildlink3.mk" 66.include "../../archivers/lzo/buildlink3.mk"
69.include "../../security/openssl/buildlink3.mk" 67.include "../../security/openssl/buildlink3.mk"
70.include "../../mk/pthread.buildlink3.mk" 68.include "../../mk/pthread.buildlink3.mk"
71.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"

cvs diff -r1.7 -r1.8 pkgsrc/net/openvpn/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/openvpn/Makefile.common 2017/05/22 06:25:19 1.7
+++ pkgsrc/net/openvpn/Makefile.common 2017/05/24 20:35:12 1.8
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: Makefile.common,v 1.7 2017/05/22 06:25:19 adam Exp $ 1# $NetBSD: Makefile.common,v 1.8 2017/05/24 20:35:12 adam Exp $
2# used by net/openvpn/Makefile 2# used by net/openvpn/Makefile
3# used by net/openvpn-acct-wtmpx/Makefile 3# used by net/openvpn-acct-wtmpx/Makefile
4# used by net/openvpn-nagios/Makefile 4# used by net/openvpn-nagios/Makefile
5 5
6OPENVPN_DISTNAME= openvpn-2.3.16 6OPENVPN_DISTNAME= openvpn-2.4.2
7OPENVPN_DISTFILE= ${OPENVPN_DISTNAME}.tar.xz 7OPENVPN_DISTFILE= ${OPENVPN_DISTNAME}.tar.xz
8OPENVPN_MASTER_SITES= http://swupdate.openvpn.net/community/releases/ 8OPENVPN_MASTER_SITES= http://swupdate.openvpn.net/community/releases/
9SITES.${OPENVPN_DISTFILE}= ${OPENVPN_MASTER_SITES} 9SITES.${OPENVPN_DISTFILE}= ${OPENVPN_MASTER_SITES}
10 10
11OPENVPN_USER?= openvpn 11OPENVPN_USER?= openvpn
12OPENVPN_GROUP?= openvpn 12OPENVPN_GROUP?= openvpn
13OPENVPN_PLUGINSDIR?= lib/openvpn/plugins 13OPENVPN_PLUGINSDIR?= lib/openvpn/plugins

cvs diff -r1.18 -r1.19 pkgsrc/net/openvpn/PLIST (expand / switch to unified diff)

--- pkgsrc/net/openvpn/PLIST 2014/12/03 10:09:01 1.18
+++ pkgsrc/net/openvpn/PLIST 2017/05/24 20:35:12 1.19
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1@comment $NetBSD: PLIST,v 1.18 2014/12/03 10:09:01 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.19 2017/05/24 20:35:12 adam Exp $
 2include/openvpn-msg.h
2include/openvpn-plugin.h 3include/openvpn-plugin.h
3${PLIST.pam}lib/openvpn/plugins/openvpn-plugin-auth-pam.la 4${PLIST.pam}lib/openvpn/plugins/openvpn-plugin-auth-pam.la
4lib/openvpn/plugins/openvpn-plugin-down-root.la 5lib/openvpn/plugins/openvpn-plugin-down-root.la
5man/man8/openvpn.8 6man/man8/openvpn.8
6sbin/openvpn 7sbin/openvpn
7share/doc/openvpn/COPYING 8share/doc/openvpn/COPYING
8share/doc/openvpn/COPYRIGHT.GPL 9share/doc/openvpn/COPYRIGHT.GPL
 10share/doc/openvpn/Changes.rst
9share/doc/openvpn/README 11share/doc/openvpn/README
10share/doc/openvpn/README.IPv6 12share/doc/openvpn/README.IPv6
11${PLIST.pam}share/doc/openvpn/README.auth-pam 13${PLIST.pam}share/doc/openvpn/README.auth-pam
12share/doc/openvpn/README.down-root 14share/doc/openvpn/README.down-root
13share/doc/openvpn/README.polarssl 15share/doc/openvpn/README.polarssl
14share/doc/openvpn/management-notes.txt 16share/doc/openvpn/management-notes.txt
15share/examples/openvpn/config/README 17share/examples/openvpn/config/README
16share/examples/openvpn/config/client.conf 18share/examples/openvpn/config/client.conf
17share/examples/openvpn/config/firewall.sh 19share/examples/openvpn/config/firewall.sh
18share/examples/openvpn/config/home.up 20share/examples/openvpn/config/home.up
19share/examples/openvpn/config/loopback-client 21share/examples/openvpn/config/loopback-client
20share/examples/openvpn/config/loopback-server 22share/examples/openvpn/config/loopback-server
21share/examples/openvpn/config/office.up 23share/examples/openvpn/config/office.up
@@ -34,18 +36,19 @@ share/examples/openvpn/keys/ca.key @@ -34,18 +36,19 @@ share/examples/openvpn/keys/ca.key
34share/examples/openvpn/keys/client-ec.crt 36share/examples/openvpn/keys/client-ec.crt
35share/examples/openvpn/keys/client-ec.key 37share/examples/openvpn/keys/client-ec.key
36share/examples/openvpn/keys/client-pass.key 38share/examples/openvpn/keys/client-pass.key
37share/examples/openvpn/keys/client.crt 39share/examples/openvpn/keys/client.crt
38share/examples/openvpn/keys/client.key 40share/examples/openvpn/keys/client.key
39share/examples/openvpn/keys/client.p12 41share/examples/openvpn/keys/client.p12
40share/examples/openvpn/keys/dh2048.pem 42share/examples/openvpn/keys/dh2048.pem
41share/examples/openvpn/keys/gen-sample-keys.sh 43share/examples/openvpn/keys/gen-sample-keys.sh
42share/examples/openvpn/keys/openssl.cnf 44share/examples/openvpn/keys/openssl.cnf
43share/examples/openvpn/keys/server-ec.crt 45share/examples/openvpn/keys/server-ec.crt
44share/examples/openvpn/keys/server-ec.key 46share/examples/openvpn/keys/server-ec.key
45share/examples/openvpn/keys/server.crt 47share/examples/openvpn/keys/server.crt
46share/examples/openvpn/keys/server.key 48share/examples/openvpn/keys/server.key
 49share/examples/openvpn/keys/ta.key
47share/examples/openvpn/scripts/auth-pam.pl 50share/examples/openvpn/scripts/auth-pam.pl
48share/examples/openvpn/scripts/bridge-start 51share/examples/openvpn/scripts/bridge-start
49share/examples/openvpn/scripts/bridge-stop 52share/examples/openvpn/scripts/bridge-stop
50share/examples/openvpn/scripts/ucn.pl 53share/examples/openvpn/scripts/ucn.pl
51share/examples/openvpn/scripts/verify-cn 54share/examples/openvpn/scripts/verify-cn

cvs diff -r1.35 -r1.36 pkgsrc/net/openvpn/distinfo (expand / switch to unified diff)

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

cvs diff -r1.8 -r1.9 pkgsrc/net/openvpn-acct-wtmpx/Makefile (expand / switch to unified diff)

--- pkgsrc/net/openvpn-acct-wtmpx/Makefile 2017/05/19 18:11:04 1.8
+++ pkgsrc/net/openvpn-acct-wtmpx/Makefile 2017/05/24 20:35:12 1.9
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: Makefile,v 1.8 2017/05/19 18:11:04 spz Exp $ 1# $NetBSD: Makefile,v 1.9 2017/05/24 20:35:12 adam Exp $
2 2
3.include "../../net/openvpn/Makefile.common" 3.include "../../net/openvpn/Makefile.common"
4 4
5DISTNAME= openvpn-acct-wtmpx-20130210 5DISTNAME= openvpn-acct-wtmpx-20130210
6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE} 6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE}
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/ 8MASTER_SITES= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= manu@NetBSD.org 11MAINTAINER= manu@NetBSD.org
12HOMEPAGE= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/ 12HOMEPAGE= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/
13COMMENT= Log OpenVPN logins and logouts to wtmpx 13COMMENT= Log OpenVPN logins and logouts to wtmpx
14LICENSE= 2-clause-bsd 14LICENSE= 2-clause-bsd
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= install 19USE_TOOLS+= install
20 20
21MAKE_ENV+= OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q} 21MAKE_ENV+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
22MAKE_ENV+= OPENVPN_DISTNAME=${OPENVPN_DISTNAME:Q} 22MAKE_ENV+= OPENVPN_DISTNAME=${OPENVPN_DISTNAME}
23 23
24PLIST_SUBST+= OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR:Q} 24PLIST_SUBST+= OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR}
25MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q} 25MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
26 26
27SPECIAL_PERMS+= bin/logwtmpx ${SETUID_ROOT_PERMS} 27SPECIAL_PERMS+= bin/logwtmpx ${SETUID_ROOT_PERMS}
28 28
 29DEPENDS+= openvpn>=2.4.2:../../net/openvpn
 30
29.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"

cvs diff -r1.12 -r1.13 pkgsrc/net/openvpn-acct-wtmpx/distinfo (expand / switch to unified diff)

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

File Added: pkgsrc/net/openvpn-acct-wtmpx/patches/patch-Makefile
$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

File Deleted: pkgsrc/net/openvpn-acct-wtmpx/patches/Attic/patch-aa

cvs diff -r1.7 -r1.8 pkgsrc/net/openvpn-nagios/Makefile (expand / switch to unified diff)

--- pkgsrc/net/openvpn-nagios/Makefile 2017/05/19 18:11:04 1.7
+++ pkgsrc/net/openvpn-nagios/Makefile 2017/05/24 20:35:12 1.8
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.7 2017/05/19 18:11:04 spz Exp $ 1# $NetBSD: Makefile,v 1.8 2017/05/24 20:35:12 adam Exp $
2 2
3.include "../../net/openvpn/Makefile.common" 3.include "../../net/openvpn/Makefile.common"
4 4
5DISTNAME= openvpn-nagios-20130210 5DISTNAME= openvpn-nagios-20130210
6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE} 6DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE}
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= http://ftp.espci.fr/pub/openvpn-nagios/ 8MASTER_SITES= http://ftp.espci.fr/pub/openvpn-nagios/
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= manu@NetBSD.org 11MAINTAINER= manu@NetBSD.org
12HOMEPAGE= http://ftp.espci.fr/pub/openvpn-nagios/ 12HOMEPAGE= http://ftp.espci.fr/pub/openvpn-nagios/
13COMMENT= OpenVPN certificate checks for Nagios 13COMMENT= OpenVPN certificate checks for Nagios
14LICENSE= 2-clause-bsd 14LICENSE= 2-clause-bsd
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= install 19USE_TOOLS+= install
20 20
21MAKE_ENV+= OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q} 21MAKE_ENV+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
22MAKE_ENV+= OPENVPN_DISTNAME=${OPENVPN_DISTNAME:Q} 22MAKE_ENV+= OPENVPN_DISTNAME=${OPENVPN_DISTNAME}
23 23
24PLIST_SUBST+= OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR:Q} 24PLIST_SUBST+= OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR}
25MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q} 25MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR}
26 26
27DEPENDS+= openvpn>=2.3.0<2.4:../../net/openvpn 27DEPENDS+= openvpn>=2.4.2:../../net/openvpn
28 28
29.include "../../security/openssl/buildlink3.mk" 29.include "../../security/openssl/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"

cvs diff -r1.9 -r1.10 pkgsrc/net/openvpn-nagios/distinfo (expand / switch to unified diff)

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

File Added: pkgsrc/net/openvpn-nagios/patches/patch-Makefile
$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

File Deleted: pkgsrc/net/openvpn-nagios/patches/Attic/patch-aa

cvs diff -r1.1 -r1.2 pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c (expand / switch to unified diff)

--- pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c 2013/03/26 23:32:50 1.1
+++ pkgsrc/net/openvpn-nagios/patches/patch-openvpn-nagios.c 2017/05/24 20:35:12 1.2
@@ -1,19 +1,28 @@ @@ -1,19 +1,28 @@
1$NetBSD: patch-openvpn-nagios.c,v 1.1 2013/03/26 23:32:50 joerg Exp $ 1$NetBSD: patch-openvpn-nagios.c,v 1.2 2017/05/24 20:35:12 adam Exp $
2 2
3--- openvpn-nagios.c.orig 2013-03-25 15:45:11.000000000 +0000 3--- openvpn-nagios.c.orig 2013-02-10 01:33:07.000000000 +0000
4+++ openvpn-nagios.c 4+++ openvpn-nagios.c
5@@ -87,12 +87,11 @@ strmatch(s, match) 5@@ -87,12 +87,11 @@ strmatch(s, match)
6 #endif 6 #endif
7  7
8 static time_t 8 static time_t
9-date_strtots(strdate) 9-date_strtots(strdate)
10- char *strdate; 10- char *strdate;
11+date_strtots(unsigned char *strdate) 11+date_strtots(unsigned char *strdate)
12 { 12 {
13 struct tm tm; 13 struct tm tm;
14  14
15- (void)strptime(strdate, "%y%m%d%H%M%SZ", &tm); 15- (void)strptime(strdate, "%y%m%d%H%M%SZ", &tm);
16+ (void)strptime((char *)strdate, "%y%m%d%H%M%SZ", &tm); 16+ (void)strptime((char *)strdate, "%y%m%d%H%M%SZ", &tm);
17 return mktime(&tm); 17 return mktime(&tm);
18 } 18 }
19  19
 20@@ -112,7 +111,7 @@ openvpn_plugin_open_v3(vers, in, out)
 21 struct ctx *ctx;
 22 pthread_t thread;
 23 int ac = 0;
 24- char **av = __UNCONST(in->argv);
 25+ char **av = (void *)(unsigned long)(const void *)(in->argv);
 26 int i, ch;
 27 time_t now;
 28

File Deleted: pkgsrc/net/openvpn/patches/Attic/patch-ac

File Deleted: pkgsrc/net/openvpn/patches/Attic/patch-ad

File Deleted: pkgsrc/net/openvpn/patches/Attic/patch-ae

File Deleted: pkgsrc/net/openvpn/patches/Attic/patch-af

File Added: pkgsrc/net/openvpn/patches/Attic/patch-configure
$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 \
 

File Deleted: pkgsrc/net/openvpn/patches/Attic/patch-src_openvpn_socket.c

File Deleted: pkgsrc/net/openvpn/patches/Attic/patch-src_openvpn_socket.h