diff options
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/0007-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 28 | ||||
-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 @@ | |||
1 | From 64292091fe3e8ea7c9bfe74af730b2ff5428bf10 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt Johnston <matt@ucc.asn.au> | ||
3 | Date: Sat, 23 Apr 2022 22:33:31 +0800 | ||
4 | Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Signed-off-by: Daniel Gomez <daniel@qtec.com> | ||
9 | --- | ||
10 | svr-x11fwd.c | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/svr-x11fwd.c b/svr-x11fwd.c | ||
14 | index 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 | -- | ||
27 | 2.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 | ||
26 | SRC_URI[sha256sum] = "3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1" | 26 | SRC_URI[sha256sum] = "bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b" |
27 | 27 | ||
28 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ | 28 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ |
29 | file://0006-dropbear-configuration-file.patch \ | 29 | file://0006-dropbear-configuration-file.patch \ |