From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 02 Jan 2023 18:25:42 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) 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 1pCOZC-00H8j5-QJ for lore@lore.pengutronix.de; Mon, 02 Jan 2023 18:25:42 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pCOZA-0003Gd-OD; Mon, 02 Jan 2023 18:25:40 +0100 Received: from h2.cmg1.smtp.forpsi.com ([81.2.195.163]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pCOYv-0003Fs-Lu for ptxdist@pengutronix.de; Mon, 02 Jan 2023 18:25:28 +0100 Received: from lenoch ([80.95.121.122]) by cmgsmtp with ESMTPSA id COYtp4bulPm6CCOYupAaxr; Mon, 02 Jan 2023 18:25:24 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1672680325; bh=GjY8SMqboZ0hCcVNo3XN5lBrfJM1JkLkbRKAKAOwO0s=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=o442ztnjm4p4TCjPrpfHCRnKUtSpnyTrTmFw/PKlikO2uFUks7qC0OQQEBVYGquK6 onUdRBc3AylLgzSk5Kb1tF2xUkWvLId1fFNWt3mXt0TZ0cb7EIq2g+X3Fy6/aazwQo EYX//IK1LwPyEUb4gOQ0sJa9GswpbGkbENofqS6E45n8g+GjAHuzVKQfPhXmTRRXTU ZPktpKZIJrBgat2oKwZqmkpJrmwOGHSyiVtU0Phao9a98wFF7jSIxtuv04pJehrofT njrcBegQEINvO1KN8HnPN9NJqHPtQHjqa/WCdhXmovZ/p9ScWbXXKzup0IiZRbhQe1 saOUxYWhRYkDg== Date: Mon, 2 Jan 2023 18:25:23 +0100 From: Ladislav Michl To: ptxdist@pengutronix.de Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-CMAE-Envelope: MS4wfBpCTBhpF/nmelCWXMqp8KLzohqQrh3Tywivq0+jaLsW9kFBq2NzrCa/Yk5mW9mnwwo7toECV/p4aWPN6FEnEff5IxOS6AAjQUJMXZ7b8uhR/xI+wuWT 0onqyZNwp6bHiuAVXcFZVK5WlmTElCyVwFdB+2i3T6S5HB/Oql6rybc0 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] dropbear: version bump 2022.82 -> 2022.83 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 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.ext.pengutronix.de); SAEximRunCond expanded to false From: Ladislav Michl Remove local patch which is already merged upstream. DROPBEAR_SK_KEYS config option now replaces separate DROPBEAR_SK_ECDSA and DROPBEAR_SK_ED25519 options, so generate localoptions.h accordingly. Signed-off-by: Ladislav Michl --- CHANGES: -v2: use DROPBEAR_SK_KEYS ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 ------------------- patches/dropbear-2022.82/series | 4 ---- rules/dropbear.make | 7 +++---- 3 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch delete mode 100644 patches/dropbear-2022.82/series diff --git a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch deleted file mode 100644 index 8c46daf9c..000000000 --- a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Matt Johnston -Date: Sat, 23 Apr 2022 22:33:31 +0800 -Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY - ---- - svr-x11fwd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/svr-x11fwd.c b/svr-x11fwd.c -index 353cb12e8dd1..5d9e6a96f577 100644 ---- a/svr-x11fwd.c -+++ b/svr-x11fwd.c -@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) { - } - - static int x11_inithandler(struct Channel *channel) { -- channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE; -+ channel->prio = DROPBEAR_PRIO_LOWDELAY; - return 0; - } - diff --git a/patches/dropbear-2022.82/series b/patches/dropbear-2022.82/series deleted file mode 100644 index 87840318b..000000000 --- a/patches/dropbear-2022.82/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch -# dacc85cb839b0a9eec87bf2d3fc2463f - git-ptx-patches magic diff --git a/rules/dropbear.make b/rules/dropbear.make index e86b8bf43..dfdbe572d 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear # # Paths and names # -DROPBEAR_VERSION := 2022.82 -DROPBEAR_MD5 := 7a4a5f2c6d23ff2e6627c97d7c1aeceb +DROPBEAR_VERSION := 2022.83 +DROPBEAR_MD5 := a75a34bcc03cacf71a2db9da3b7c94a5 DROPBEAR := dropbear-$(DROPBEAR_VERSION) DROPBEAR_SUFFIX := tar.bz2 DROPBEAR_URL := https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) @@ -215,8 +215,7 @@ else endif @echo "ptxdist: disabling u2f security key support" - @echo "#define DROPBEAR_SK_ECDSA 0" >> $(DROPBEAR_LOCALOPTIONS) - @echo "#define DROPBEAR_SK_ED25519 0" >> $(DROPBEAR_LOCALOPTIONS) + @echo "#define DROPBEAR_SK_KEYS 0" >> $(DROPBEAR_LOCALOPTIONS) # key exchange algorithm ifdef PTXCONF_DROPBEAR_DH_GROUP14_SHA256 -- 2.32.0