From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 02 Jan 2023 18:08:09 +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 1pCOIE-00H7dY-4C for lore@lore.pengutronix.de; Mon, 02 Jan 2023 18:08:09 +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 1pCOIC-0000wE-RG; Mon, 02 Jan 2023 18:08:08 +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 1pCOHi-0000w5-WC for ptxdist@pengutronix.de; Mon, 02 Jan 2023 18:07:40 +0100 Received: from lenoch ([80.95.121.122]) by cmgsmtp with ESMTPSA id COHgp4To4Pm6CCOHhpAYgO; Mon, 02 Jan 2023 18:07:37 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1672679257; bh=iEvICGa6HNAgMc++GSebP6kIapaxTM2jVg4JMfXG9jw=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=gkWCcgUVK4OnLjYmZkMVuGSEe58ZMjaJUKFf6qdJetMZBl0dItRVtnZJ/uzxKSWDk mUi71lAp7drkWO7z+JOnjtFbl9YnOBvCvFfBCVnDEmzxuwedTqdyQ/cdd7VMRxL7Qr MeWwo6jr95I++8SUI3HEZgM5eLrgWXQGuoEVsINkNCNJ1ZFflV9KJ7Lek/ybHnQJPz ItmVe5qLJcujXdyTJ5s2eEGm4oXEI8AqRS31y4p3LyiyCvP8Ek2rPt2TLduhO+GPjf GO1OUAmSrN+2fkj1TubwTHV9wd8DMdd36BxQjJAAhTbVIT90jkom7ipo+aB8i0mEzG kqTxl/jvp1uIQ== Date: Mon, 2 Jan 2023 18:07:34 +0100 From: Ladislav Michl To: Alexander Dahl Message-ID: References: <5003704.yk9Jf0hHE4@ada> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5003704.yk9Jf0hHE4@ada> X-CMAE-Envelope: MS4wfBv1vFA1Dz9S4k4sAsXxY+klqmo6hvho4gx3iYWxHiX33rwNahxQmIZ/oreTvajvIomliqKtkUkuYL7oOF4ka7GhVj+8g8dO/azdHnyEHyk8nx/THa1m krjPcbUqcxWdFTwOSP06G10Zgc+rt4sQ1aiudeDfDs4fo632eKm3diRhv7KeiKy3nMZQWmbAsBFy8g== 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.4 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: 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: 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 Hi Alexander, On Mon, Jan 02, 2023 at 09:34:15AM +0100, Alexander Dahl wrote: > Hello Ladislav, > > Am Mittwoch, 28. Dezember 2022, 12:53:13 CET schrieb Ladislav Michl: > > From: Ladislav Michl > > > > Remove local patch which is already merged upstream. > > > > 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_LOWDE > > LAY.patch delete mode 100644 patches/dropbear-2022.82/series > > > > diff --git > > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW > > DELAY.patch > > b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW > > DELAY.patch deleted file mode 100644 > > index 8c46daf9c..000000000 > > --- > > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW > > 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 = 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..fcfe8bce4 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) > > The announcement contains this: > > „- >> DROPBEAR_SK_KEYS config option now replaces separate DROPBEAR_SK_ECDSA > and DROPBEAR_SK_ED25519 options.“ > > These options are explicitly disabled in rules/dropbear.make and I think that > line(s) should be changed to the new config option. I've left that unchanged as sysoptions.h contains: #ifndef DROPBEAR_SK_ECDSA #define DROPBEAR_SK_ECDSA DROPBEAR_SK_KEYS #endif #ifndef DROPBEAR_SK_ED25519 #define DROPBEAR_SK_ED25519 DROPBEAR_SK_KEYS #endif anyway, I will send v2 as it seems to be right to do the change now. Thanks for pointing that out. ladis