net-misc/openssh-8.2_p1-r3: revbump, X509 12.4.2, RQUIRED_USE for bug #710586

- bump X509 patch to 12.4.2
- add `!xmss` to X509? REQUIRED_USE as it causes test failures
- Add `xmss? ( || ( ssl libressl ) )` to REQUIRED_USE for bug #710586.

Closes: https://bugs.gentoo.org/710586
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

4 files changed, 23 insertions, 22 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 13c4511b28e9..eba88b9ecd9c 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -20,7 +20,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.1.diff.gz 802693 BLAKE2B f4c6b4f0922dda02b726c43c530adb36f884aef03d52c49e7e16d01bc2adae53c1d233c5bb4ae4e434ee982508e256bee826242c0b79a368502e4988155eccb9 SHA512 cf0062dd34a034febb7a0e7863527b09b85e94df58bc1370421dbf338a727867810284b85bdcdaf5863a3eadac33fd9927f8e32e70e013ef1c23ca5653e39837
+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
diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.1-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.1-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.1.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch
index 4e9485241675..90a5d5a660f2 100644
--- a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.1.patch
+++ b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch
@@ -1,7 +1,7 @@
-diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x509-12.4.1.diff
---- a/openssh-8.2p1+x509-12.4.1.diff	2020-02-18 13:58:50.824902609 -0800
-+++ b/openssh-8.2p1+x509-12.4.1.diff	2020-02-18 13:59:57.917485338 -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 --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   	$(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 --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   	$(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 --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   	-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 --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   	-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 --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   	$(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,7 +65,7 @@ diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   	regress/unittests/sshkey/tests.o \
   	regress/unittests/sshkey/common.o \
   	regress/unittests/sshkey/test_file.o \
-@@ -39305,7 +39304,7 @@
+@@ -39344,7 +39343,7 @@
   
   regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \
       ${UNITTESTS_TEST_HOSTKEYS_OBJS} \
@@ -74,7 +74,7 @@ diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   	    -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) \
@@ -83,7 +83,7 @@ diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   	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@" ; \
@@ -92,7 +92,7 @@ diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   		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}" \
@@ -101,7 +101,7 @@ diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   		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
@@ -110,13 +110,13 @@ diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
   		sh buildpkg.sh; \
   	fi
   
-@@ -97729,16 +97728,6 @@
+@@ -98042,16 +98041,6 @@
  +	return mbtowc(NULL, s, n);
  +}
  +#endif
--diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4.1/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.1/version.h	2020-02-17 19:07:00.000000000 +0200
+-+++ 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"
@@ -124,6 +124,6 @@ diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.1.diff b/openssh-8.2p1+x50
 --#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.1/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.1/version.m4	2020-02-17 19: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.2_p1-r2.ebuild b/net-misc/openssh/openssh-8.2_p1-r3.ebuild
index 4bacf4722525..0579a0af345e 100644
--- a/net-misc/openssh/openssh-8.2_p1-r2.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.1" 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 )
 "