summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2022-12-05 10:24:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-06 15:23:18 +0000
commita05b95e3825284bd371ac5fcff5ee6434fa594f2 (patch)
tree6bd35fe039b1d71e8fa4ee9c3f468492a99cc0e9
parent15dd267bf5f8f848fa057d54e10174cf29b00496 (diff)
downloadpoky-a05b95e3825284bd371ac5fcff5ee6434fa594f2.tar.gz
dropbear: upgrade 2022.82 -> 2022.83
0007-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch removed since it's included in 2022.83 Changelog: ========== - Disable DROPBEAR_DSS by default - Added DROPBEAR_RSA_SHA1 option to allow disabling sha1 rsa signatures. - Add option for requiring both password and pubkey (-t) - Add 'no-touch-required' and 'verify-required' options for sk keys DROPBEAR_SK_KEYS config option now replaces separate DROPBEAR_SK_ECDSA and DROPBEAR_SK_ED25519 options. - Add 'permitopen' option for authorized_keys to restrict forwarded ports - Added LTM_CFLAGS configure argument to set flags for building bundled libtommath. This also restores the previous arguments used in 2020.81 (-O3 -funroll-loops). That gives a big speedup for RSA key generation, which regressed in 2022.82. There is a tradeoff with code size, so -Os can be used if required. - Add '-z' flag to disable setting QoS traffic class. This may be necessary to work with broken networks or network drivers, exposed after changes to use AF21 in 2022.82 - Allow overriding user shells with COMPAT_USER_SHELLS - Improve permission error message - Remove HMAC_MD5 entirely (From OE-Core rev: 99759005f18f0533717696729978d8dc5bf4ad16) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dropbear/dropbear/0007-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch28
-rw-r--r--meta/recipes-core/dropbear/dropbear_2022.83.bb (renamed from meta/recipes-core/dropbear/dropbear_2022.82.bb)4
2 files changed, 2 insertions, 30 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/0007-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch b/meta/recipes-core/dropbear/dropbear/0007-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
deleted file mode 100644
index 042dccbb94..0000000000
--- a/meta/recipes-core/dropbear/dropbear/0007-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 64292091fe3e8ea7c9bfe74af730b2ff5428bf10 Mon Sep 17 00:00:00 2001
2From: Matt Johnston <matt@ucc.asn.au>
3Date: Sat, 23 Apr 2022 22:33:31 +0800
4Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY
5
6Upstream-Status: Backport
7
8Signed-off-by: Daniel Gomez <daniel@qtec.com>
9---
10 svr-x11fwd.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/svr-x11fwd.c b/svr-x11fwd.c
14index 353cb12..5d9e6a9 100644
15--- a/svr-x11fwd.c
16+++ b/svr-x11fwd.c
17@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) {
18 }
19
20 static int x11_inithandler(struct Channel *channel) {
21- channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE;
22+ channel->prio = DROPBEAR_PRIO_LOWDELAY;
23 return 0;
24 }
25
26--
272.35.1
28
diff --git a/meta/recipes-core/dropbear/dropbear_2022.82.bb b/meta/recipes-core/dropbear/dropbear_2022.83.bb
index 4ed4c65cc1..0c7a8f4caa 100644
--- a/meta/recipes-core/dropbear/dropbear_2022.82.bb
+++ b/meta/recipes-core/dropbear/dropbear_2022.83.bb
@@ -21,9 +21,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
21 file://dropbear.default \ 21 file://dropbear.default \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
23 ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \ 23 ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \
24 file://0007-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch" 24 "
25 25
26SRC_URI[sha256sum] = "3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1" 26SRC_URI[sha256sum] = "bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b"
27 27
28PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ 28PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
29 file://0006-dropbear-configuration-file.patch \ 29 file://0006-dropbear-configuration-file.patch \