From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA68B15808D for ; Sat, 23 Apr 2022 21:35:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C7DDE0920; Sat, 23 Apr 2022 21:35:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B95CE0920 for ; Sat, 23 Apr 2022 21:35:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B393341359 for ; Sat, 23 Apr 2022 21:35:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD2843B3 for ; Sat, 23 Apr 2022 21:35:11 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1650749694.78c789a9d72d495eb4eddcbb8e28883fd976f9d8.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dropbear/files/, net-misc/dropbear/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dropbear/dropbear-2022.82.ebuild net-misc/dropbear/files/dropbear-2022.82-x11.patch X-VCS-Directories: net-misc/dropbear/files/ net-misc/dropbear/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 78c789a9d72d495eb4eddcbb8e28883fd976f9d8 X-VCS-Branch: master Date: Sat, 23 Apr 2022 21:35:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 96d2d3e9-8dbb-401a-bce9-93a0cf2e5a44 X-Archives-Hash: 3fc5d53ffe8595cb8ed12a0494ea72f7 commit: 78c789a9d72d495eb4eddcbb8e28883fd976f9d8 Author: Conrad Kostecki gentoo org> AuthorDate: Sat Apr 23 21:32:06 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Apr 23 21:34:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c789a9 net-misc/dropbear: fix compilation with enabled x11 Closes: https://bugs.gentoo.org/837164 Signed-off-by: Conrad Kostecki gentoo.org> net-misc/dropbear/dropbear-2022.82.ebuild | 1 + net-misc/dropbear/files/dropbear-2022.82-x11.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/net-misc/dropbear/dropbear-2022.82.ebuild b/net-misc/dropbear/dropbear-2022.82.ebuild index 27bbc8b51dd6..1df3c22e1a2c 100644 --- a/net-misc/dropbear/dropbear-2022.82.ebuild +++ b/net-misc/dropbear/dropbear-2022.82.ebuild @@ -45,6 +45,7 @@ REQUIRED_USE="pam? ( !static )" PATCHES=( "${FILESDIR}"/${PN}-0.46-dbscp.patch + "${FILESDIR}"/${PN}-2022.82-x11.patch ) set_options() { diff --git a/net-misc/dropbear/files/dropbear-2022.82-x11.patch b/net-misc/dropbear/files/dropbear-2022.82-x11.patch new file mode 100644 index 000000000000..82cb9c812ebe --- /dev/null +++ b/net-misc/dropbear/files/dropbear-2022.82-x11.patch @@ -0,0 +1,22 @@ +From 0292aacdf0aa57d03f2a3ab7e53cf650e6f29389 Mon Sep 17 00:00:00 2001 +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 353cb12e..5d9e6a96 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; + } +