gentoo (leap year) resync : 29.02.2020

5 files changed, 31 insertions, 51 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index a3a7ef91fedd..f3816a61d6ba 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -38,8 +38,8 @@ AUX openssh-8.1_p1-hpn-14.20-sctp-glue.patch 737 BLAKE2B b8f93cb197206eb4315c663
 AUX openssh-8.1_p1-hpn-glue.patch 7830 BLAKE2B 81c239f57d252b3a9bb1c7aed56ac67196ad11a316163db0cf6d4c75d73db1cbae038707ec788c5101f40ebf455257fa2cd1b9d7facab1081b5b856317543dd7 SHA512 2cf4e5da60e30932619c6915295b1659f53db3e784e87fcbbd25b8d167df8e29a1712235413bb2d485956494111aa682d086f9b5a36c3f55a286d40599df8b8c
 AUX openssh-8.1_p1-tests-2020.patch 1332 BLAKE2B a400f6859a5d096729c9cb6047dce8612da7fe5f8d06cc891cfb6a4c88b568be3dfc7872d5be78ef349798f501828e1505bbd5ebd49d548dbbdc6bbf987dc843 SHA512 8f4c535d3ab15e4c761f6f5d4efe762ec2bc9b5de49ee369ce9186fe40095d2065418249c89161a8ef53e893079264fd9c95b73cd74937b08fa9f563a4f00290
 AUX openssh-8.2_p1-GSSAPI-dns.patch 11647 BLAKE2B b904922f809a6616f488509a962c778837bc6003138efe79fb1ce9edf9611f14c209c11559a922497c50c3dff450286e40dfcb929414cb7f705357d2c4e3603d SHA512 f9256a80c75ae0db11df0e562ace026614f2f6d0f6c91eaed7786b2a3c37608e18ca45242385813fa34487e50f21e5d3a13bfb66adc854b7c34d278a164c3dc4
-AUX openssh-8.2_p1-X509-12.4-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a
-AUX openssh-8.2_p1-X509-glue-12.4.patch 5824 BLAKE2B 2476520076f9e7ca6c0ff53ee9efa3121f3c229d429eda243aa4a9b17e7492b5748c95414ea46b789fac0453ca272ba54d440f2ccf2baf9af08891469b18af19 SHA512 fed53756e81113d1f155dcf26ecf3beb2a4ccedf06511520ae0ad8978d1dfd144fb5412458d50726dd292980e3e201b6462786d0fd12be9ebec57c7b012b4b6c
+AUX openssh-8.2_p1-X509-12.4.2-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a
+AUX openssh-8.2_p1-X509-glue-12.4.2.patch 5118 BLAKE2B 6adb167f27a926ac591c023e0bec87d3d5df9fd331338eea16240133bb1f637c5b2b8c44358ace9d390c2e8ed5f627360b8928ab47415fc89dcc44c1c8f1de5a SHA512 e4121c9b454445613a38d68a6dcb7be27ede1878fba811678d8a8b4cd185db609b4ffe7efb6cab0121e00af84aa86c798ebcedfe43a1b1ba4c200fe8600ba7b5
 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-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f20a9fe4e1db8f2ce7f268ea4e0f206de89ea4ce560e82c2e91a9281a664868628426ad8c262667b7e6ad4e35247422937b98034855 SHA512 cff282e6a35a109794fca25b724b8e5024e7ded07b5dd3646489f384bdd5a42726d7cf9f814b8ebc20caed02a1a70d80e0396626bdfc13302096e15c11433dde
@@ -74,7 +74,7 @@ DIST openssh-8.1_p1-glibc-2.31-patches.tar.xz 1752 BLAKE2B ccab53069c0058be7ba78
 DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab490e11c97f9bcbaf8f527e46ae7fd5bade19feb3d8853079870b5c08b70a55e289cf4bf7981c11983973fa588841aeb21e650 SHA512 8d7c321423940f5a78a51a25ad5373f5db17a4a8ca7e85041e503998e0823ad22068bc652e907e9f5787858d45ce438a4bba18240fa72e088eb10b903e96b192
 DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566
 DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925
