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 2F316138206 for ; Fri, 12 Jan 2018 13:31:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84C5BE0986; Fri, 12 Jan 2018 13:31:04 +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 64111E0986 for ; Fri, 12 Jan 2018 13:31:04 +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 B254C335C46 for ; Fri, 12 Jan 2018 13:31:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B1841A2 for ; Fri, 12 Jan 2018 13:31:01 +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: <1515763834.16d75c9f2126651d2d65ab9bdbd7dacfbe1065c8.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-7.5_p1-r3.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 16d75c9f2126651d2d65ab9bdbd7dacfbe1065c8 X-VCS-Branch: master Date: Fri, 12 Jan 2018 13:31:01 +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-Archives-Salt: 634579f8-5f17-4969-8b01-de6a670e20ba X-Archives-Hash: 53d47db2a9acc2236cf08d8d93db106c commit: 16d75c9f2126651d2d65ab9bdbd7dacfbe1065c8 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Jan 12 13:30:34 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Jan 12 13:30:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d75c9f net-misc/openssh: Exclude s390-seccomp.patch w/ USE=X509 - already in X509 patch set Closes: https://bugs.gentoo.org/644252 Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-misc/openssh/openssh-7.5_p1-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild index 1f173bc6211..a3c62aa567f 100644 --- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild +++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -132,7 +132,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch - epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch + use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252 use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch