Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1605615181280750"
MIME-Version: 1.0
Date: Tue, 17 Nov 2020 12:13:01 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/net/openvpn
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20201117121301.A6E77FA9D@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1605615181280750
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Tue Nov 17 12:13:01 UTC 2020

Modified Files:
	pkgsrc/net/openvpn: Makefile Makefile.common PLIST distinfo
	pkgsrc/net/openvpn/patches: patch-configure

Log Message:
openvpn: updated to 2.5.0

Overview of changes in 2.5
==========================

New features
------------
Client-specific tls-crypt keys (``--tls-crypt-v2``)
    ``tls-crypt-v2`` adds the ability to supply each client with a unique
    tls-crypt key.  This allows large organisations and VPN providers to profit
    from the same DoS and TLS stack protection that small deployments can
    already achieve using ``tls-auth`` or ``tls-crypt``.

ChaCha20-Poly1305 cipher support
    Added support for using the ChaCha20-Poly1305 cipher in the OpenVPN data
    channel.

Improved Data channel cipher negotiation
    The option ``ncp-ciphers`` has been renamed to ``data-ciphers``.
    The old name is still accepted. The change in name signals that
    ``data-ciphers`` is the preferred way to configure data channel
    ciphers and the data prefix is chosen to avoid the ambiguity that
    exists with ``--cipher`` for the data cipher and ``tls-cipher``
    for the TLS ciphers.

    OpenVPN clients will now signal all supported ciphers from the
    ``data-ciphers`` option to the server via ``IV_CIPHERS``. OpenVPN
    servers will select the first common cipher from the ``data-ciphers``
    list instead of blindly pushing the first cipher of the list. This
    allows to use a configuration like
    ``data-ciphers ChaCha20-Poly1305:AES-256-GCM`` on the server that
    prefers ChaCha20-Poly1305 but uses it only if the client supports it.

    See the data channel negotiation section in the manual for more details.

Removal of BF-CBC support in default configuration:
    By default OpenVPN 2.5 will only accept AES-256-GCM and AES-128-GCM as
    data ciphers. OpenVPN 2.4 allows AES-256-GCM,AES-128-GCM and BF-CBC when
    no --cipher and --ncp-ciphers options are present. Accepting BF-CBC can be
    enabled by adding

        data-ciphers AES-256-GCM:AES-128-GCM:BF-CBC

    and when you need to support very old peers also

        data-ciphers-fallback BF-CBC

    To offer backwards compatibility with older configs an *explicit*

        cipher BF-CBC

    in the configuration will be automatically translated into adding BF-CBC
    to the data-ciphers option and setting data-ciphers-fallback to BF-CBC
    (as in the example commands above). We strongly recommend to switching
    away from BF-CBC to a more secure cipher.

Asynchronous (deferred) authentication support for auth-pam plugin.
    See src/plugins/auth-pam/README.auth-pam for details.

Deferred client-connect
    The ``--client-connect`` option and the connect plugin API allow
    asynchronous/deferred return of the configuration file in the same way
    as the auth-plugin.

Faster connection setup
    A client will signal in the ``IV_PROTO`` variable that it is in pull
    mode. This allows the server to push the configuration options to
    the client without waiting for a ``PULL_REQUEST`` message. The feature
    is automatically enabled if both client and server support it and
    significantly reduces the connection setup time by avoiding one
    extra packet round-trip and 1s of internal event delays.

Netlink support
    On Linux, if configured without ``--enable-iproute2``, configuring IP
    addresses and adding/removing routes is now done via the netlink(3)
    kernel interface.  This is much faster than calling ``ifconfig`` or
    ``route`` and also enables OpenVPN to run with less privileges.

    If configured with --enable-iproute2, the ``ip`` command is used
    (as in 2.4).  Support for ``ifconfig`` and ``route`` is gone.

Wintun support
    On Windows, OpenVPN can now use ``wintun`` devices.  They are faster
    than the traditional ``tap9`` tun/tap devices, but do not provide
    ``--dev tap`` mode - so the official installers contain both.  To use
    a wintun device, add ``--windows-driver wintun`` to your config
    (and use of the interactive service is required as wintun needs
    SYSTEM privileges to enable access).

IPv6-only operation
    It is now possible to have only IPv6 addresses inside the VPN tunnel,
    and IPv6-only address pools (2.4 always required IPv4 config/pools
    and IPv6 was the "optional extra").

Improved Windows 10 detection
    Correctly log OS on Windows 10 now.

Linux VRF support
    Using the new ``--bind-dev`` option, the OpenVPN outside socket can
    now be put into a Linux VRF.  See the "Virtual Routing and Forwarding"
    documentation in the man page.

