From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 02 Nov 2023 12:53:31 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qyWGR-00FHZP-Pl for lore@lore.pengutronix.de; Thu, 02 Nov 2023 12:53:31 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qyWGR-0000Pq-5e; Thu, 02 Nov 2023 12:53:31 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qyWGI-0000Ph-Jm; Thu, 02 Nov 2023 12:53:22 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qyWGI-0063k4-7a; Thu, 02 Nov 2023 12:53:22 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qyWGI-00CtNC-0X; Thu, 02 Nov 2023 12:53:22 +0100 Date: Thu, 2 Nov 2023 12:53:22 +0100 From: Michael Olbrich To: Andreas Helmcke Message-ID: Mail-Followup-To: Andreas Helmcke , ptxdist@pengutronix.de References: <20231020112620.77490-1-ahelmcke@ela-soft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231020112620.77490-1-ahelmcke@ela-soft.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH] openvpn: Version bump, 2.5.8 -> 2.6.6 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false On Fri, Oct 20, 2023 at 01:26:20PM +0200, Andreas Helmcke wrote: > Upstream changes: > - lots of bugfixes > - OpenSSL V3 support > - stronger security defaults > > ptxdist changes: > - new dependency: libcap_ng added > - download url changed to gitub > - some changes in licenses With all sub-options enabled, targetinstall fails with: No suitable file '/usr/share/openvpn/sample-config-files/xinetd-client-config' could be found in any of these locations: .../build-target/openvpn-2.6.6/sample/sample-config-files/xinetd-client-config.arm-hf .../build-target/openvpn-2.6.6/sample/sample-config-files/xinetd-client-config Error: install_file failed! Michael > Link: https://github.com/OpenVPN/openvpn/blob/v2.6.6/Changes.rst > Signed-off-by: Andreas Helmcke > --- > rules/openvpn.in | 1 + > rules/openvpn.make | 20 ++++++++++---------- > 2 files changed, 11 insertions(+), 10 deletions(-) > > diff --git a/rules/openvpn.in b/rules/openvpn.in > index 568c8a9d2..0ef6af5af 100644 > --- a/rules/openvpn.in > +++ b/rules/openvpn.in > @@ -4,6 +4,7 @@ menuconfig OPENVPN > tristate > prompt "openvpn " > select OPENSSL > + select LIBCAP_NG > select LIBLZO if OPENVPN_LZO > select SYSTEMD if OPENVPN_SYSTEMD > select IPTABLES if OPENVPN_INSTALL_SAMPLE_CONFIGS && RUNTIME > diff --git a/rules/openvpn.make b/rules/openvpn.make > index b71786d4f..17dbd08a3 100644 > --- a/rules/openvpn.make > +++ b/rules/openvpn.make > @@ -14,20 +14,21 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn > # > # Paths and names > # > -OPENVPN_VERSION := 2.5.8 > -OPENVPN_MD5 := 8c1181a2baaa25b36e4aa67161c2829e > +OPENVPN_VERSION := 2.6.6 > +OPENVPN_MD5 := 660e71db3ed3161e33b4b649855c2477 > OPENVPN := openvpn-$(OPENVPN_VERSION) > OPENVPN_SUFFIX := tar.gz > -OPENVPN_URL := https://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX) > +OPENVPN_URL := https://github.com/OpenVPN/openvpn/releases/download/v$(OPENVPN_VERSION)/$(OPENVPN).$(OPENVPN_SUFFIX) > OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) > OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN) > -OPENVPN_LICENSE := GPL-2.0-only WITH openvpn-openssl-exception AND BSD-2-Clause AND BSD-3-Clause > +OPENVPN_LICENSE := GPL-2.0-only WITH (openvpn-openssl-exception AND custom-exception) AND BSD-2-Clause AND BSD-3-Clause AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) > OPENVPN_LICENSE_FILES := \ > - file://COPYING;md5=b76abd82c14ee01cc34c4ff5e3627b89 \ > + file://COPYING;md5=d8d34ce6390552676e4ce8279f13c48a \ > file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \ > - file://src/openvpn/openvpn.c;startline=2;endline=21;md5=82f794c2390084d34cb32d871c17b4be \ > + file://src/openvpn/openvpn.c;startline=2;endline=21;md5=b9fb1976bc6d8ad5e02a251351dc58f2 \ > file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f \ > - file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5163f975ae122fe0c260002537edab22 > + file://src/openvpn/ovpn_dco_linux.h;startline=1;endline=1;md5=b317f96dbe63f35baef28266acb68512 \ > + file://src/openvpn/ovpn_dco_freebsd.h;startline=1;endline=1;md5=a7ba62aad20f9685c53b0565a263af30 > > # ---------------------------------------------------------------------------- > # Prepare > @@ -64,13 +65,11 @@ OPENVPN_CONF_OPT := \ > --enable-management \ > --disable-pkcs11 \ > --enable-fragment \ > - --enable-multihome \ > --enable-port-share \ > --disable-debug \ > --$(call ptx/endis, PTXCONF_OPENVPN_SMALL)-small \ > + --disable-dco \ > --enable-iproute2 \ > - --enable-def-auth \ > - --enable-pf \ > --disable-plugin-auth-pam \ > --enable-plugin-down-root \ > --disable-pam-dlopen \ > @@ -81,6 +80,7 @@ OPENVPN_CONF_OPT := \ > --disable-selinux \ > --$(call ptx/endis, PTXCONF_OPENVPN_SYSTEMD)-systemd \ > --disable-async-push \ > + --disable-wolfssl-options-h \ > --disable-unit-tests \ > --with-crypto-library=openssl \ > --with-openssl-engine > -- > 2.40.1 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |