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 22360158086 for ; Wed, 6 Oct 2021 01:23:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CF88E0974; Wed, 6 Oct 2021 01:23:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1CA58E0974 for ; Wed, 6 Oct 2021 01:23:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00FDA343279 for ; Wed, 6 Oct 2021 01:22:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C85E12F for ; Wed, 6 Oct 2021 01:22:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1633483368.f4217196ea99da29cd884994f054cc0960719661.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/, net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch net-misc/openssh/openssh-8.8_p1.ebuild X-VCS-Directories: net-misc/openssh/ net-misc/openssh/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f4217196ea99da29cd884994f054cc0960719661 X-VCS-Branch: master Date: Wed, 6 Oct 2021 01:22:57 +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: e834308a-1824-4586-88cb-f40514d26fa5 X-Archives-Hash: b5ee2fe3601b9cb664aecea6b177f77c commit: f4217196ea99da29cd884994f054cc0960719661 Author: Sam James gentoo org> AuthorDate: Wed Oct 6 01:22:00 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 6 01:22:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4217196 net-misc/openssh: don't symlink patch for 8.8_p1 This breaks at rsync(?): ``` A file listed in the Manifest could not be found: /usr/portage/net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch ``` Possibly some other things don't handle this well either. Signed-off-by: Sam James gentoo.org> net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch | 1 - net-misc/openssh/openssh-8.8_p1.ebuild | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch deleted file mode 120000 index 7037b34b4e5..00000000000 --- a/net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch +++ /dev/null @@ -1 +0,0 @@ -openssh-8.7_p1-hpn-15.2-glue.patch \ No newline at end of file diff --git a/net-misc/openssh/openssh-8.8_p1.ebuild b/net-misc/openssh/openssh-8.8_p1.ebuild index 064bb4adcd3..adc52d405c7 100644 --- a/net-misc/openssh/openssh-8.8_p1.ebuild +++ b/net-misc/openssh/openssh-8.8_p1.ebuild @@ -185,7 +185,7 @@ src_prepare() { mkdir "${hpn_patchdir}" || die cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch + eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-glue.patch use X509 && eapply "${FILESDIR}"/${PN}-8.7_p1-hpn-${HPN_VER}-X509-glue.patch use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch popd &>/dev/null || die