From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 20 Oct 2023 13:26:51 +0200 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 1qtneV-00FTUb-B6 for lore@lore.pengutronix.de; Fri, 20 Oct 2023 13:26:51 +0200 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 1qtneT-0001J6-9p; Fri, 20 Oct 2023 13:26:49 +0200 Received: from mail.ela-soft.com ([213.23.49.162]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qtneJ-0001Ik-7g for ptxdist@pengutronix.de; Fri, 20 Oct 2023 13:26:39 +0200 Received: from tupai.ela-bln.local (tupai.ela-bln.local [10.0.1.140]) by mail.ela-soft.com (mailsystem) with ESMTP id 7D3469B5D; Fri, 20 Oct 2023 13:26:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ela-soft.com; s=2021; t=1697801197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=wb8OA9zDe26MdzbNkfkylMRSRNAVoayTJKBwv7lh3u8=; b=iNB5rJLskbT8I21x13GpdvXfZYZVnnV2NuNXxo0b6C7BrIpOTVSyi8XMkvKARgHNnmrfzz HFE0/RFfvlKOtPs2QvwCQpe3RmjXeeJB4RVq/jIT1tnnsww9YJdhLAk+++o+i1HfN3ey/m leGDDTHOmejcsWx3NGcCWkpgdi9TzZpBtLp3iAJgcdt/rXW7JV4oVgQ3GPaO7tNKZzE490 BLIU4JQu9P3kyzr+2chq3IO9IAj3S9evTV/FYiEbdbyJ5oAdfpj1zsQ10hXN3v5tQ3snMY fgJKw20kHaonO3ChkClmX6cX70FTD0/ez9b3GlLK5IgHiqwe+Xz4GYlOLGGxtA== Received: by tupai.ela-bln.local (Postfix, from userid 1000) id 6ACAF340482; Fri, 20 Oct 2023 13:26:37 +0200 (CEST) From: Andreas Helmcke To: ptxdist@pengutronix.de Date: Fri, 20 Oct 2023 13:26:20 +0200 Message-Id: <20231020112620.77490-1-ahelmcke@ela-soft.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-102.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [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: Andreas Helmcke 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 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 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