From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 21 Jul 2022 09:10:44 +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 1oEQKa-00GQaM-Vx for lore@lore.pengutronix.de; Thu, 21 Jul 2022 09:10:44 +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 1oEQKZ-0000eb-DP; Thu, 21 Jul 2022 09:10:43 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oEQK2-0000dQ-LM for ptxdist@pengutronix.de; Thu, 21 Jul 2022 09:10:13 +0200 Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1oEQK0-0007DV-DL for ptxdist@pengutronix.de; Thu, 21 Jul 2022 09:10:08 +0200 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Thu, 21 Jul 2022 09:10:08 +0200 Message-Id: <20220721071008.27675-1-ada@thorsis.com> In-Reply-To: <20220708151333.GJ20240@pengutronix.de> References: <20220708151333.GJ20240@pengutronix.de> Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] 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 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 Fixes: fe0bcfd2aed9 ("dropbear: version bump 2020.81 -> 2022.82") Signed-off-by: Alexander Dahl --- ...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 +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