From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] dropbear: Add patch to fix build with X11 forwarding
Date: Thu, 21 Jul 2022 09:10:08 +0200 [thread overview]
Message-ID: <20220721071008.27675-1-ada@thorsis.com> (raw)
In-Reply-To: <20220708151333.GJ20240@pengutronix.de>
Fixes: fe0bcfd2aed9 ("dropbear: version bump 2020.81 -> 2022.82")
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 +++++++++++++++++++
patches/dropbear-2022.82/series | 4 ++++
rules/dropbear.in | 3 +--
3 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
create mode 100644 patches/dropbear-2022.82/series
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
new file mode 100644
index 000000000..8c46daf9c
--- /dev/null
+++ b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000..87840318b
--- /dev/null
+++ b/patches/dropbear-2022.82/series
@@ -0,0 +1,4 @@
+# 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.in b/rules/dropbear.in
index efc1c93fb..e2945f38d 100644
--- a/rules/dropbear.in
+++ b/rules/dropbear.in
@@ -115,8 +115,7 @@ menu "Features "
config DROPBEAR_DIS_X11
bool
- # X11 forwarding fails to build
- #prompt "disable X11 Forwarding"
+ prompt "disable X11 Forwarding"
default y
help
X11 forwarding means passing X11 (graphical interface)
base-commit: 02f8e5e7cb2ae088b69bfd2d75ba9e702eeaac5f
--
2.30.2
next prev parent reply other threads:[~2022-07-21 7:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-04 12:18 [ptxdist] [PATCH 0/8] dropbear: version bump and option revise Alexander Dahl
2022-07-04 12:18 ` [ptxdist] [PATCH 1/8] dropbear: version bump 2020.81 -> 2022.82 Alexander Dahl
2022-07-08 15:13 ` Michael Olbrich
2022-07-21 7:10 ` Alexander Dahl [this message]
2022-08-04 15:14 ` [ptxdist] [APPLIED] dropbear: Add patch to fix build with X11 forwarding Michael Olbrich
2022-07-29 6:23 ` [ptxdist] [APPLIED] dropbear: version bump 2020.81 -> 2022.82 Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 2/8] dropbear: Add ed25519 hostkey/public key support Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 3/8] dropbear: Remove curve25519 dependency Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 4/8] dropbear: Make Chacha20-Poly1305 encryption optional Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 5/8] dropbear: Append hints to some menu prompts Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 6/8] dropbear: Rework key exchange algorithm options Alexander Dahl
2022-07-04 12:31 ` Ian Abbott
2022-07-08 9:09 ` Michael Olbrich
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 7/8] dropbear: Add conditional comments with warnings Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-07-04 12:18 ` [ptxdist] [PATCH 8/8] dropbear: Move option groups to sub menus Alexander Dahl
2022-07-29 6:23 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220721071008.27675-1-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox