From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 02 Jan 2023 09:35:16 +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 1pCGHs-00GlQb-MV for lore@lore.pengutronix.de; Mon, 02 Jan 2023 09:35:16 +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 1pCGHr-0004tp-8y; Mon, 02 Jan 2023 09:35:15 +0100 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pCGHA-0004te-1z for ptxdist@pengutronix.de; Mon, 02 Jan 2023 09:34:34 +0100 From: Alexander Dahl DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=default; t=1672648470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0XsqCNOOd0Vdl2jciCF1ICSCpBMKOdxMHIfRHYB72po=; b=D8kJeKJCQzm0R6KN16KwqXpksEZnkZHy22EnHe7kXkNdOjv+gSyN/8FTNUo7PheULSD10y 8Zl6yTwrRqAl3xv2deLrCv/e+o1MefJ1MRjN+cN9mE95bG/9OZBt8OYW/emB/ghBkyxxuP jyDtuTRNgMrM+qN3CjF/499D3XJthQJn/bvE1hVCqQSKTqvW45kiOdVzK8OwFqmpJ16gd7 HpwxgwH2bpnBZIGCPWIFsdG6cWWhOGZu1lgiEGXjYGFCaCIXwzTLf8uXI9cA9arevFKCRq UxrhOeXgzHtjrDjZnSs7s4YBbTXuKtNDjUuljF95gPBC5OiALfO+WFsyYDI48w== To: ptxdist@pengutronix.de Date: Mon, 02 Jan 2023 09:34:15 +0100 Message-ID: <5003704.yk9Jf0hHE4@ada> In-Reply-To: References: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Clacks-Overhead: GNU Terry Pratchett 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.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH] 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 Hello Ladislav, Am Mittwoch, 28. Dezember 2022, 12:53:13 CET schrieb Ladislav Michl: > From: Ladislav Michl >=20 > Remove local patch which is already merged upstream. >=20 > Signed-off-by: Ladislav Michl > --- > ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 ------------------- > patches/dropbear-2022.82/series | 4 ---- > rules/dropbear.make | 4 ++-- > 3 files changed, 2 insertions(+), 27 deletions(-) > delete mode 100644 > patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW= DE > LAY.patch delete mode 100644 patches/dropbear-2022.82/series >=20 > diff --git > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_L= OW > DELAY.patch > b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_L= OW > DELAY.patch deleted file mode 100644 > index 8c46daf9c..000000000 > --- > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_L= OW > DELAY.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 =3D DROPBEAR_CHANNEL_PRIO_INTERACTIVE; > -+ channel->prio =3D 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..fcfe8bce4 100644 > --- a/rules/dropbear.make > +++ b/rules/dropbear.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) +=3D dropbear > # > # Paths and names > # > -DROPBEAR_VERSION :=3D 2022.82 > -DROPBEAR_MD5 :=3D 7a4a5f2c6d23ff2e6627c97d7c1aeceb > +DROPBEAR_VERSION :=3D 2022.83 > +DROPBEAR_MD5 :=3D a75a34bcc03cacf71a2db9da3b7c94a5 > DROPBEAR :=3D dropbear-$(DROPBEAR_VERSION) > DROPBEAR_SUFFIX :=3D tar.bz2 > DROPBEAR_URL :=3D > https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) The announcement contains this: =E2=80=9E- >> DROPBEAR_SK_KEYS config option now replaces separate DROPBEAR= _SK_ECDSA and DROPBEAR_SK_ED25519 options.=E2=80=9C These options are explicitly disabled in rules/dropbear.make and I think th= at=20 line(s) should be changed to the new config option. Greets Alex