Thanks, applied as 70ac4a6042dcf77534b22499b1e0eadc3aa7f1f1.
Michael
[sent from post-receive hook]
On Fri, 06 Jan 2023 17:01:25 +0100, Ladislav Michl <oss-li...@triops.cz> 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 <la...@linux-mips.org>
> Tested-by: Alexander Dahl <a...@thorsis.com>
> Message-Id: <Y7MTg7FwuOkzMGR5@lenoch>
> Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
>
> 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 <m...@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 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