-DIST openssh-8.2p1+x509-12.4.diff.gz 802630 BLAKE2B 1d4c30aa6fb2b90c3213a04adef8fc99b28796e72b067d308d5947a6f697ca2abead2a4658356e01347efaf9eb5100aeb054b56b04d55dd716d3793fad69010e SHA512 0314496ed7466efb90f18143b70d676fbb7990fd9ec6685992f36a031b47c638597ed3773ec3c121d416cbbf8ba2d3d2e8cb9c703bfc77a82ba5aa5c3bdde0de
+DIST openssh-8.2p1+x509-12.4.2.diff.gz 805574 BLAKE2B 4df31b634308ce074d820df24984d44fdde48e115f8c2ac62afb09f28602acf9e4b080a13e5ba2e6033fe92bc4289ef00ed7adbb4af334462fbc9c82c4e7b64f SHA512 770b269929df0b7c9709fa2d07693a3ae9ebaca12fe463f7eabdaab66ee115fc02afa46dc847493d5050bff105740f2c1453fc456271d723c6e5b98d5bf7fd43
 DIST openssh-8.2p1-sctp-1.2.patch.xz 7668 BLAKE2B 717487cffd235a5dfa2d9d3f2c1983f410d400b0d23f71a9b74406ac3d2f448d76381a3b7a3244942bff4e6bdc3bc78d148b9949c78dc297d99c7330179f8176 SHA512 a5fbd827e62e91b762062a29c7bc3bf569a202bdc8c91da7d77566ff8bb958b5b9fb6f8d45df586e0d7ac07a83de6e82996e9c5cdd6b3bf43336c420d3099305
 DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf47161071aa81d0763f81b12fe4bc3d409c260783d995307d4e4ed2d16080fd74b15e4dc6dcc5648d7e66720c3ed SHA512 c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a
 DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221
@@ -85,6 +85,6 @@ EBUILD openssh-7.5_p1-r4.ebuild 11181 BLAKE2B 05ab7ab14082824bc936d189cd72087e79
 EBUILD openssh-7.7_p1-r9.ebuild 15924 BLAKE2B b4c978f231feeadbd3ed5bde9424bc4ad0533ca6ac0cafe1a33417dbd1d04182e92444f4553c1762a0aa97c45cc20dc2f869638a788b1a2df9e89cfdfeba9f8d SHA512 6104ca756ad931f08b27e9f3b3ed6519ee5f89e30ece3607a4cee81081c9d15d7c39776dd3629671cc44074d79a96e923f5d08c8dc5920f77be03c174567d6c6
 EBUILD openssh-7.9_p1-r4.ebuild 16296 BLAKE2B 836063b7f82a97e473f042ef2f2fe87521f4c72f9a4d4289205f5530bce5cb7e14ac5fac889634f82cc01a6e5bf5b9907aad57ff5040a2b5587682f44580d092 SHA512 41c100d9918aac6fae825aee354329dc8eaf63361c3125636369441eed98e1e96831f5e7dc623958d56d62ec09e5f2f74c9f93da6af9e00f220c36b7cd3f2e49
 EBUILD openssh-8.0_p1-r4.ebuild 16679 BLAKE2B cc2c63682376443a11036e10182b7bef0c61bbb0a33fb3bf8e806a79d13f1bf9208f7c47519ddc35a95b3025b91026144e60480c92954eefff62791281d6c006 SHA512 674208389a7b7b28495a5145a948f1083a25b7697b6620677b3035111e8b73d9fcfeb091b516026c0edcd6dd4c37b939a1dc21738b372029acb68e0bbcdfaa5a
-EBUILD openssh-8.1_p1-r2.ebuild 16429 BLAKE2B 3ddc0fa26dab49ef9b08dd0de5bf8257b3fd5918af145a9806b65317fba8e431d69177dcad5d4aec4965d5f6f5463e1239edffdce182c560fee36a36e9248089 SHA512 6dfda0e0c7bdc87025878ecd0ad967221888a5d0466aad9458f127c55d2dee5efa4330b0cd6f409e50f7ab77054f405a2d67d05519997b42bb79fb791c920fe9
-EBUILD openssh-8.2_p1-r1.ebuild 16764 BLAKE2B 621f9920b17281cdd137649e6a005e3cfad2a03fd312ea0db751a883880be83a10261b70ee428efdad6d5e50c5bbda197a7bc5a38d15321025b7948ae447d51d SHA512 5cd26fa5164a659936f4ebca9570317f4a4421bc7e27ade5a0db3baf993cee60a3537c5ed8a1d08eee3d09beaaca210c86ef118032a1718d8323a4cefbee9916
+EBUILD openssh-8.1_p1-r2.ebuild 16426 BLAKE2B 42562396d6bc711b5489375dc76ecc4b3307a366e9a8500f483973a7b401f1e2b4e5dd1aba79cd4d307fee80429efa3d1d90c2acc76bd71a8f7687e3a5fddc9e SHA512 73d077862441a26a20c41acbc59bd047854bfaa77fe3ad64125ec7011bb6941147bff005310deacd0550c2156e6632732543835bb128856b83a55a553987f5da
+EBUILD openssh-8.2_p1-r3.ebuild 16788 BLAKE2B f5b7d8c76dd487da270c3f4370fb69389855a2b816ecff6bda726cf6b58676f187766f521ded13c0fda33dab89acdd45d2d05a5595b0bec437e079a741a7250e SHA512 5d8bdc782ae8bc26cf534d6871dda1aef53d9bb2bde4b3ecf8999407c5b2b33c193b9be10b9076dad99bef00c5cadfb3d56d9101b03c1b49af4dd5c9735c3390
 MISC metadata.xml 2361 BLAKE2B 695d283e9b32826edf5d86ed1a26f3182d09ddf5ec40a35ac8273cf99ba042f4b6aeec563946e8c2b2ab5de798258c95810c8b23b9b725d1633b8ea7b0a105e7 SHA512 a532edee5daadb1390a02c124cf4dd0c80b956676bfe833bb5ffccc1cdc0d2aa9c5f9d10f61cb24af74aa7b731c2cc2f4b4418d94a2a75cc8f0c57ea98d57707
diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.2-tests.patch
index 1c58d0d5d823..1c58d0d5d823 100644
--- a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch
+++ b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.2-tests.patch
diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch
index 6c9d80de9bc2..90a5d5a660f2 100644
--- a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch
+++ b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch
@@ -1,7 +1,7 @@
-diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-12.4.diff
---- a/openssh-8.2p1+x509-12.4.diff	2020-02-15 10:50:06.441041447 -0800
-+++ b/openssh-8.2p1+x509-12.4.diff	2020-02-15 10:52:52.241790237 -0800
-@@ -39197,16 +39197,15 @@
+diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.2.diff b/openssh-8.2p1+x509-12.4.2.diff
+--- a/openssh-8.2p1+x509-12.4.2.diff	2020-02-23 12:25:17.296737805 -0800
++++ b/openssh-8.2p1+x509-12.4.2.diff	2020-02-23 12:26:25.347779673 -0800
+@@ -39236,16 +39236,15 @@
   
   install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
   install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
@@ -20,7 +20,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
   	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
   	$(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
-@@ -39225,7 +39224,7 @@
+@@ -39264,7 +39263,7 @@
   	$(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
   	$(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
   	$(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
@@ -29,7 +29,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   	$(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
   	$(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
   	$(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
-@@ -39239,7 +39238,7 @@
+@@ -39278,7 +39277,7 @@
   
   install-sysconf:
   	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
@@ -38,7 +38,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   	-rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
   	-rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT)
   	-rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
-@@ -39253,7 +39252,7 @@
+@@ -39292,7 +39291,7 @@
   	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
   	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
   	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
@@ -47,7 +47,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
   	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
   	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
-@@ -39261,7 +39260,7 @@
+@@ -39300,7 +39299,7 @@
   
   regress-prep:
   	$(MKDIR_P) `pwd`/regress/unittests/test_helper
@@ -56,7 +56,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   	$(MKDIR_P) `pwd`/regress/unittests/match
   	$(MKDIR_P) `pwd`/regress/unittests/utf8
   	$(MKDIR_P) `pwd`/regress/misc/kexfuzz
-@@ -39275,7 +39274,7 @@
+@@ -39314,7 +39313,7 @@
   
   regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS)
   	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \
@@ -65,25 +65,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   	regress/unittests/sshkey/tests.o \
   	regress/unittests/sshkey/common.o \
   	regress/unittests/sshkey/test_file.o \
-@@ -39285,7 +39284,7 @@
-  
-  regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
-      regress/unittests/test_helper/libtest_helper.a libssh.a
--@@ -576,8 +579,7 @@
-+@@ -576,8 +578,7 @@
-  
-  UNITTESTS_TEST_KEX_OBJS=\
-  	regress/unittests/kex/tests.o \
-@@ -39295,7 +39294,7 @@
-  
-  regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \
-      regress/unittests/test_helper/libtest_helper.a libssh.a
--@@ -587,8 +589,7 @@
-+@@ -587,8 +588,7 @@
-  
-  UNITTESTS_TEST_HOSTKEYS_OBJS=\
-  	regress/unittests/hostkeys/tests.o \
-@@ -39305,7 +39304,7 @@
+@@ -39344,7 +39343,7 @@
   
   regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \
       ${UNITTESTS_TEST_HOSTKEYS_OBJS} \
@@ -92,7 +74,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   	    -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
   
   MISC_KEX_FUZZ_OBJS=\
-@@ -39343,7 +39342,7 @@
+@@ -39382,7 +39381,7 @@
   	regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
   	regress/unittests/sshkey/test_sshkey$(EXEEXT) \
   	regress/unittests/bitmap/test_bitmap$(EXEEXT) \
@@ -101,7 +83,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   	regress/unittests/utf8/test_utf8$(EXEEXT) \
   	regress/misc/kexfuzz/kexfuzz$(EXEEXT)
   
-@@ -39400,7 +39399,7 @@
+@@ -39439,7 +39438,7 @@
   	TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
   	TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \
   	TEST_SSH_ECC="@TEST_SSH_ECC@" ; \
@@ -110,7 +92,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   		TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \
   		TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
   		TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
-@@ -39409,7 +39408,7 @@
+@@ -39448,7 +39447,7 @@
   		TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
   		TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
   		TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
@@ -119,7 +101,7 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   		TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
   		TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \
   		TEST_SSH_ECC="$${TEST_SSH_ECC}" \
-@@ -39448,7 +39447,7 @@
+@@ -39487,7 +39486,7 @@
   
   survey: survey.sh ssh
   	@$(SHELL) ./survey.sh > survey
@@ -128,23 +110,20 @@ diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-1
   		sh buildpkg.sh; \
   	fi
   
-@@ -97723,19 +97722,6 @@
+@@ -98042,16 +98041,6 @@
  +	return mbtowc(NULL, s, n);
  +}
  +#endif
--diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4/version.h
+-diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4.2/version.h
 ---- openssh-8.2p1/version.h	2020-02-14 02:40:54.000000000 +0200
--+++ openssh-8.2p1+x509-12.4/version.h	2020-02-15 09:07:00.000000000 +0200
--@@ -1,6 +1,5 @@
---/* $OpenBSD: version.h,v 1.86 2020/02/14 00:39:20 djm Exp $ */
--+/* $OpenBSD: version.h,v 1.85 2019/10/09 00:04:57 djm Exp $ */
+-+++ openssh-8.2p1+x509-12.4.2/version.h	2020-02-23 11:07:00.000000000 +0200
+-@@ -2,5 +2,4 @@
 - 
---#define SSH_VERSION	"OpenSSH_8.2"
--+#define SSH_VERSION	"OpenSSH_8.1"
+- #define SSH_VERSION	"OpenSSH_8.2"
 - 
 --#define SSH_PORTABLE	"p1"
 --#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
 -+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4/version.m4
+ diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4.2/version.m4
  --- openssh-8.2p1/version.m4	1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.2p1+x509-12.4/version.m4	2020-02-15 09:07:00.000000000 +0200
+ +++ openssh-8.2p1+x509-12.4.2/version.m4	2020-02-23 11:07:00.000000000 +0200
diff --git a/net-misc/openssh/openssh-8.1_p1-r2.ebuild b/net-misc/openssh/openssh-8.1_p1-r2.ebuild
index 7b622cca1583..5921f6945b0c 100644
--- a/net-misc/openssh/openssh-8.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.1_p1-r2.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss"
 
diff --git a/net-misc/openssh/openssh-8.2_p1-r1.ebuild b/net-misc/openssh/openssh-8.2_p1-r3.ebuild
index 23a61c4f6d01..0579a0af345e 100644
--- a/net-misc/openssh/openssh-8.2_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-8.2_p1-r3.ebuild
@@ -18,7 +18,7 @@ HPN_PATCHES=(
 )
 
 SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="12.4" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_VER="12.4.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="https://www.openssh.com/"
@@ -41,7 +41,8 @@ REQUIRED_USE="
 	ldns? ( ssl )
 	pie? ( !static )
 	static? ( !kerberos !pam )
-	X509? ( !sctp !security-key ssl )
+	X509? ( !sctp !security-key ssl !xmss )
+	xmss? ( || ( ssl libressl ) )
 	test? ( ssl )
 "
 
@@ -143,7 +144,7 @@ src_prepare() {
 		popd &>/dev/null || die
 
 		eapply "${WORKDIR}"/${X509_PATCH%.*}
-		eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.patch
+		eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch
 
 		# We need to patch package version or any X.509 sshd will reject our ssh client
 		# with "userauth_pubkey: could not parse key: string is too large [preauth]"