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 E8C55138350 for ; Wed, 5 Feb 2020 01:55:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1F1EE094F; Wed, 5 Feb 2020 01:55:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 5B509E094F for ; Wed, 5 Feb 2020 01:55:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1B69734E6CA for ; Wed, 5 Feb 2020 01:55:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE39D11F for ; Wed, 5 Feb 2020 01:55:31 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1580867692.4fecc27cb2f862b62e359ccc416777828bac7cc5.chutzpah@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.0_p1-r4.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 4fecc27cb2f862b62e359ccc416777828bac7cc5 X-VCS-Branch: master Date: Wed, 5 Feb 2020 01:55:31 +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: 5cf26a52-83e2-454f-bd67-4c490a48b6bd X-Archives-Hash: d8bf6440edbcc3008c5f2dce9dcc326f commit: 4fecc27cb2f862b62e359ccc416777828bac7cc5 Author: Patrick McLean sony com> AuthorDate: Wed Feb 5 01:48:30 2020 +0000 Commit: Patrick McLean gentoo org> CommitDate: Wed Feb 5 01:54:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fecc27c net-misc/openssh-8.0_p1-r4: fix tests in 2020, move to GLEP 81 Bug: https://bugs.gentoo.org/703016 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Patrick McLean gentoo.org> net-misc/openssh/openssh-8.0_p1-r4.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net-misc/openssh/openssh-8.0_p1-r4.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild index 3440c3c9a7a..2da7dba8cbc 100644 --- a/net-misc/openssh/openssh-8.0_p1-r4.ebuild +++ b/net-misc/openssh/openssh-8.0_p1-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit user eapi7-ver flag-o-matic multilib autotools pam systemd +inherit eapi7-ver flag-o-matic multilib autotools pam systemd # Make it more portable between straight releases # and _p? releases. @@ -67,6 +67,8 @@ LIB_DEPEND=" ) >=sys-libs/zlib-1.2.3:=[static-libs(+)]" RDEPEND=" + acct-group/sshd + acct-user/sshd !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )" @@ -123,6 +125,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch eapply "${FILESDIR}"/${PN}-8.0_p1-fix-integer-overflow-in-XMSS-private-key-parsing.patch eapply "${FILESDIR}"/${PN}-8.0_p1-fix-an-unreachable-integer-overflow-similar-to-the-XMSS-case.patch + eapply "${FILESDIR}"/${PN}-8.1_p1-tests-2020.patch use X509 || eapply "${FILESDIR}"/${PN}-8.0_p1-tests.patch [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches