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.diff -r1.61 -r1.62 pkgsrc/net/openvpn/Makefile
(adam)
@@ -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 | |||
3 | DISTNAME= ${OPENVPN_DISTNAME} | 3 | DISTNAME= ${OPENVPN_DISTNAME} | |
4 | CATEGORIES= net | 4 | CATEGORIES= net | |
5 | MASTER_SITES= ${OPENVPN_MASTER_SITES} | 5 | MASTER_SITES= ${OPENVPN_MASTER_SITES} | |
6 | EXTRACT_SUFX= .tar.xz | 6 | EXTRACT_SUFX= .tar.xz | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://openvpn.net/ | 9 | HOMEPAGE= http://openvpn.net/ | |
10 | COMMENT= Easy-to-use SSL VPN daemon | 10 | COMMENT= Easy-to-use SSL VPN daemon | |
11 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
12 | 12 | |||
13 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
14 | 14 | |||
15 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
16 | USE_TOOLS+= aclocal autoconf autom4te grep:run pkg-config | 16 | USE_TOOLS+= grep:run pkg-config | |
17 | GNU_CONFIGURE= yes | 17 | GNU_CONFIGURE= yes | |
18 | CONFIGURE_ARGS+= --disable-debug | 18 | CONFIGURE_ARGS+= --disable-debug | |
19 | CONFIGURE_ARGS+= --disable-dependency-tracking | 19 | CONFIGURE_ARGS+= --disable-dependency-tracking | |
20 | CONFIGURE_ARGS+= --enable-password-save | |||
21 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | 20 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |
22 | 21 | |||
23 | USE_OLD_DES_API= yes | 22 | USE_OLD_DES_API= yes | |
24 | TEST_TARGET= check | 23 | TEST_TARGET= check | |
25 | 24 | |||
26 | PKG_SYSCONFSUBDIR= openvpn | 25 | PKG_SYSCONFSUBDIR= openvpn | |
27 | DATADIR= ${PREFIX}/share/${PKGBASE} | |||
28 | EGDIR= ${PREFIX}/share/examples/${PKGBASE} | 26 | EGDIR= ${PREFIX}/share/examples/${PKGBASE} | |
29 | RCD_SCRIPTS= openvpn | 27 | RCD_SCRIPTS= openvpn | |
30 | 28 | |||
31 | INSTALLATION_DIRS+= ${EGDIR}/config | 29 | INSTALLATION_DIRS+= ${EGDIR}/config | |
32 | INSTALLATION_DIRS+= ${EGDIR}/keys | 30 | INSTALLATION_DIRS+= ${EGDIR}/keys | |
33 | INSTALLATION_DIRS+= ${EGDIR}/scripts | 31 | INSTALLATION_DIRS+= ${EGDIR}/scripts | |
34 | 32 | |||
35 | SMF_METHODS+= openvpn | 33 | SMF_METHODS= openvpn | |
36 | 34 | |||
37 | .include "../../mk/bsd.prefs.mk" | 35 | .include "../../mk/bsd.prefs.mk" | |
38 | 36 | |||
39 | PKG_GROUPS= ${OPENVPN_GROUP} | 37 | PKG_GROUPS= ${OPENVPN_GROUP} | |
40 | PKG_USERS= ${OPENVPN_USER}:${OPENVPN_GROUP} | 38 | PKG_USERS= ${OPENVPN_USER}:${OPENVPN_GROUP} | |
41 | PKG_GECOS.${OPENVPN_USER}= OpenVPN\ server\ user | 39 | PKG_GECOS.${OPENVPN_USER}=OpenVPN\ server\ user | |
42 | 40 | |||
43 | MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR} | 41 | MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR} | |
44 | 42 | |||
45 | post-install: | 43 | post-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. | |
61 | DL_AUTO_VARS= yes | 59 | DL_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" |
@@ -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 | |||
6 | OPENVPN_DISTNAME= openvpn-2.3.16 | 6 | OPENVPN_DISTNAME= openvpn-2.4.2 | |
7 | OPENVPN_DISTFILE= ${OPENVPN_DISTNAME}.tar.xz | 7 | OPENVPN_DISTFILE= ${OPENVPN_DISTNAME}.tar.xz | |
8 | OPENVPN_MASTER_SITES= http://swupdate.openvpn.net/community/releases/ | 8 | OPENVPN_MASTER_SITES= http://swupdate.openvpn.net/community/releases/ | |
9 | SITES.${OPENVPN_DISTFILE}= ${OPENVPN_MASTER_SITES} | 9 | SITES.${OPENVPN_DISTFILE}= ${OPENVPN_MASTER_SITES} | |
10 | 10 | |||
11 | OPENVPN_USER?= openvpn | 11 | OPENVPN_USER?= openvpn | |
12 | OPENVPN_GROUP?= openvpn | 12 | OPENVPN_GROUP?= openvpn | |
13 | OPENVPN_PLUGINSDIR?= lib/openvpn/plugins | 13 | OPENVPN_PLUGINSDIR?= lib/openvpn/plugins |
@@ -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 $ | |
2 | include/openvpn-msg.h | |||
2 | include/openvpn-plugin.h | 3 | include/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 | |
4 | lib/openvpn/plugins/openvpn-plugin-down-root.la | 5 | lib/openvpn/plugins/openvpn-plugin-down-root.la | |
5 | man/man8/openvpn.8 | 6 | man/man8/openvpn.8 | |
6 | sbin/openvpn | 7 | sbin/openvpn | |
7 | share/doc/openvpn/COPYING | 8 | share/doc/openvpn/COPYING | |
8 | share/doc/openvpn/COPYRIGHT.GPL | 9 | share/doc/openvpn/COPYRIGHT.GPL | |
10 | share/doc/openvpn/Changes.rst | |||
9 | share/doc/openvpn/README | 11 | share/doc/openvpn/README | |
10 | share/doc/openvpn/README.IPv6 | 12 | share/doc/openvpn/README.IPv6 | |
11 | ${PLIST.pam}share/doc/openvpn/README.auth-pam | 13 | ${PLIST.pam}share/doc/openvpn/README.auth-pam | |
12 | share/doc/openvpn/README.down-root | 14 | share/doc/openvpn/README.down-root | |
13 | share/doc/openvpn/README.polarssl | 15 | share/doc/openvpn/README.polarssl | |
14 | share/doc/openvpn/management-notes.txt | 16 | share/doc/openvpn/management-notes.txt | |
15 | share/examples/openvpn/config/README | 17 | share/examples/openvpn/config/README | |
16 | share/examples/openvpn/config/client.conf | 18 | share/examples/openvpn/config/client.conf | |
17 | share/examples/openvpn/config/firewall.sh | 19 | share/examples/openvpn/config/firewall.sh | |
18 | share/examples/openvpn/config/home.up | 20 | share/examples/openvpn/config/home.up | |
19 | share/examples/openvpn/config/loopback-client | 21 | share/examples/openvpn/config/loopback-client | |
20 | share/examples/openvpn/config/loopback-server | 22 | share/examples/openvpn/config/loopback-server | |
21 | share/examples/openvpn/config/office.up | 23 | share/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 | |||
34 | share/examples/openvpn/keys/client-ec.crt | 36 | share/examples/openvpn/keys/client-ec.crt | |
35 | share/examples/openvpn/keys/client-ec.key | 37 | share/examples/openvpn/keys/client-ec.key | |
36 | share/examples/openvpn/keys/client-pass.key | 38 | share/examples/openvpn/keys/client-pass.key | |
37 | share/examples/openvpn/keys/client.crt | 39 | share/examples/openvpn/keys/client.crt | |
38 | share/examples/openvpn/keys/client.key | 40 | share/examples/openvpn/keys/client.key | |
39 | share/examples/openvpn/keys/client.p12 | 41 | share/examples/openvpn/keys/client.p12 | |
40 | share/examples/openvpn/keys/dh2048.pem | 42 | share/examples/openvpn/keys/dh2048.pem | |
41 | share/examples/openvpn/keys/gen-sample-keys.sh | 43 | share/examples/openvpn/keys/gen-sample-keys.sh | |
42 | share/examples/openvpn/keys/openssl.cnf | 44 | share/examples/openvpn/keys/openssl.cnf | |
43 | share/examples/openvpn/keys/server-ec.crt | 45 | share/examples/openvpn/keys/server-ec.crt | |
44 | share/examples/openvpn/keys/server-ec.key | 46 | share/examples/openvpn/keys/server-ec.key | |
45 | share/examples/openvpn/keys/server.crt | 47 | share/examples/openvpn/keys/server.crt | |
46 | share/examples/openvpn/keys/server.key | 48 | share/examples/openvpn/keys/server.key | |
49 | share/examples/openvpn/keys/ta.key | |||
47 | share/examples/openvpn/scripts/auth-pam.pl | 50 | share/examples/openvpn/scripts/auth-pam.pl | |
48 | share/examples/openvpn/scripts/bridge-start | 51 | share/examples/openvpn/scripts/bridge-start | |
49 | share/examples/openvpn/scripts/bridge-stop | 52 | share/examples/openvpn/scripts/bridge-stop | |
50 | share/examples/openvpn/scripts/ucn.pl | 53 | share/examples/openvpn/scripts/ucn.pl | |
51 | share/examples/openvpn/scripts/verify-cn | 54 | share/examples/openvpn/scripts/verify-cn |
@@ -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 | |||
3 | SHA1 (openvpn-2.3.16.tar.xz) = 2dcd98bb9f994daf9f2fbad40f4be1a05b2f5955 | 3 | SHA1 (openvpn-2.4.2.tar.xz) = 64395346fa6c7f52a350073acf6acfe5c0658bc8 | |
4 | RMD160 (openvpn-2.3.16.tar.xz) = e09871e30e1d08228ef955c6026e100d7dc30c2f | 4 | RMD160 (openvpn-2.4.2.tar.xz) = a87b04e515434f03be49a9c9ae501e6d3267dc36 | |
5 | SHA512 (openvpn-2.3.16.tar.xz) = 9afd91f60506239a158e3cd181ca0e1a541441575d1a76cbdbaba5e6357aabe195ab26fa83b0d5c33511e6d356964af31e5ac954f3561bff9448be086531038f | 5 | SHA512 (openvpn-2.4.2.tar.xz) = 438f16ac2d12dfd9f11ebcddebf709102046c71b4c4608a294da552587ea346d6ebb8c916f717bce992057754d6bc35ca1df5653fc907cc0003d9e34c92da963 | |
6 | Size (openvpn-2.3.16.tar.xz) = 831428 bytes | 6 | Size (openvpn-2.4.2.tar.xz) = 918448 bytes | |
7 | SHA1 (patch-ac) = 3071423ae978dd7d1d79cb140325bde96ba8d21b | 7 | SHA1 (patch-configure) = 240342a88baed7642dfd63ed0a2ab4c0a75adbd4 | |
8 | SHA1 (patch-ad) = 1e2c34a37157ff9c091e0120817a8c8bae9aef4e | |||
9 | SHA1 (patch-ae) = fce5d2b7c8ef830cba3df4408af79301f347cafd | |||
10 | SHA1 (patch-af) = 8d728c36a6eccdebf6c7e5a02d457903b255f4fb | |||
11 | SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143 | 8 | SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143 | |
12 | SHA1 (patch-src_openvpn_socket.c) = d091fdf614c7673755b9f1fdbdd11ce33276cfda | |||
13 | SHA1 (patch-src_openvpn_socket.h) = b4b952af347e0f2d0aff307a5025b3d27a2e6ee5 |
@@ -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 | |||
5 | DISTNAME= openvpn-acct-wtmpx-20130210 | 5 | DISTNAME= openvpn-acct-wtmpx-20130210 | |
6 | DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE} | 6 | DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE} | |
7 | CATEGORIES= net | 7 | CATEGORIES= net | |
8 | MASTER_SITES= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/ | 8 | MASTER_SITES= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/ | |
9 | EXTRACT_SUFX= .tgz | 9 | EXTRACT_SUFX= .tgz | |
10 | 10 | |||
11 | MAINTAINER= manu@NetBSD.org | 11 | MAINTAINER= manu@NetBSD.org | |
12 | HOMEPAGE= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/ | 12 | HOMEPAGE= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/ | |
13 | COMMENT= Log OpenVPN logins and logouts to wtmpx | 13 | COMMENT= Log OpenVPN logins and logouts to wtmpx | |
14 | LICENSE= 2-clause-bsd | 14 | LICENSE= 2-clause-bsd | |
15 | 15 | |||
16 | PKG_DESTDIR_SUPPORT= user-destdir | 16 | PKG_DESTDIR_SUPPORT= user-destdir | |
17 | 17 | |||
18 | USE_LIBTOOL= yes | 18 | USE_LIBTOOL= yes | |
19 | USE_TOOLS+= install | 19 | USE_TOOLS+= install | |
20 | 20 | |||
21 | MAKE_ENV+= OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q} | 21 | MAKE_ENV+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR} | |
22 | MAKE_ENV+= OPENVPN_DISTNAME=${OPENVPN_DISTNAME:Q} | 22 | MAKE_ENV+= OPENVPN_DISTNAME=${OPENVPN_DISTNAME} | |
23 | 23 | |||
24 | PLIST_SUBST+= OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR:Q} | 24 | PLIST_SUBST+= OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR} | |
25 | MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q} | 25 | MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR} | |
26 | 26 | |||
27 | SPECIAL_PERMS+= bin/logwtmpx ${SETUID_ROOT_PERMS} | 27 | SPECIAL_PERMS+= bin/logwtmpx ${SETUID_ROOT_PERMS} | |
28 | 28 | |||
29 | DEPENDS+= openvpn>=2.4.2:../../net/openvpn | |||
30 | ||||
29 | .include "../../mk/bsd.pkg.mk" | 31 | .include "../../mk/bsd.pkg.mk" |
@@ -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 | |||
3 | SHA1 (openvpn-2.3.16.tar.xz) = 2dcd98bb9f994daf9f2fbad40f4be1a05b2f5955 | 3 | SHA1 (openvpn-2.4.2.tar.xz) = 64395346fa6c7f52a350073acf6acfe5c0658bc8 | |
4 | RMD160 (openvpn-2.3.16.tar.xz) = e09871e30e1d08228ef955c6026e100d7dc30c2f | 4 | RMD160 (openvpn-2.4.2.tar.xz) = a87b04e515434f03be49a9c9ae501e6d3267dc36 | |
5 | SHA512 (openvpn-2.3.16.tar.xz) = 9afd91f60506239a158e3cd181ca0e1a541441575d1a76cbdbaba5e6357aabe195ab26fa83b0d5c33511e6d356964af31e5ac954f3561bff9448be086531038f | 5 | SHA512 (openvpn-2.4.2.tar.xz) = 438f16ac2d12dfd9f11ebcddebf709102046c71b4c4608a294da552587ea346d6ebb8c916f717bce992057754d6bc35ca1df5653fc907cc0003d9e34c92da963 | |
6 | Size (openvpn-2.3.16.tar.xz) = 831428 bytes | 6 | Size (openvpn-2.4.2.tar.xz) = 918448 bytes | |
7 | SHA1 (openvpn-acct-wtmpx-20130210.tgz) = cf7bc26b12a65493cdf5db93b03bbb938a2f0f33 | 7 | SHA1 (openvpn-acct-wtmpx-20130210.tgz) = cf7bc26b12a65493cdf5db93b03bbb938a2f0f33 | |
8 | RMD160 (openvpn-acct-wtmpx-20130210.tgz) = d9000789f04606bfa17db1597a45a4235b1119ea | 8 | RMD160 (openvpn-acct-wtmpx-20130210.tgz) = d9000789f04606bfa17db1597a45a4235b1119ea | |
9 | SHA512 (openvpn-acct-wtmpx-20130210.tgz) = 7b8fd4929e65d8d84158f62e5a17ff3adb3b4a6cff63b29038acfb368750719f2f593786ed9b02402824c19d872b188d2a46740a5c5f853e8873a71481b13aaf | 9 | SHA512 (openvpn-acct-wtmpx-20130210.tgz) = 7b8fd4929e65d8d84158f62e5a17ff3adb3b4a6cff63b29038acfb368750719f2f593786ed9b02402824c19d872b188d2a46740a5c5f853e8873a71481b13aaf | |
10 | Size (openvpn-acct-wtmpx-20130210.tgz) = 2778 bytes | 10 | Size (openvpn-acct-wtmpx-20130210.tgz) = 2778 bytes | |
11 | SHA1 (patch-aa) = 95d9382b74d791306766433506eb0228a806dbdc | 11 | SHA1 (patch-Makefile) = 4ed829df8d43a6e6b9b0242c749630079a41f5e4 |
$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
@@ -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 | |||
5 | DISTNAME= openvpn-nagios-20130210 | 5 | DISTNAME= openvpn-nagios-20130210 | |
6 | DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE} | 6 | DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE} | |
7 | CATEGORIES= net | 7 | CATEGORIES= net | |
8 | MASTER_SITES= http://ftp.espci.fr/pub/openvpn-nagios/ | 8 | MASTER_SITES= http://ftp.espci.fr/pub/openvpn-nagios/ | |
9 | EXTRACT_SUFX= .tgz | 9 | EXTRACT_SUFX= .tgz | |
10 | 10 | |||
11 | MAINTAINER= manu@NetBSD.org | 11 | MAINTAINER= manu@NetBSD.org | |
12 | HOMEPAGE= http://ftp.espci.fr/pub/openvpn-nagios/ | 12 | HOMEPAGE= http://ftp.espci.fr/pub/openvpn-nagios/ | |
13 | COMMENT= OpenVPN certificate checks for Nagios | 13 | COMMENT= OpenVPN certificate checks for Nagios | |
14 | LICENSE= 2-clause-bsd | 14 | LICENSE= 2-clause-bsd | |
15 | 15 | |||
16 | PKG_DESTDIR_SUPPORT= user-destdir | 16 | PKG_DESTDIR_SUPPORT= user-destdir | |
17 | 17 | |||
18 | USE_LIBTOOL= yes | 18 | USE_LIBTOOL= yes | |
19 | USE_TOOLS+= install | 19 | USE_TOOLS+= install | |
20 | 20 | |||
21 | MAKE_ENV+= OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q} | 21 | MAKE_ENV+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR} | |
22 | MAKE_ENV+= OPENVPN_DISTNAME=${OPENVPN_DISTNAME:Q} | 22 | MAKE_ENV+= OPENVPN_DISTNAME=${OPENVPN_DISTNAME} | |
23 | 23 | |||
24 | PLIST_SUBST+= OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR:Q} | 24 | PLIST_SUBST+= OPENVPN_PLUGINSDIR=${OPENVPN_PLUGINSDIR} | |
25 | MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX:Q}/${OPENVPN_PLUGINSDIR:Q} | 25 | MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR} | |
26 | 26 | |||
27 | DEPENDS+= openvpn>=2.3.0<2.4:../../net/openvpn | 27 | DEPENDS+= 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" |
@@ -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 | |||
3 | SHA1 (openvpn-2.3.16.tar.xz) = 2dcd98bb9f994daf9f2fbad40f4be1a05b2f5955 | 3 | SHA1 (openvpn-2.4.2.tar.xz) = 64395346fa6c7f52a350073acf6acfe5c0658bc8 | |
4 | RMD160 (openvpn-2.3.16.tar.xz) = e09871e30e1d08228ef955c6026e100d7dc30c2f | 4 | RMD160 (openvpn-2.4.2.tar.xz) = a87b04e515434f03be49a9c9ae501e6d3267dc36 | |
5 | SHA512 (openvpn-2.3.16.tar.xz) = 9afd91f60506239a158e3cd181ca0e1a541441575d1a76cbdbaba5e6357aabe195ab26fa83b0d5c33511e6d356964af31e5ac954f3561bff9448be086531038f | 5 | SHA512 (openvpn-2.4.2.tar.xz) = 438f16ac2d12dfd9f11ebcddebf709102046c71b4c4608a294da552587ea346d6ebb8c916f717bce992057754d6bc35ca1df5653fc907cc0003d9e34c92da963 | |
6 | Size (openvpn-2.3.16.tar.xz) = 831428 bytes | 6 | Size (openvpn-2.4.2.tar.xz) = 918448 bytes | |
7 | SHA1 (openvpn-nagios-20130210.tgz) = 8a0fd4e3eba27584aa53c5589c13d4b38af43ba2 | 7 | SHA1 (openvpn-nagios-20130210.tgz) = 8a0fd4e3eba27584aa53c5589c13d4b38af43ba2 | |
8 | RMD160 (openvpn-nagios-20130210.tgz) = 2a47893ec2db2c280adc7b9fbbea97794ec1a6f4 | 8 | RMD160 (openvpn-nagios-20130210.tgz) = 2a47893ec2db2c280adc7b9fbbea97794ec1a6f4 | |
9 | SHA512 (openvpn-nagios-20130210.tgz) = 80e565f32379c39eb6c7f3b4744af221ae882ff07dce9dae5bd7feb73b0edcfc7c7ac7f70d23fdcd4f492b66f095f09833deb122449840b36ea606ce91900358 | 9 | SHA512 (openvpn-nagios-20130210.tgz) = 80e565f32379c39eb6c7f3b4744af221ae882ff07dce9dae5bd7feb73b0edcfc7c7ac7f70d23fdcd4f492b66f095f09833deb122449840b36ea606ce91900358 | |
10 | Size (openvpn-nagios-20130210.tgz) = 3034 bytes | 10 | Size (openvpn-nagios-20130210.tgz) = 3034 bytes | |
11 | SHA1 (patch-aa) = fe38ed54931c34903a1b25f387d59dc1b5e042f6 | 11 | SHA1 (patch-Makefile) = accc6a2a49530a504897451f2a2f45c528b7b131 | |
12 | SHA1 (patch-openvpn-nagios.c) = e1700e4f648eaca87fdcedc9d9490c9badd6c33b | 12 | SHA1 (patch-openvpn-nagios.c) = 36e9ee6e652051b3b047710666998052bef637db |
$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
@@ -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 |
$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 \