diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2018-01-23 15:52:20 -0800 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2018-01-23 15:52:20 -0800 |
| commit | 2803a8b211944e2f4f29c8ae92ba8eee86ba9d56 (patch) | |
| tree | c2ee91ad46dff84a01356a3a86d27b32ab7c7046 /net-misc/openssh | |
| parent | sys-kernel/dracut: stable 046-r1 for sparc, bug #643808 (diff) | |
| download | gentoo-2803a8b211944e2f4f29c8ae92ba8eee86ba9d56.tar.gz gentoo-2803a8b211944e2f4f29c8ae92ba8eee86ba9d56.tar.bz2 gentoo-2803a8b211944e2f4f29c8ae92ba8eee86ba9d56.zip | |
net-misc/openssh: Add fix for bug 634594 from zmedico
Not revbumping since hpn has been package.use.mask-ed.
Closes: https://bugs.gentoo.org/634594
Package-Manager: Portage-2.3.20, Repoman-2.3.6
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/Manifest | 1 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch | 4 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-7.6_p1-r3.ebuild | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index c23db685249e..bcaa83f5329a 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -5,6 +5,7 @@ DIST openssh-7.5p1.tar.gz 1510857 BLAKE2B 505764a210018136456c0f5dd40ad9f1383551 DIST openssh-7.6_p1-sctp.patch.xz 6996 BLAKE2B 4a857afdc8fa5cb2bfb9dd1805ac6343e774ac7423e2f4439f2adf585aae18fcf55d63f7f5421e716d76e2dd0205b186b6fea1f53132453ea82f0821cea3124c SHA512 8445a9a8ae8e8baa67c8f386117877ba3f39f33c9cdaff341c8d5fb4ce9dfe22f26d5aedc2b0d4aab67864994ec5a6a487d18b728bd5d5c6efe14175eb9c8151 DIST openssh-7.6p1+x509-11.0.diff.gz 440219 BLAKE2B 9329a7cf8575c21c31ec73f8ca1084708de34a5b530699d8be2a2a75e1ce0d37210a897c894ab75ee8e2ad0f0802d483d041b1bf3cf3ea46a4a423f1350f42d2 SHA512 add86ecdaa696d997f869e6878aaaef285590cc5eddf301be651944bbc6c80af6a891bad6f6aaa4b6e9919ad865a27dc6f45a6e0b923ca52c04f06523fa3197a DIST openssh-7.6p1+x509-11.1.diff.gz 451725 BLAKE2B 1397c05539ce7532f5e6bf33fc16d5661c32365e127ab1134c0a12c70f0645b05eb05d3ebd9bf64ed59cb94a63cbe8466ac87c9831605230d1ccd578a736904b SHA512 8d445911d8b28fb922a2a0ddb4b7783f81bc258af708148541d30cb79012789cc319bc2031b4584c4c5504480b70077e675be01070fd3065dc4f5ddee89ad8f1 +DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f54e3ee54e0d05a24d3331613c241e684a43354b6100ee2be76e5b2dcc8f0444fbae5d146830d634e53a85124d5e553759a552 SHA512 0e2c62cdec360090b359edfd5bbe894fb25d22e387677e8a5d6cf6a0807b0572fda30b90c30390d5b68e359e9958cb1c65abae4afd9af5892c3f64f6f8001956 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch index d55656aae974..2ed6a7b54a66 100644 --- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch +++ b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch @@ -1,5 +1,5 @@ ---- a/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch 2017-10-11 15:02:11.850912525 -0700 -+++ b/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch 2017-10-11 15:35:06.223424844 -0700 +--- a/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch 2017-10-11 15:02:11.850912525 -0700 ++++ b/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch 2017-10-11 15:35:06.223424844 -0700 @@ -907,9 +907,9 @@ @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1) { diff --git a/net-misc/openssh/openssh-7.6_p1-r3.ebuild b/net-misc/openssh/openssh-7.6_p1-r3.ebuild index 635abd42b3df..d68f65f1d37b 100644 --- a/net-misc/openssh/openssh-7.6_p1-r3.ebuild +++ b/net-misc/openssh/openssh-7.6_p1-r3.ebuild @@ -9,7 +9,7 @@ inherit user flag-o-matic multilib autotools pam systemd versionator # and _p? releases. PARCH=${P/_} -HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz" +HPN_PATCH="${PARCH}-hpnssh14v12-r1.tar.xz" SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz" LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz" X509_VER="11.1" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz" @@ -119,8 +119,8 @@ src_prepare() { pushd "${WORKDIR}" >/dev/null eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch popd >/dev/null + save_version X509 fi - save_version X509 eapply "${WORKDIR}"/${X509_PATCH%.*} fi |