gentoo resync : 19.03.2019

4 files changed, 83 insertions, 7 deletions

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 09f1fd538617..5aaf5975d80c 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,10 +1,11 @@
 AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e
+AUX libressl-2.8.3-solaris10.patch 1928 BLAKE2B e12372c1fba9c586e5d8c4ccd7af0c3d888dd42f4456e28091424f8c1f0ec0362f9558957752a30fabb7b06e35929cad8fd582deea58d48da4759ee0aec12b08 SHA512 39ab3dea9af735f2485108aa88e7d951563ffbdeb8a002eb76560617583df58c84d5af83a1e51d0a6f71e9709d1f1f83265b030740f6024e5d45aaf0d98290b5
 DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
 DIST libressl-2.7.5.tar.gz 3539591 BLAKE2B 0cda7307f01cea21584b3e814a20053ab128016f0b639856eb04b52f91156c74b8fdba485401e099f472ae7d9a35e9be54d169e3ddf743540595c2ffa0f979ff SHA512 00828dd115f6395186ce4c9cadb604612763f67f2ad2236a331062add8115f6494a655cbec237ae069e373ffb915ed4025c993e06456c3da69b279e5f7e2b8d4
 DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca716f8c53e423bcf09b3a8ab3542c92a99e259ded7b86f99b45cc199cd44791520a609f18c35d150365de5768eec SHA512 3967e08b3dc2277bf77057ea1f11148df7f96a2203cd21cf841902f2a1ec11320384a001d01fa58154d35612f7981bf89d5b1a60a2387713d5657677f76cc682
 DIST libressl-2.9.0.tar.gz 3400383 BLAKE2B 652ac9ff962fd187563f2f6f9ea423d682f743c8443954ad3a8adc810530711482705f0cac1a805e2f85697ed1fed156c80da913dc07c8c13cd6ce78e44b6c4d SHA512 db7fec664bef8d76204ca691c11df236abce3c85b2a51011eec5bd302e273b62fa3cfce0430980915c3f3ce34176d5ef9c187902f0b39d7fc151e69e552b499c
 EBUILD libressl-2.6.5.ebuild 1450 BLAKE2B 193d943fb6ceec65937ff2d47d2f1b677b7e643962c277f045371e9029af3ea7f0aecac2498b0bf74f1c4d7fd0160846ae3ab757bdbe24361f3304faa6f740b4 SHA512 42d2263c867c290d42c08379778b13f36eab1e185d8dff69d8970e09766596bc162d494d2ba3ff9491d2cbe781ccced9e1e4813eade213a9d94ddd22e7e3cfa2
 EBUILD libressl-2.7.5.ebuild 1382 BLAKE2B 846118a1f36d1739d1a30eba50b65ef269c75608a236cbe6718074c0202f4db91f456d1c5ba8e2b70359eaab8844e64e1731f519d4d6ce5fbd4ecc7bef88d737 SHA512 6fea592eb88bc81c0f4d1da2f3f358fd93040ffc3f740db1c9f532bcb5dc70122fa390c97fdaf012a90c0a5038fceb21478aa09335f09c4174061163dd4e02a3
