pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net OpenVPN 2.4.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/f3bc6a2e98fc
branches: trunk
changeset: 362771:f3bc6a2e98fc
user: adam <adam%pkgsrc.org@localhost>
date: Wed May 24 20:35:12 2017 +0000
description:
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.
diffstat:
net/openvpn-acct-wtmpx/Makefile | 12 +-
net/openvpn-acct-wtmpx/distinfo | 12 +-
net/openvpn-acct-wtmpx/patches/patch-Makefile | 40 ++++++++
net/openvpn-acct-wtmpx/patches/patch-aa | 40 --------
net/openvpn-nagios/Makefile | 12 +-
net/openvpn-nagios/distinfo | 14 +-
net/openvpn-nagios/patches/patch-Makefile | 29 ++++++
net/openvpn-nagios/patches/patch-aa | 27 -----
net/openvpn-nagios/patches/patch-openvpn-nagios.c | 13 ++-
net/openvpn/Makefile | 12 +-
net/openvpn/Makefile.common | 4 +-
net/openvpn/PLIST | 5 +-
net/openvpn/distinfo | 17 +--
net/openvpn/patches/patch-ac | 64 -------------
net/openvpn/patches/patch-ad | 26 -----
net/openvpn/patches/patch-ae | 37 -------
net/openvpn/patches/patch-af | 104 ----------------------
net/openvpn/patches/patch-configure | 14 ++
net/openvpn/patches/patch-src_openvpn_socket.c | 42 --------
net/openvpn/patches/patch-src_openvpn_socket.h | 24 -----
20 files changed, 137 insertions(+), 411 deletions(-)
diffs (truncated from 737 to 300 lines):
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn-acct-wtmpx/Makefile
--- a/net/openvpn-acct-wtmpx/Makefile Wed May 24 20:09:26 2017 +0000
+++ b/net/openvpn-acct-wtmpx/Makefile Wed May 24 20:35:12 2017 +0000
@@ -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 @@
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"
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn-acct-wtmpx/distinfo
--- a/net/openvpn-acct-wtmpx/distinfo Wed May 24 20:09:26 2017 +0000
+++ b/net/openvpn-acct-wtmpx/distinfo Wed May 24 20:35:12 2017 +0000
@@ -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
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn-acct-wtmpx/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/openvpn-acct-wtmpx/patches/patch-Makefile Wed May 24 20:35:12 2017 +0000
@@ -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
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn-acct-wtmpx/patches/patch-aa
--- a/net/openvpn-acct-wtmpx/patches/patch-aa Wed May 24 20:09:26 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2013/03/26 23:31:49 joerg 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 -ansi -g -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
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn-nagios/Makefile
--- a/net/openvpn-nagios/Makefile Wed May 24 20:09:26 2017 +0000
+++ b/net/openvpn-nagios/Makefile Wed May 24 20:35:12 2017 +0000
@@ -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 @@
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"
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn-nagios/distinfo
--- a/net/openvpn-nagios/distinfo Wed May 24 20:09:26 2017 +0000
+++ b/net/openvpn-nagios/distinfo Wed May 24 20:35:12 2017 +0000
@@ -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
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn-nagios/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/openvpn-nagios/patches/patch-Makefile Wed May 24 20:35:12 2017 +0000
@@ -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
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn-nagios/patches/patch-aa
--- a/net/openvpn-nagios/patches/patch-aa Wed May 24 20:09:26 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2013/03/26 23:32:50 joerg Exp $
-
---- Makefile.orig 2013-02-09 05:44:43.000000000 +0000
-+++ Makefile
-@@ -1,8 +1,8 @@
--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
-+OPENVPN_SRC=../${OPENVPN_DISTNAME}
- CFLAGS= -Wall -Werror -ansi -g -I$(OPENVPN_SRC)/include -DBINDIR=\"$(bindir)\"
- OPENVPN_GROUP=nobody
-
-@@ -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
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn-nagios/patches/patch-openvpn-nagios.c
--- a/net/openvpn-nagios/patches/patch-openvpn-nagios.c Wed May 24 20:09:26 2017 +0000
+++ b/net/openvpn-nagios/patches/patch-openvpn-nagios.c Wed May 24 20:35:12 2017 +0000
@@ -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 @@
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;
+
diff -r 0ffb020d069d -r f3bc6a2e98fc net/openvpn/Makefile
--- a/net/openvpn/Makefile Wed May 24 20:09:26 2017 +0000
+++ b/net/openvpn/Makefile Wed May 24 20:35:12 2017 +0000
@@ -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 @@
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
Home |
Main Index |
Thread Index |
Old Index