From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A858213888F for ; Thu, 29 Oct 2015 17:01:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58249E07C9; Thu, 29 Oct 2015 17:01:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6F2DE07C9 for ; Thu, 29 Oct 2015 17:01:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93D41340ABF for ; Thu, 29 Oct 2015 17:01:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EB721A02 for ; Thu, 29 Oct 2015 17:01:08 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1446138038.d90c920dbd83c1ec22f068623e15e4c421d11ba3.vapier@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.1_p1-r1.ebuild net-misc/openssh/openssh-7.1_p1-r2.ebuild net-misc/openssh/openssh-7.1_p1.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: d90c920dbd83c1ec22f068623e15e4c421d11ba3 X-VCS-Branch: master Date: Thu, 29 Oct 2015 17:01:08 +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: f79fffa6-b66a-4cb0-949e-61fb18ac1bcd X-Archives-Hash: c06245711419340e0f2ae0398dd35be8 commit: d90c920dbd83c1ec22f068623e15e4c421d11ba3 Author: Mike Frysinger gentoo org> AuthorDate: Thu Oct 29 17:00:05 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Oct 29 17:00:38 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d90c920d net-misc/openssh: make hpn-x509 glue patch application more robust #564380 Rather than encode the full name of the hpn patchset in the glue patch, apply it from the hpn patchset dir. net-misc/openssh/openssh-7.1_p1-r1.ebuild | 2 ++ net-misc/openssh/openssh-7.1_p1-r2.ebuild | 4 +++- net-misc/openssh/openssh-7.1_p1.ebuild | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/net-misc/openssh/openssh-7.1_p1-r1.ebuild b/net-misc/openssh/openssh-7.1_p1-r1.ebuild index 41f49c8..beebed5 100644 --- a/net-misc/openssh/openssh-7.1_p1-r1.ebuild +++ b/net-misc/openssh/openssh-7.1_p1-r1.ebuild @@ -116,7 +116,9 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null + pushd ${HPN_PATCH%.*.*} >/dev/null epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} diff --git a/net-misc/openssh/openssh-7.1_p1-r2.ebuild b/net-misc/openssh/openssh-7.1_p1-r2.ebuild index 7e645fd..048f319 100644 --- a/net-misc/openssh/openssh-7.1_p1-r2.ebuild +++ b/net-misc/openssh/openssh-7.1_p1-r2.ebuild @@ -9,7 +9,7 @@ inherit eutils user flag-o-matic multilib autotools pam systemd versionator # and _p? releases. PARCH=${P/_} -HPN_PATCH="${PN}-7.1p1-hpnssh14v9.tar.xz" +HPN_PATCH="${PARCH}-hpnssh14v9.tar.xz" LDAP_PATCH="${PN}-lpk-6.8p1-0.3.14.patch.xz" X509_VER="8.6" X509_PATCH="${PN}-${PV//_/}+x509-${X509_VER}.diff.gz" @@ -116,7 +116,9 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null + pushd ${HPN_PATCH%.*.*} >/dev/null epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*} diff --git a/net-misc/openssh/openssh-7.1_p1.ebuild b/net-misc/openssh/openssh-7.1_p1.ebuild index a9a499e..45ed87d 100644 --- a/net-misc/openssh/openssh-7.1_p1.ebuild +++ b/net-misc/openssh/openssh-7.1_p1.ebuild @@ -113,7 +113,9 @@ src_prepare() { if use X509 ; then pushd .. >/dev/null + pushd ${HPN_PATCH%.*.*} >/dev/null epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch + popd >/dev/null epatch "${FILESDIR}"/${PN}-7.0_p1-sctp-x509-glue.patch popd >/dev/null epatch "${WORKDIR}"/${X509_PATCH%.*}