Re: [ptxdist] [PATCH] dropbear: version bump 2022.82 -> 2022.83

[Ladislav Michl <oss-lists@triops.cz>]

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 <ladis@linux-mips.org>
> > 
> > Remove local patch which is already merged upstream.
> > 
> > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > ---
> >  ...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 <matt@ucc.asn.au>
> > -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