gentoo resync : 28.04.2019

3 files changed, 61 insertions, 3 deletions

diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 98ca437a9303..a2cc2fe851d6 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,5 +1,6 @@
+AUX nettle-3.4.1-build.patch 1598 BLAKE2B ce10cb8a59bf8e2d1dea57ceff5bb2fcf2da1320034672abed770fcce54466704a6b3820a135d04d2d52881cb0d701bdd252d388bcc1ddd80b508fb3828cd237 SHA512 6b95ec112471895d3fb7c7c2c82517d113c0da604285f19b4d14ef3e4bfda6b5d32b869b97a0510c8a9f8c5828c410d99d67bba09f57a14115a6a7ed0d677b3a
 DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
 DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
-EBUILD nettle-3.4.1.ebuild 1724 BLAKE2B 12696133164dded38062000b046515123be47630bb736226aa6fc62036eb6ca1d5794e85247a57d7276fcbb043124b4b17565919466d35568722220d1e65ea2c SHA512 f1bbb3f52729bf6793c9cdd7d2dd19d145ed1f5410bf395d3c9d487b694d9c0aba8d9e6df79d67ff4d84971e1730325df1a177f91f770a76813bc446c4583e33
+EBUILD nettle-3.4.1.ebuild 1780 BLAKE2B 752989f3fea0065cc8d639b7e4efad7de8dd9c0cb12429aa3bf76a6c1a75a24f2bbc64b348b68a24a5b63b1690cb2b87d6e9e8c5617702a330a679e116a24d03 SHA512 4c1b5c661e55903540ee6394831b9dbf1c90e413a70eabfc22fa597df24c2acd29eadbddceac3ac9dc801a681e1f42efd9d857e59f3dbb0776d5ae4854af1d89
 EBUILD nettle-3.4.ebuild 1725 BLAKE2B 71eb0b92783f817ab7eeb4c0a29445e65a56b9cb6cc07a7269c3401c34f605bb49589aa999c4e2a35330b4b4dc4a324cd2c860bfcf0164a79118330b40a1160b SHA512 dcfd2513e10dc106274500d3531b1b629ded8ac9c85d37ee5c150a32f2507fc1045d269b394d91b508a991525f271637048937a4ddf9a58613b35dbbfddb32f4
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/files/nettle-3.4.1-build.patch b/dev-libs/nettle/files/nettle-3.4.1-build.patch
new file mode 100644
index 000000000000..4351dfeb5bcb
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-3.4.1-build.patch
@@ -0,0 +1,53 @@
+From f5a3a224bf00bef5669366d2ae23c2b2b13b8016 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
+Date: Wed, 26 Dec 2018 11:04:31 +0100
+Subject: [PATCH] Fix accidental use of C99 for loop.
+
+* rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop.
+Reported by Andreas Gustafsson.
+* testsuite/rsa-sec-decrypt-test.c (test_main): Likewise.
+---
+ ChangeLog                        | 6 ++++++
+ rsa-sign-tr.c                    | 3 ++-
+ testsuite/rsa-sec-decrypt-test.c | 3 ++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c
+index 59c9bd07..f824c4ca 100644
+--- a/rsa-sign-tr.c
++++ b/rsa-sign-tr.c
+@@ -239,8 +239,9 @@ static int
+ sec_equal(const mp_limb_t *a, const mp_limb_t *b, size_t limbs)
+ {
+   volatile mp_limb_t z = 0;
++  size_t i;
+ 
+-  for (size_t i = 0; i < limbs; i++)
++  for (i = 0; i < limbs; i++)
+     {
+       z |= (a[i] ^ b[i]);
+     }
+diff --git a/testsuite/rsa-sec-decrypt-test.c b/testsuite/rsa-sec-decrypt-test.c
+index 64f0b13c..fb0ed3a1 100644
+--- a/testsuite/rsa-sec-decrypt-test.c
++++ b/testsuite/rsa-sec-decrypt-test.c
+@@ -68,6 +68,7 @@ test_main(void)
+   unsigned n_size = 1024;
+   mpz_t gibberish;
+   mpz_t garbage;
++  size_t size;
+ 
+   rsa_private_key_init(&key);
+   rsa_public_key_init(&pub);
+@@ -78,7 +79,7 @@ test_main(void)
+ 
+   memset(verifybad, 'A', PAYLOAD_SIZE);
+ 
+-  for (size_t size = 1; size < 51; size++)
++  for (size = 1; size < 51; size++)
+     {
+       ASSERT (rsa_generate_keypair(&pub, &key, &random_ctx,
+ 			           (nettle_random_func *) knuth_lfib_random,
+-- 
+2.18.1
+
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
index a039517fcb34..0c477712dd3b 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -11,10 +11,10 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
-DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[${MULTILIB_USEDEP}] )"
+DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs=,${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -25,6 +25,10 @@ MULTILIB_WRAPPED_HEADERS=(
 DOCS=()
 HTML_DOCS=()
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 pkg_setup() {
 	use doc && DOCS+=(
 		nettle.pdf