Thanks, applied as a346f07c3b88c9e03a3fadb6256c0e1a9ed0c8a0. Michael
[sent from post-receive hook] On Thu, 04 Aug 2022 17:14:14 +0200, Alexander Dahl <[email protected]> wrote: > Fixes: fe0bcfd2aed9 ("dropbear: version bump 2020.81 -> 2022.82") > Signed-off-by: Alexander Dahl <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 000000000000..8c46daf9ca5a > --- /dev/null > +++ > b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch > @@ -0,0 +1,21 @@ > +From: Matt Johnston <[email protected]> > +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 000000000000..87840318b1bc > --- /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 efc1c93fbc5f..e2945f38d05e 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)