-EBUILD libressl-2.8.3.ebuild 1375 BLAKE2B 1406952441df245de1e1a92e41ea74dd40ac63af4f848365ef750e25c84eeb952a4d2d178c57cf3dab6d78b072b98a8be2b23fc29390f66492fcd346acb25e20 SHA512 df35be89fece68518de552ae4039786e1e2e0bca4afa4becc7bf46d6a47a98f745b387f06ae246c4026f1a909cd31eeda301762e392075107c30d9481a87ca4d
-EBUILD libressl-2.9.0.ebuild 1382 BLAKE2B f9b3a74005957746a5b24795be9ab865512bd755296ea0d2b33c831994fa53c650396f1415353f637fc1683d4dc3f9549f8d947a7c2a604cac6a4cd9026432c3 SHA512 16355826a261f76803894d0eb8da4bbaa217f21c4c2b3e8153150c6783ace510458d6d529c3ff0aa3ee2e7d8e740389ac2ff151f3a8dfaac26980c83a25bab0c
+EBUILD libressl-2.8.3.ebuild 1546 BLAKE2B dfde0f350370a78bfb0e24d3c611436967a6ea005d78c8145b3df64530ca8c0380652caf4ca66ccb5d2237c9e00a9a8885b32244135ae77fb9659ebd0822e789 SHA512 345699ed6090234971faa190556ef2a596c025bbe7a6db417b77faff542b915a2c414e1d202e1a4fb504142e367e6581610e90dc2525a69211af615cdddfdd68
+EBUILD libressl-2.9.0.ebuild 1560 BLAKE2B f3c3d706b8120db17f245d7d2b1bdc1693fa5efb5568fc609e52ba872c89fcccef43e8e275813848a77b5502a22386133147a2085d63dc032670e9bba4a5a82c SHA512 a1587d462fc00cb5404577b37e2dcb3011bc5f0a17bf02f5a9483c3101fc8cdcafff95206a63273082ee3fb68da2162e7dcc3129eed94a23e62fed726dc14d96
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/files/libressl-2.8.3-solaris10.patch b/dev-libs/libressl/files/libressl-2.8.3-solaris10.patch
new file mode 100644
index 000000000000..20a0af0800bd
--- /dev/null
+++ b/dev-libs/libressl/files/libressl-2.8.3-solaris10.patch
@@ -0,0 +1,69 @@
+From libressl  Thu Jul 21 09:25:08 2016
+From: schily () schily ! net (Joerg Schilling)
+Date: Thu, 21 Jul 2016 09:25:08 +0000
+To: libressl
+Subject: Non-portable code in ./crypto/compat/getentropy_solaris.c
+Message-Id: <579094f4.Ca9M384ri4oiBOIa%schily () schily ! net>
+X-MARC-Message: https://marc.info/?l=libressl&m=146910737815443
+
+Hi,
+
+the code works only on Solaris based on OpenSolaris-ON from February 18 2010 or 
+later.
+
+Many people however still use Solaris 10.
+
+BTW: there is an official portable ELF way based on the AUX vector to do the same 
+but this was unfortunately not made a public libc interface, so it would need to 
+be incorporated into your code:
+
+https://sourceforge.net/p/schillix-on/schillix-on/ci/default/tree/usr/src/lib/libc/port/gen/getauxv.c
+
+___getauxptr(AT_PHDR)	returns the address of &phdr[0]
+___getauxval(AT_PHENT)	returns sizeof(phdr[0])
+___getauxval(AT_PHNUM)	returns # phdr entries
+
+
+Here is a patch to disable the non-portable code getting the code to compile at 
+all:
+
+
+
+--- a/crypto/compat/getentropy_solaris.c
++++ b/crypto/compat/getentropy_solaris.c
+@@ -72,7 +72,9 @@
+ static int getentropy_urandom(void *buf, size_t len, const char *path,
+     int devfscheck);
+ static int getentropy_fallback(void *buf, size_t len);
++#ifdef	ElfW
+ static int getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data);
++#endif
+ 
+ int
+ getentropy(void *buf, size_t len)
+@@ -244,6 +246,7 @@
+ #endif
+ };
+ 
++#ifdef	ElfW
+ static int
+ getentropy_phdr(struct dl_phdr_info *info, size_t size, void *data)
+ {
+@@ -252,6 +255,7 @@
+ 	SHA512_Update(ctx, &info->dlpi_addr, sizeof (info->dlpi_addr));
+ 	return (0);
+ }
++#endif
+ 
+ static int
+ getentropy_fallback(void *buf, size_t len)
+@@ -290,7 +294,9 @@
+ 				cnt += (int)tv.tv_usec;
+ 			}
+ 
++#ifdef	ElfW
+ 			dl_iterate_phdr(getentropy_phdr, &ctx);
++#endif
+ 
+ 			for (ii = 0; ii < sizeof(cl)/sizeof(cl[0]); ii++)
+ 				HX(clock_gettime(cl[ii], &ts) == -1, ts);
diff --git a/dev-libs/libressl/libressl-2.8.3.ebuild b/dev-libs/libressl/libressl-2.8.3.ebuild
index 9b82d21707b2..b438e7c15cac 100644
--- a/dev-libs/libressl/libressl-2.8.3.ebuild
+++ b/dev-libs/libressl/libressl-2.8.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit multilib-minimal
+inherit multilib-minimal libtool
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/46"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
@@ -34,7 +34,10 @@ src_prepare() {
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
 		configure || die "fixing CFLAGS failed"
 
+	eapply "${FILESDIR}"/${P}-solaris10.patch
 	eapply_user
+
+	elibtoolize  # for Solaris
 }
 
 multilib_src_configure() {
diff --git a/dev-libs/libressl/libressl-2.9.0.ebuild b/dev-libs/libressl/libressl-2.9.0.ebuild
index 19416d8afcc5..9356bf70659e 100644
--- a/dev-libs/libressl/libressl-2.9.0.ebuild
+++ b/dev-libs/libressl/libressl-2.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit multilib-minimal
+inherit multilib-minimal libtool
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/"
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/47"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
@@ -34,7 +34,10 @@ src_prepare() {
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
 		configure || die "fixing CFLAGS failed"
 
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
 	eapply_user
+
+	elibtoolize  # for Solaris
 }
 
 multilib_src_configure() {