TLS 1.3 support
    TLS 1.3 support has been added to OpenVPN.  Currently, this requires
    OpenSSL 1.1.1+.
    The options ``--tls-ciphersuites`` and ``--tls-groups`` have been
    added to fine tune TLS protocol options.  Most of the improvements
    were also backported to OpenVPN 2.4 as part of the maintainance
    releases.

Support setting DHCP search domain
    A new option ``--dhcp-option DOMAIN-SEARCH my.example.com`` has been
    defined, and Windows support for it is implemented (tun/tap only, no
    wintun support yet).  Other platforms need to support this via ``--up``
    script (Linux) or GUI (OSX/Tunnelblick).

per-client changing of ``--data-ciphers`` or ``data-ciphers-fallback``
    from client-connect script/dir (NOTE: this only changes preference of
    ciphers for NCP, but can not override what the client announces as
    "willing to accept")

Handle setting of tun/tap interface MTU on Windows
    If IPv6 is in use, MTU must be >= 1280 (Windows enforces IETF requirements)

Add support for OpenSSL engines to access private key material (like TPM).

HMAC based auth-token support
    The ``--auth-gen-token`` support has been improved and now generates HMAC
    based user token. If the optional ``--auth-gen-token-secret`` option is
    used clients will be able to seamlessly reconnect to a different server
    using the same secret file or to the same server after a server restart.

Improved support for pending authentication
    The protocol has been enhanced to be able to signal that
    the authentication should use a secondary authentication
    via web (like SAML) or a two factor authentication without
    disconnecting the OpenVPN session with AUTH_FAILED. The
    session will instead be stay in a authenticated state and
    wait for the second factor authentication to complete.

    This feature currently requires usage of the managent interface
    on both client and server side. See the `management-notes.txt`
    ``client-pending-auth`` and ``cr-response`` commands for more
    details.

VLAN support
    OpenVPN servers in TAP mode can now use 802.1q tagged VLANs
    on the TAP interface to separate clients into different groups
    that can then be handled differently (different subnets / DHCP,
    firewall zones, ...) further down the network.  See the new
    options ``--vlan-tagging``, ``--vlan-accept``, ``--vlan-pvid``.

    802.1q tagging on the client side TAP interface is not handled
    today (= tags are just forwarded transparently to the server).

Support building of .msi installers for Windows

Allow unicode search string in ``--cryptoapicert`` option (Windows)

Support IPv4 configs with /31 netmasks now
    (By no longer trying to configure ``broadcast x.x.x.x'' in
    ifconfig calls, /31 support "just works")

New option ``--block-ipv6`` to reject all IPv6 packets (ICMPv6)
    this is useful if the VPN service has no IPv6, but the clients
    might have (LAN), to avoid client connections to IPv6-enabled
    servers leaking "around" the IPv4-only VPN.

``--ifconfig-ipv6`` and ``--ifconfig-ipv6-push`` will now accept
    hostnames and do a DNS lookup to get the IPv6 address to use

Deprecated features
-------------------
For an up-to-date list of all deprecated options, see this wiki page:
https://community.openvpn.net/openvpn/wiki/DeprecatedOptions

- ``ncp-disable`` has been deprecated
    With the improved and matured data channel cipher negotiation, the use
    of ``ncp-disable`` should not be necessary anymore.

- ``inetd`` has been deprecated
  This is a very limited and not-well-tested way to run OpenVPN, on TCP
  and TAP mode only, which complicates the code quite a bit for little gain.
  To be removed in OpenVPN 2.6 (unless users protest).

- ``no-iv`` has been removed
  This option was made into a NOOP option with OpenVPN 2.4.  This has now
  been completely removed.

- ``--client-cert-not-required`` has been removed
  This option will now cause server configurations to not start.  Use
  ``--verify-client-cert none`` instead.

- ``--ifconfig-pool-linear`` has been removed
  This option is removed.  Use ``--topology p2p`` or ``--topology subnet``
  instead.

- ``--compress xxx`` is considered risky and is warned against, see below.

- ``--key-method 1`` has been removed

User-visible Changes
--------------------
- If multiple connect handlers are used (client-connect, ccd, connect
  plugin) and one of the handler succeeds but a subsequent fails, the
  client-disconnect-script is now called immediately. Previously it
  was called, when the VPN session was terminated.

- Support for building with OpenSSL 1.0.1 has been removed. The minimum
  supported OpenSSL version is now 1.0.2.

- The GET_CONFIG management state is omitted if the server pushes
  the client configuration almost immediately as result of the
  faster connection setup feature.

