From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 06 Jan 2023 17:02:56 +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 1pDpBI-003d3d-P6 for lore@lore.pengutronix.de; Fri, 06 Jan 2023 17:02:56 +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 1pDpBG-00006Y-GS; Fri, 06 Jan 2023 17:02:54 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pDp9r-000422-5k; Fri, 06 Jan 2023 17:01:27 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pDp9q-004Eqs-II; Fri, 06 Jan 2023 17:01:26 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pDp9p-00Cu5A-HO; Fri, 06 Jan 2023 17:01:25 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 6 Jan 2023 17:01:25 +0100 Message-Id: <20230106160125.3075473-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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 Cc: Ladislav Michl 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 Thanks, applied as 70ac4a6042dcf77534b22499b1e0eadc3aa7f1f1. Michael [sent from post-receive hook] On Fri, 06 Jan 2023 17:01:25 +0100, Ladislav Michl wrote: > 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 > Tested-by: Alexander Dahl > Message-Id: > Signed-off-by: Michael Olbrich > > 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 8c46daf9ca5a..000000000000 > --- 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 87840318b1bc..000000000000 > --- 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 e86b8bf43803..dfdbe572d8ce 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