gentoo resync : 14.05.2020

3 files changed, 3 insertions, 7 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e680446d5867..aec0434bc753 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -19,7 +19,7 @@ AUX openssh-8.2_p1-X509-glue-12.4.2.patch 5118 BLAKE2B 6adb167f27a926ac591c023e0
 AUX openssh-8.2_p1-X509-glue-12.4.3.patch 5024 BLAKE2B 96568de2316e50d8390654aecbec7751eb9eb333b30fb30700161c626f93e97c5fb244d96baf32fa12d31760efdb10c80012f872412e90837f8b294082d7b087 SHA512 85c635ed067ec3c829fe4caee6bfe84e0f986f0513d744476e637c1af16af910604b879e6894300be1ce8a6a6e397149329e8fe09246e3654dcdef1ff44da4ed
 AUX openssh-8.2_p1-hpn-14.20-X509-glue.patch 4881 BLAKE2B 899065ef3b781e7e67ea630ff26ac8c3975073e9ef5b0cc345c6cee9fb2e45d2ff549b716a76211c88efb1e540ed7d79c4467e0342cfbea64fef8e6cafddac85 SHA512 d37d4fd8614bed8b1592697b911a04e2ca7d14d24e9c315a6695b4c88cdb5b4ae980e8cb68040fe54b4587675ebb3ac5694ea0d09093f8451aa65e427b6a5d95
 AUX openssh-8.2_p1-hpn-14.20-glue.patch 5294 BLAKE2B 6a778eab95e05d371fd92a02f96b926cec5c6ff90dea36065b4857ddf243b5f95bb25aa339fddb1c662b628f26d0c11858d1ca0badece0a7268d6a51e99a09be SHA512 50289c60df01a59f134a0b283ec21d6a06beccdb68de67a46b4e0e9a9bc47855b0e4dbed47300c2f042f2eb9f63e4d6d0683f3092ee358a82e9d6337a3b173fe
-AUX openssh-8.2_p1-hpn-14.20-libressl.patch 755 BLAKE2B 55a8082d3dda7e94bdfe772001487e897625a074d23d2041aea660c41e7aa2de1d14ba1a0e7146181d8159293ec896c133205a55d722f49e9a03e5bf99ba7473 SHA512 ce2038f57017375d02cb55ec6c65e6c5276c161c20a5987178003d57282fa44268ac3abe1acd2d1342ba00d125bb50945ca483c7ebd5de6feeac5f8c6f3f0e1e
+AUX openssh-8.2_p1-hpn-14.20-libressl.patch 794 BLAKE2B 36e42916a90aeb857eb7b9bc815a2720b4fad82ebcb1b53b7045f5c61f1dadfcdb4478092c5ab514d0d11832696cbb54acc18c01e5daa41eea776962065f7467 SHA512 d41e48a70f6b3b293c07f42f764dea810ed3084e54821004f97e2e5fbc1ce7110e68632fd3492779b1ec62179a3f7e34e92554c735f825952e0ce1a05fd9d474
 AUX openssh-8.2_p1-hpn-14.20-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f20a9fe4e1db8f2ce7f268ea4e0f206de89ea4ce560e82c2e91a9281a664868628426ad8c262667b7e6ad4e35247422937b98034855 SHA512 cff282e6a35a109794fca25b724b8e5024e7ded07b5dd3646489f384bdd5a42726d7cf9f814b8ebc20caed02a1a70d80e0396626bdfc13302096e15c11433dde
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
@@ -44,4 +44,4 @@ DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e
 EBUILD openssh-8.1_p1-r3.ebuild 16430 BLAKE2B 5f87ff43f472c467a8e4dc359556b970a2d9889d45d5eb09c5eac5c0d245027764ec4d6b99853baaf7324883e5be426e20515b53f48fcc7a445a05e84fb0edde SHA512 e07cf259d7a6476c5efa4db22710bd533f86188bd1f5139e2c306858dd67e3b2a83cf5c9236c9441171e25af20a14e9f1d04aa058020ac9a20e0b0d6e7d8d89d
 EBUILD openssh-8.2_p1-r5.ebuild 16798 BLAKE2B 03dd8a663c89cb2185188a0fa9f72af49def3f44a9eaaa989c95f8b2812aab7a335547ff9d22edf64522576a04705e1f957d0edfe2ecf397df760f077eb846c5 SHA512 2a1714d7c8fa18a7b3bf5333625773e2125ca21dd3096766aad341663510503276db61fa42b9cc99d0531b4fcc55ae81e31c47de7502f7c2d83bdb49b91f1448
 EBUILD openssh-8.2_p1-r6.ebuild 16856 BLAKE2B f2e13e4cf7dd8f5fa5413bf66fb78116c27dc578b3a1f3368e288b26aea5a90d3e19f8a347e79d460935123169c95583c379c9db1ed352af54ed34991d02ad43 SHA512 e9bf2cda73df7d5b5a38e0ef9ce907a9be9fdeeb871e47d80809773e4119664dd42277f0d8016f4e77ae486750540c52fbdf0712fdecbac919b282a25d1e493c
-MISC metadata.xml 2217 BLAKE2B 8a0d058b1177dc662b4136e53242e13b84d0dc46ae60a50d358dbbf03267089489c51e0a7332459e602c7198bda66e28e6886ef924b295f0f8648eae9f4e21d2 SHA512 a2a76c6948540615a71b75fe86cf55ada9aa1efdc1f6692665d33fe531fec10babc3a234b8b262a963ce0b3cdda00a5a34abcbe6e4d9bf1cce936a5e4d2ac7e1
+MISC metadata.xml 2009 BLAKE2B de9bc08ceda797610a3910f79fc382a40c3129fec66b65675e008c649f8dd7341ef12b4391136e0e0d036699ed98fe23d7b3def941cb26cd299a17408e469830 SHA512 b72696b307f01cfe3b4ccf746450fbd15d0e64436fe7668c936c1f902522df68218314d494254d8e5403dcb1ffc79a52e64212b6c49b0e464754875112048544
diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch
index aa6eea44107e..69dd22a5eeb6 100644
--- a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch
+++ b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch
@@ -5,7 +5,7 @@
  +evp_aes_ctr_mt(void)
  +{
 -+# if OPENSSL_VERSION_NUMBER >= 0x10100000UL
-++# if OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS)
+++# if (OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS)) && !defined(LIBRESSL_VERSION_NUMBER)
  +	static EVP_CIPHER *aes_ctr;
  +	aes_ctr = EVP_CIPHER_meth_new(NID_undef, 16/*block*/, 16/*key*/);
  +	EVP_CIPHER_meth_set_iv_length(aes_ctr, AES_BLOCK_SIZE);
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index bc9c3e6e16dc..2a8ac0609ece 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -5,10 +5,6 @@
     <email>base-system@gentoo.org</email>
     <name>Gentoo Base System</name>
   </maintainer>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-    <description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
-  </maintainer>
   <longdescription>
 OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that 
 increasing numbers of people on the Internet are coming to rely on. Many users of telnet,