gentoo (leap year) resync : 29.02.2020

3 files changed, 45 insertions, 1 deletions

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 713da985ccda..ad7fb7c545e6 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -3,6 +3,7 @@ AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.0k-fix-test_fuzz.patch 485 BLAKE2B 4dc2ef2b2c1935c8143c939ed6b7168fb070edced8ae47732f1ae9fdabe19887f846d75c15cea33680a54058c9a99f981a3c6a35fc84c3a6c360b4d2b920bc04 SHA512 68590479f096f3da920a5d293f27babd541ce1946944d5540f78d8341b59eeda92fe24743f7351b565e06421d7a2da77e331ebe1e5168023f6602aaa7376a038
 AUX openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch 1235 BLAKE2B 26997a474013c379a7d019d69203a5199ee17df07b28c86d06cebad3093ee62af9e4e568f3bc44ff4a5e8b555a5634d666446b35ce850c9c8668d920ef32bba6 SHA512 8ddfc077d3035b766175810b2554310935c8d1875044bf95abf8590ab5eeeb68357545566e7e8a50f95d9e62be68c72fdb58fef28497b154d44f08169645a08a
+AUX openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch 1380 BLAKE2B 3f206c0b4404f8708abe4b6eb004054c81b85a2f96715f5b110c3815eaab9aa73c27cc37c64d61cd25d8bca19ee76c58bc4cf451aa39fee3fd13f1f106442a80 SHA512 51860ca97a636801c41053d78d94e17dc1ce0d925231660ab0c307061504e16e4819d1b846cbcb5b862a1e6d4c38ca625a3da211268295b51c14367f0b387112
 AUX openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch 4247 BLAKE2B 5e181869569f9ca34190ba11fb1c66c12cfd6760aa85f423a65761886f15c120d0262528eb81847b1ed18a5e2c7610ff96790da7dac6815ddf3d025530c06349 SHA512 eafa940295b3cdfb0e9f1d1e337b4ce793f0dc8fae0fc5d0fc8e7029b9d6a99071b6b3d2b25002b715f3d5d7dc129f48700eb19e60e115610a8c4752a6d6bbfe
 AUX openssl-1.1.1d-fix-zlib.patch 1567 BLAKE2B c83a3016caa8ae6f3588a6649929d32ba890f7df776a39656bc870965aa305f89c3253b284a1f1b7bcc78b88042a01ab6fc93735d972bc4a2da1fd4f2ad225de SHA512 0b073723910cf4bd72d2e922e280cafbb807b040f4afc84f06973a45ff386b4a8505297af4894953d3fa61b8a68b42858345523705e43aa58846478976e2c566
 AUX openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch 2434 BLAKE2B ffe10db9977e70379d957df117f9e73469279673c531dd70fa78d84299efed1cc30402ca0bb5ae944b2aea649a1da1d3fa47e6b747b0f488a84f5eec2cfc10f2 SHA512 ac800f2ae4a88fcd51b61f5de5e77765b18f4a997dc334541dce995e6d3e04784752ef273fef033cde21c3d6aaf379751715b98cbce491bfd31ea4770fe78f63
@@ -15,5 +16,5 @@ DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9
 DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
 EBUILD openssl-1.0.2u.ebuild 9866 BLAKE2B 1cae2b67bf0ce3644b82a5a1c069f8192740ec31f9588f876fd5601dcb46d633972e48dc2a21be0b185ed760fba640551db11e9713c90ee101dbdbc60f551f38 SHA512 d12c2f167b7cd4769b72fcadb797536fcc57c596cf0a1a23923e91c655fdf2c237da9c1292c7495b8d0a67482a1f53d2e1697ef5b33de68f301ca34c5c721f12
 EBUILD openssl-1.1.0l.ebuild 9596 BLAKE2B b90dab20cb55693a944efa1cd6a2e9422fd7f01e618d50ba74f7f2c46c7fdf6d91621d1380e000ea9e531997dc43c38324965d1abb3c4f668cfcf0986e599c8d SHA512 699210aeaeb1796c2cabd33c917a9dec91f1d0ae7a6fd8ed3ce62f90b02e9001722615eaa767d4d479df1c3e79e6c69025f65a4353a5800a0003f36a886d9f89
-EBUILD openssl-1.1.1d-r3.ebuild 10379 BLAKE2B 24289179c01645281f67513662c331562e60996f507610541918270e8a3f7c98a107548c430086ba8684f4c8585b8b91ce30b9278f678a225221abccb145e6fc SHA512 4d8ad683c97fd3d1eb585d94aa279a5fc584e0c8cc85dbf347a9c7b93c2c0543b7c0abf28ba8ee9c1542a3c2082e001a5be852783a4db8c144841623eaaa6b32
+EBUILD openssl-1.1.1d-r3.ebuild 10437 BLAKE2B c0547f6c506f81d6c878edfb1f63ecb862cc963ec2f8ca96a78034c646f9c1e40992304345128e9b99c083af209f8e9cfa55623714a09eddd44ee065ab096497 SHA512 86a68e02a62403d3057715e5ed9b72807570e8e5fa01602536c396481cee09a4fb97031671143d2f8aa15fdc4a7239c19354e5994cb1e387df812dee8e15af28
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch b/dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch
new file mode 100644
index 000000000000..3771684b2517
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch
@@ -0,0 +1,42 @@
+From 19ded1a717b6c72c3db241f06787a353f1190755 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 18 Feb 2020 10:08:27 -0800
+Subject: [PATCH] config: Drop linux-alpha-gcc+bwx
+
+Its entry in Configuration/10-main.conf was dropped in commit
+7ead0c89185c ("Configure: fold related configurations more aggressively
+and clean-up.") probably because all but one of its bn_ops were removed
+(RC4_CHAR remained). Benchmarks on an Alpha EV7 indicate that RC4_INT is
+better than RC4_CHAR so rather than restoring the configuation, remove
+it from config.
+
+CLA: trivial
+Bug: https://bugs.gentoo.org/697840
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/11130)
+---
+ config | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/config b/config
+index 2213969f90..e39481ca2a 100755
+--- a/config
++++ b/config
+@@ -498,10 +498,7 @@ case "$GUESSOS" in
+ 	OUT="ios64-cross" ;;
+   alpha-*-linux2)
+         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
+-	case ${ISA:-generic} in
+-	*[678])	OUT="linux-alpha+bwx-$CC" ;;
+-	*)	OUT="linux-alpha-$CC" ;;
+-	esac
++	OUT="linux-alpha-$CC"
+ 	if [ "$CC" = "gcc" ]; then
+ 	    case ${ISA:-generic} in
+ 	    EV5|EV45)		__CNF_CFLAGS="$__CNF_CFLAGS -mcpu=ev5"
+-- 
+2.24.1
+
diff --git a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
index 8800d05fac78..97a1002fac78 100644
--- a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-zlib.patch
 	"${FILESDIR}"/${P}-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch
 	"${FILESDIR}"/${P}-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch
+	"${FILESDIR}"/${P}-config-Drop-linux-alpha-gcc-bwx.patch
 )
 
 S="${WORKDIR}/${MY_P}"