- ``--compress`` is nowadays considered risky, because attacks exist
  leveraging compression-inside-crypto to reveal plaintext (VORACLE).  So
  by default, ``--compress xxx`` will now accept incoming compressed
  packets (for compatibility with peers that have not been upgraded yet),
  but will not use compression outgoing packets.  This can be controlled with
  the new option ``--allow-compression yes|no|asym``.

- Stop changing ``--txlen`` aways from OS defaults unless explicitly specified
  in config file.  OS defaults nowadays are actually larger then what we used
  to configure, so our defaults sometimes caused packet drops = bad performance.

- remove ``--writepid`` pid file on exit now

- plugin-auth-pam now logs via OpenVPN logging method, no longer to stderr
  (this means you'll have log messages in syslog or openvpn log file now)

- use ISO 8601 time format for file based logging now (YYYY-MM-DD hh:mm:dd)
  (syslog is not affected, nor is ``--machine-readable-output``)

- ``--clr-verify`` now loads all CRLs if more than one CRL is in the same
  file (OpenSSL backend only, mbedTLS always did that)

- when ``--auth-user-pass file`` has no password, and the management interface
  is active, query management interface (instead of trying console query,
  which does not work on windows)

- skip expired certificates in Windows certificate store (``--cryptoapicert``)

- ``--socks-proxy`` + ``--proto udp*`` will now allways use IPv4, even if
  IPv6 is requested and available.  Our SOCKS code does not handle IPv6+UDP,
  and before that change it would just fail in non-obvious ways.

- TCP listen() backlog queue is now set to 32 - this helps TCP servers that
  receive lots of "invalid" connects by TCP port scanners

- do no longer print OCC warnings ("option mismatch") about ``key-method``,
  ``keydir``, ``tls-auth`` and ``cipher`` - these are either gone now, or
  negotiated, and the warnings do not serve a useful purpose.

- ``dhcp-option DNS`` and ``dhcp-option DNS6`` are now treated identically
  (= both accept an IPv4 or IPv6 address for the nameserver)

Maintainer-visible changes
--------------------------
- the man page is now in maintained in .rst format, so building the openvpn.8
  manpage from a git checkout now requires python-docutils (if this is missing,
  the manpage will not be built - which is not considered an error generally,
  but for package builders or ``make distcheck`` it is).  Release tarballs
  contain the openvpn.8 file, so unless some .rst is changed, doc-utils are
  not needed for building.

- OCC support can no longer be disabled

- AEAD support is now required in the crypto library

- ``--disable-server`` has been removed from configure (so it is no longer
  possible to build a client-/p2p-only OpenVPN binary) - the saving in code
  size no longer outweighs the extra maintenance effort.

- ``--enable-iproute2`` will disable netlink(3) support, so maybe remove
  that from package building configs (see above)

- support building with MSVC 2019

- cmocka based unit tests are now only run if cmocka is installed externally
  (2.4 used to ship a local git submodule which was painful to maintain)

- ``--disable-crypto`` configure option has been removed.  OpenVPN is now always
  built with crypto support, which makes the code much easier to maintain.
  This does not affect ``--cipher none`` to do a tunnel without encryption.

- ``--disable-multi`` configure option has been removed


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/net/openvpn/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/openvpn/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/openvpn/PLIST
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/openvpn/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/openvpn/patches/patch-configure

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


--_----------=_1605615181280750
Content-Disposition: inline
Content-Length: 4665
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/openvpn/Makefile
diff -u pkgsrc/net/openvpn/Makefile:1.77 pkgsrc/net/openvpn/Makefile:1.78
--- pkgsrc/net/openvpn/Makefile:1.77	Fri May 22 10:56:30 2020
+++ pkgsrc/net/openvpn/Makefile	Tue Nov 17 12:13:01 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2020/05/22 10:56:30 adam Exp $
+# $NetBSD: Makefile,v 1.78 2020/11/17 12:13:01 adam Exp $
 
 DISTNAME=	${OPENVPN_DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${OPENVPN_MASTER_SITES}
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/net/openvpn/Makefile.common
diff -u pkgsrc/net/openvpn/Makefile.common:1.18 pkgsrc/net/openvpn/Makefile.common:1.19
--- pkgsrc/net/openvpn/Makefile.common:1.18	Fri Apr 17 20:14:22 2020
+++ pkgsrc/net/openvpn/Makefile.common	Tue Nov 17 12:13:01 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.18 2020/04/17 20:14:22 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2020/11/17 12:13:01 adam Exp $
 # used by net/openvpn/Makefile
 # used by net/openvpn-acct-wtmpx/Makefile
 # used by net/openvpn-nagios/Makefile
 
-OPENVPN_DISTNAME=		openvpn-2.4.9
+OPENVPN_DISTNAME=		openvpn-2.5.0
 OPENVPN_DISTFILE=		${OPENVPN_DISTNAME}.tar.xz
-OPENVPN_MASTER_SITES=		http://swupdate.openvpn.org/community/releases/
+OPENVPN_MASTER_SITES=		https://swupdate.openvpn.org/community/releases/
 SITES.${OPENVPN_DISTFILE}=	${OPENVPN_MASTER_SITES}
 
 OPENVPN_USER?=		openvpn

Index: pkgsrc/net/openvpn/PLIST
diff -u pkgsrc/net/openvpn/PLIST:1.20 pkgsrc/net/openvpn/PLIST:1.21
--- pkgsrc/net/openvpn/PLIST:1.20	Mon Oct  2 15:54:23 2017
+++ pkgsrc/net/openvpn/PLIST	Tue Nov 17 12:13:01 2020
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.20 2017/10/02 15:54:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2020/11/17 12:13:01 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
-man/man8/openvpn.8
 sbin/openvpn
 share/doc/openvpn/COPYING
 share/doc/openvpn/COPYRIGHT.GPL
@@ -24,8 +23,6 @@ share/examples/openvpn/config/office.up
 share/examples/openvpn/config/openvpn-shutdown.sh
 share/examples/openvpn/config/openvpn-startup.sh
 share/examples/openvpn/config/server.conf
-share/examples/openvpn/config/static-home.conf
-share/examples/openvpn/config/static-office.conf
 share/examples/openvpn/config/tls-home.conf
 share/examples/openvpn/config/tls-office.conf
 share/examples/openvpn/config/xinetd-client-config

Index: pkgsrc/net/openvpn/distinfo
diff -u pkgsrc/net/openvpn/distinfo:1.45 pkgsrc/net/openvpn/distinfo:1.46
--- pkgsrc/net/openvpn/distinfo:1.45	Fri Apr 17 20:14:22 2020
+++ pkgsrc/net/openvpn/distinfo	Tue Nov 17 12:13:01 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2020/04/17 20:14:22 adam Exp $
+$NetBSD: distinfo,v 1.46 2020/11/17 12:13:01 adam Exp $
 
-SHA1 (openvpn-2.4.9.tar.xz) = 60adab3955438d64cf7461ed8a6bb07babfd0e3c
-RMD160 (openvpn-2.4.9.tar.xz) = e4c4f725faf89f696c950710bd5648ca873505d6
-SHA512 (openvpn-2.4.9.tar.xz) = 88dec6bc5993de92e33ed1a829b710c7b4c491253396d5c705c89c0949a859bd24151fdcb278df4b43ca6c39aa033c21ce6f812565a1d75c2dfb8fa198876b13
-Size (openvpn-2.4.9.tar.xz) = 954264 bytes
-SHA1 (patch-configure) = 240342a88baed7642dfd63ed0a2ab4c0a75adbd4
+SHA1 (openvpn-2.5.0.tar.xz) = 63889f0a6c5080294d394314d22d9231d9913ad1
+RMD160 (openvpn-2.5.0.tar.xz) = 8afd3518cee352331aa3a861e6eefd440d3031eb
+SHA512 (openvpn-2.5.0.tar.xz) = 4d7175dc9b9cba84560fdb38ae9ff7f54c880c0927eee2874726e1558b8e553a6f4cf6cc26381c4bbc6541ec05419ac05a7554312140193903545b1da44f7771
+Size (openvpn-2.5.0.tar.xz) = 1126928 bytes
+SHA1 (patch-configure) = 3f53e958ad96b81287d959363ec15acf37f50b31
 SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143

Index: pkgsrc/net/openvpn/patches/patch-configure
diff -u pkgsrc/net/openvpn/patches/patch-configure:1.1 pkgsrc/net/openvpn/patches/patch-configure:1.2
--- pkgsrc/net/openvpn/patches/patch-configure:1.1	Wed May 24 20:35:12 2017
+++ pkgsrc/net/openvpn/patches/patch-configure	Tue Nov 17 12:13:01 2020
@@ -1,14 +1,14 @@
-$NetBSD: patch-configure,v 1.1 2017/05/24 20:35:12 adam Exp $
+$NetBSD: patch-configure,v 1.2 2020/11/17 12:13:01 adam Exp $
 
 Support net/if_tap.h
 
---- configure.orig	2017-05-11 00:51:16.000000000 +0000
+--- configure.orig	2020-10-28 07:25:31.000000000 +0000
 +++ configure
-@@ -14419,6 +14419,7 @@ for ac_header in  \
+@@ -15069,6 +15069,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 \
+ 	linux/types.h poll.h sys/epoll.h err.h \
  

--_----------=_1605615181280750--