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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3065138359 for ; Mon, 17 Aug 2020 14:32:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D577CE083B; Mon, 17 Aug 2020 14:32:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEBA4E083B for ; Mon, 17 Aug 2020 14:32:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E741234F4AB for ; Mon, 17 Aug 2020 14:32:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C6C1313 for ; Mon, 17 Aug 2020 14:32:42 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1597674753.a3ddee3a0c95e932481d494930a05f6f34938c1e.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/openssh-8.1_p1-r3.ebuild net-misc/openssh/openssh-8.1_p1-r4.ebuild net-misc/openssh/openssh-8.2_p1-r6.ebuild net-misc/openssh/openssh-8.2_p1-r7.ebuild net-misc/openssh/openssh-8.3_p1-r4.ebuild net-misc/openssh/openssh-8.3_p1-r5.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a3ddee3a0c95e932481d494930a05f6f34938c1e X-VCS-Branch: master Date: Mon, 17 Aug 2020 14:32:42 +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: 1e313c20-1b8a-46ec-839d-ef40816d1677 X-Archives-Hash: 96564fbaef13940664a7fe0930e3e086 commit: a3ddee3a0c95e932481d494930a05f6f34938c1e Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Aug 17 14:29:28 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Aug 17 14:32:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ddee3a net-misc/openssh: depend on >=sys-kernel/linux-headers-5.1 In >=sys-libs/glibc-2.31 we are already forcing an upgrade of net-misc/openssh. However, sandbox code in OpenSSH [Link 1] is guarded by "#ifdef" so an upgrade of OpenSSH before glibc upgrade won't fix the problem if system is using old linux-headers without __NR_clock_nanosleep{,_time64}. Forcing >=linux-headers-5.1 will ensure that OpenSSH's sandbox supports __NR_clock_nanosleep{,_time64} and will therefore work with >=glibc-2.31. Link 1: https://github.com/openssh/openssh-portable/blob/V_8_3/sandbox-seccomp-filter.c#L252-L257 Bug: https://bugs.gentoo.org/708224 Closes: https://bugs.gentoo.org/737604 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann gentoo.org> .../openssh/{openssh-8.1_p1-r3.ebuild => openssh-8.1_p1-r4.ebuild} | 3 ++- .../openssh/{openssh-8.2_p1-r6.ebuild => openssh-8.2_p1-r7.ebuild} | 3 ++- .../openssh/{openssh-8.3_p1-r4.ebuild => openssh-8.3_p1-r5.ebuild} | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/net-misc/openssh/openssh-8.1_p1-r3.ebuild b/net-misc/openssh/openssh-8.1_p1-r4.ebuild similarity index 99% rename from net-misc/openssh/openssh-8.1_p1-r3.ebuild rename to net-misc/openssh/openssh-8.1_p1-r4.ebuild index 75b805da4dd..53ccdd567a2 100644 --- a/net-misc/openssh/openssh-8.1_p1-r3.ebuild +++ b/net-misc/openssh/openssh-8.1_p1-r4.ebuild @@ -82,8 +82,9 @@ RDEPEND=" kerberos? ( virtual/krb5 ) " DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) virtual/os-headers + kernel_linux? ( >=sys-kernel/linux-headers-5.1 ) + static? ( ${LIB_DEPEND} ) " RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) diff --git a/net-misc/openssh/openssh-8.2_p1-r6.ebuild b/net-misc/openssh/openssh-8.2_p1-r7.ebuild similarity index 99% rename from net-misc/openssh/openssh-8.2_p1-r6.ebuild rename to net-misc/openssh/openssh-8.2_p1-r7.ebuild index c0ed8f5dec4..c8fff3ba950 100644 --- a/net-misc/openssh/openssh-8.2_p1-r6.ebuild +++ b/net-misc/openssh/openssh-8.2_p1-r7.ebuild @@ -81,8 +81,9 @@ RDEPEND=" kerberos? ( virtual/krb5 ) " DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) virtual/os-headers + kernel_linux? ( >=sys-kernel/linux-headers-5.1 ) + static? ( ${LIB_DEPEND} ) " RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) diff --git a/net-misc/openssh/openssh-8.3_p1-r4.ebuild b/net-misc/openssh/openssh-8.3_p1-r5.ebuild similarity index 99% rename from net-misc/openssh/openssh-8.3_p1-r4.ebuild rename to net-misc/openssh/openssh-8.3_p1-r5.ebuild index 6e93d57cf89..86300b9d810 100644 --- a/net-misc/openssh/openssh-8.3_p1-r4.ebuild +++ b/net-misc/openssh/openssh-8.3_p1-r5.ebuild @@ -84,8 +84,9 @@ RDEPEND=" kerberos? ( virtual/krb5 ) " DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) virtual/os-headers + kernel_linux? ( >=sys-kernel/linux-headers-5.1 ) + static? ( ${LIB_DEPEND} ) " RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 )