From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 04 Aug 2022 17:15:49 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oJcZf-00BOld-MM for lore@lore.pengutronix.de; Thu, 04 Aug 2022 17:15:49 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oJcZh-0005oc-47; Thu, 04 Aug 2022 17:15:49 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oJcYC-00048x-Kl; Thu, 04 Aug 2022 17:14:16 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oJcY9-001ifU-Em; Thu, 04 Aug 2022 17:14:15 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oJcYA-000jZD-Vr; Thu, 04 Aug 2022 17:14:15 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 4 Aug 2022 17:14:14 +0200 Message-Id: <20220804151414.175116-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220721071008.27675-1-ada@thorsis.com> References: <20220721071008.27675-1-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] dropbear: Add patch to fix build with X11 forwarding X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as a346f07c3b88c9e03a3fadb6256c0e1a9ed0c8a0. Michael [sent from post-receive hook] On Thu, 04 Aug 2022 17:14:14 +0200, Alexander Dahl wrote: > Fixes: fe0bcfd2aed9 ("dropbear: version bump 2020.81 -> 2022.82") > Signed-off-by: Alexander Dahl > Message-Id: <20220721071008.27675-1-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > 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 > +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)