summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-10-06 02:22:00 +0100
committerSam James <sam@gentoo.org>2021-10-06 02:22:48 +0100
commitf4217196ea99da29cd884994f054cc0960719661 (patch)
treedb4a51c6a794091a0a3acf439c71657806dab44a /net-misc/openssh
parentnet-misc/openssh: fix typo in einfo (diff)
downloadgentoo-f4217196ea99da29cd884994f054cc0960719661.tar.gz
gentoo-f4217196ea99da29cd884994f054cc0960719661.tar.bz2
gentoo-f4217196ea99da29cd884994f054cc0960719661.zip
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 <sam@gentoo.org>
Diffstat (limited to 'net-misc/openssh')
l---------net-misc/openssh/files/openssh-8.8_p1-hpn-15.2-glue.patch1
-rw-r--r--net-misc/openssh/openssh-8.8_p1.ebuild2
2 files changed, 1 insertions, 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 7037b34b4e57..000000000000
--- 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 064bb4adcd3a..adc52d405c7b 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