gentoo resync : 30.04.2018

7 files changed, 99 insertions, 8 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 6ae2d8d952df..53d1c74c056b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,6 @@
 AUX 20php5-envd 145 BLAKE2B 06476b8fc04d1e835496b417ac752f0834ddbe8584e4fddc6db0aa5e6845b82cdea0a1355c77125375dcdd0f0a3c19de5f3a8a64ee93950f96c437a16f971567 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce
 AUX 5.6-mbstring-oniguruma-6.8.patch 880 BLAKE2B 7526874436b0fee12d0bc80487abe8a2e152491b52d2b3c041e4162284a3be580d88649704d360e85b0985d6406d2d26fe55c147a091fef1adbe7631cedafeeb SHA512 8767aa16f72fec2e4d79d8b15559ffe6afcf97c1664d963befc5565ead5eb3a5291982ece941441f57cfac21589c5e8eecf359b111b27a880919f77652e4de65
+AUX libressl-compatibility.patch 2978 BLAKE2B 714e268149d973beb0d2d76f90e15adde57acb7aed028131c6dee2a34b11980fedff487ccec67e20d9a9094014878e13bd7e180e98bb0ee304c5916324016823 SHA512 58ed57061f31da72c96cbca6f6e86d1466c96c8562dfa6551b4a8d16bd6e537b848ca34cbe57c5c220c72158e176f9cd7c07d282fe1fd69ebf5475c48bf95c26
 AUX mbstring-oniguruma-6.8.patch 1488 BLAKE2B 181aacdd5fc01e5b11246d624cd88a5d3184c00343abb8a9e36d1e224dce185a81521c0498d562e51768e4c035806f007f9cd5ed930b7abe2a3da2e5b519f5b3 SHA512 5a3334ca98da9ac22be67021e4e859c89826aec8393d4b56c4e52336a5fc689acd2579ff44ac984a40711ccaf917a810264b07a0071f8161da18e2bffd3d0c05
 AUX php-5.6-no-bison-warnings.patch 1428 BLAKE2B d37bc7a1ae803aa4a14d32f0ca5613b7bc82610248d6de5ef7b6078fdcfa944cd1c245aa919137ff0d6968c8621b5acf2638386307c46fdbb8c98eba991eb674 SHA512 8f751c638c833d535e022434cd8ace5c175703bf61dfab7bea3e52d9419700e2b85c4cca40da9ab6056e8fd9c0bc1fab55810bb1193bed14ce0a50ce653fe62b
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
@@ -23,11 +24,11 @@ EBUILD php-5.6.35-r1.ebuild 22664 BLAKE2B b394f600e69c195ee2c479467626561232e615
 EBUILD php-5.6.36.ebuild 22718 BLAKE2B 38e53cd9e1e505d6cb420162096918b4f6ad1383ac923ba35619fe53431bc741bdf4393e02f51f6ebba2b0dc23683579c8ef7968eb2ab5d8353d13912169ec17 SHA512 75f255516bba2bcd9d15f826025586d8730e01f6666b60bd689307b34631be8c055f37c2ae084ff7ea12ebd69ccb6db125d045c07b1e6bc53fa27b83e5beb1a7
 EBUILD php-7.0.27.ebuild 21672 BLAKE2B d7f777112996d44d36b912639eddac4e5d2e415033793e5cb0e6e596f54f6a6922efc6e9b8152a56e5c35220c7bfdcfa0fbb21e98b34ed23dee31ad9499f93ee SHA512 7e9cc8ba4cf70338636b7048199fed99b967a26e540ddf605a28b3fd2053daff701202f822819bb60d528c260d137f4089de60e36460834fc6b716e212c982be
 EBUILD php-7.0.28.ebuild 21774 BLAKE2B 866a588a4afef0a7e84d9ff87a318826c119b4d50c9f964e4fea0f768c7c4a1b9f8bf647ad9ac07312f810848332c1449caac6286baa3c89501d698a506aae0b SHA512 5b4c87510f915fc5668b6df7d9c3bf56790203d1eb03e2244e10e926c9b76b7c86c4f9ae182c9f2ba9df9a3f6266fa65b4571203cc1ccd23bb70148b898a6c76
-EBUILD php-7.0.29.ebuild 21775 BLAKE2B 5359f2f03446c1ee268f79631647926e6d99f43857b1f934b2fc3680a94b0d463438865b7a2476639b943ffe371eada1fd11e357ebe401ce133771229ace4bb6 SHA512 3a81494a20356b1b53d719ce655a60758fd0e9e651d657278ab2bcfa8e4301fe516ef85e3f53cba208619682306d6083149a063655c4e2dff6c4cd2f6fa0aeb8
-EBUILD php-7.0.30.ebuild 21781 BLAKE2B 3d575285b2876cd071738bef53273aa1311a71c5dc3bd2c9173444998fac2ef38293e1e0e189b4d3d37c3ff9d0442d518849f7603dfa565502e40513f8ef1d05 SHA512 d17960cd97a2014e7a947ff09e64442ce8954a679bbc37989c3bb0d9a5e2b2c828b0a9a6d305fecc68ca48bcdbe53342edbd03e912539f260827eccbe357c389
+EBUILD php-7.0.29.ebuild 21929 BLAKE2B 1660bdcd577fc71b901ff6a41201b43f77df2b99971a742750e7f783485b434beff08d427eb51eebd0cc1882b720943f7251a775959881afa5d4fd4e158df738 SHA512 16d754494fd1c1d1d000337e87b788b0d47882d71083c6d9c5ae73a428b10606c0e427385155abb4342ada54eb77d323d4e82b569db580a673d65bedfae4f247
+EBUILD php-7.0.30.ebuild 21935 BLAKE2B c6b56e35f7df342ac907d1dcb4dff621ddcd1fd9c61bb5e65fd78f73ddc7b726c59baa66c81853c0f30ca380e545d2516fb03ca6f58e5d85dd44b6bab4c86c1e SHA512 4006471855676a3a07ed6f026664b23c827aa69419e096c905e4103f99de6ddff122b1bc58983f1682aff72288372bfb290522d3e67dfc195190f7ce9629392d
 EBUILD php-7.1.13.ebuild 21538 BLAKE2B 69b0b2778758211dfdf3af43178034d0586547406a5e471b88097efe338278d799a1f1fd48c346dc0a10bcc815e3994e90cb901649325933fda1575b46e27037 SHA512 9f41de25f42053c059181833e1ce3a51eb63a0f8bfca48fc1a4bc8216b421832e3afe287e36857c568c5032622db7ff5650b6548cb5dfd91eaf7bb87277597b4
 EBUILD php-7.1.15.ebuild 21662 BLAKE2B 27de4a51f061bc318d457081d175a08df4233567299fdd2287369b597e5084c0782e5567d8d11ff467b5d65c80ab82c1d0930f906e61c1fc76e47cdeca3a93d0 SHA512 d35543b2e097b8fff290a4d6e57ed0884be55e4c9adc7727e6b63079cf54a3300ee2b60cd1678956652cb17d7bd8d5940084fc5ef89abdf82105a0bb90bc1ad5
-EBUILD php-7.1.16.ebuild 21663 BLAKE2B 50e9aefd1740f62f1c8b91c8b1becf2077b67e2cedd045ad2f4d70b8a060fef301bb0fd77ac5a0c106bef42b94185a4367512c0438f6e3425a8cb7cb4d226503 SHA512 045f7e782c8183ba0adb5cf93ba891931f99c9eb477524e2603c803930528cacd92136edb941345c165be7ac64b7ec2e6f16f01fa1c9f5b366c2c80de5ae1647
-EBUILD php-7.1.17.ebuild 21613 BLAKE2B fd84672411f2697fd7352729fa032ba867320e7f7ad320875cab65638637ea96943a43a6076287e25cf80844623c6c402fb2cedf5a0e8e9172c3f76d5ca6b18e SHA512 6fce36db211839e81820084033db690d578d6428359081b390c38b0e0ca8b17e6b01930a0c8620f8d787d9284cedf5cc2aedba9a211e596ebf357c7f799c8574
-EBUILD php-7.2.5.ebuild 22144 BLAKE2B a1a4343e37b3cc7a3c3ab83f659335d44941f53681dfc436b8fbc0f0b6c83f44b93f9afc0517a2b34bbf03e7dec4804e2a04a51ca1d18fc3897d2de916f10755 SHA512 06156857b83d4f3744bef4e4d84b255c4d63e9e151507ac34b329982d0cfc1611ed22c24984e9b0c029d116601da15fc6f932842e91bf55e1809f40725032e67
+EBUILD php-7.1.16.ebuild 21817 BLAKE2B be00263e5cc5a5393fa200e4a4e3a5403b82dd664fac24bb9045fc5e8d749ac3bad3b5936c590af3213b6c61e9ae60d6089d5eb8b70ab12465faa713ccdae4e5 SHA512 6efbd94f210eabd8e85ebf678a4c431e63146bf24aaa1fea8549ceb237fa9026b01c9a007e2a7b6a883841c665baa8ca225e71b7b26dd6b98d34651bfd8d8126
+EBUILD php-7.1.17.ebuild 21778 BLAKE2B 3e33233b4b6cc4d3b0a3fae073954e9a8fcf0d9d2205e4e2222808f9307ae4ab37b06d6541de782fcea11f24a53a3f522904bd75389d0158956722259f20a538 SHA512 6ee1f238559cb75c19fefe51d230be325b6e848847610dedb49a03ca5b67a74bf1719846d3bc990e7234f556dd8ff163e1c1b0651f84bd1f6213cdbce9ec6cc2
+EBUILD php-7.2.5.ebuild 22309 BLAKE2B 82283f0574691a9798d2857c52c2e8de3653117bca435003e6a2d89814088d960fb06ef19af331f33a7e4ec09eb837fa06fcede37711ad855c8a84262726364e SHA512 e1e1357562d18497eee855a3d0f2a15ee530519ea0204e2a27e44990e8bb5e86eaa2047aa9f93a6402ac390797e97d8fe8c04950c6edf52744236df3cf845bcb
 MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
diff --git a/dev-lang/php/files/libressl-compatibility.patch b/dev-lang/php/files/libressl-compatibility.patch
new file mode 100644
index 000000000000..3b9c39dcc599
--- /dev/null
+++ b/dev-lang/php/files/libressl-compatibility.patch
@@ -0,0 +1,65 @@
+--- a/ext/openssl/openssl.c	2018-04-04 14:26:34.583000000 +0000
++++ b/ext/openssl/openssl.c	2018-04-04 14:20:16.907000000 +0000
+@@ -73,7 +73,7 @@
+ #ifdef HAVE_OPENSSL_MD2_H
+ #define OPENSSL_ALGO_MD2	4
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #define OPENSSL_ALGO_DSS1	5
+ #endif
+ #define OPENSSL_ALGO_SHA224 6
+@@ -560,7 +560,7 @@
+ #endif
+ 
+ /* {{{ OpenSSL compatibility functions and macros */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa
+ #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh
+ #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa
+@@ -677,7 +677,7 @@
+ 	return M_ASN1_STRING_data(asn1);
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 
+ static int X509_get_signature_nid(const X509 *x)
+ {
+@@ -1324,7 +1324,7 @@
+ 			mdtype = (EVP_MD *) EVP_md2();
+ 			break;
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 		case OPENSSL_ALGO_DSS1:
+ 			mdtype = (EVP_MD *) EVP_dss1();
+ 			break;
+@@ -1450,7 +1450,7 @@
+ #ifdef HAVE_OPENSSL_MD2_H
+ 	REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2, CONST_CS|CONST_PERSISTENT);
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1, CONST_CS|CONST_PERSISTENT);
+ #endif
+ 	REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA224", OPENSSL_ALGO_SHA224, CONST_CS|CONST_PERSISTENT);
+@@ -3620,7 +3620,7 @@
+ 		RETURN_FALSE;
+ 	}
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	/* Due to changes in OpenSSL 1.1 related to locking when decoding CSR,
+ 	 * the pub key is not changed after assigning. It means if we pass
+ 	 * a private key, it will be returned including the private part.
+@@ -3631,7 +3631,7 @@
+ 	/* Retrieve the public key from the CSR */
+ 	tpubkey = X509_REQ_get_pubkey(csr);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ 	/* We need to free the CSR as it was duplicated */
+ 	X509_REQ_free(csr);
+ #endif
diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index ab385d52c394..f0c6303f1cbb 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.ebuild
@@ -163,7 +163,12 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
-PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+PATCHES=(
+	"${FILESDIR}/mbstring-oniguruma-6.8.patch"
+	# hopefully upstream will include the same version check fixes in upcoming releases
+	# patch added 20180429
+	"${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"
 
diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild
index ec866bd84bad..8de4204d1c02 100644
--- a/dev-lang/php/php-7.0.30.ebuild
+++ b/dev-lang/php/php-7.0.30.ebuild
@@ -163,7 +163,12 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
-PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+PATCHES=(
+	"${FILESDIR}/mbstring-oniguruma-6.8.patch"
+	# hopefully upstream will include the same version check fixes in upcoming releases
+	# patch added 20180429
+	"${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"
 
diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
index 55fab7c4c96b..0075b8f5bd7c 100644
--- a/dev-lang/php/php-7.1.16.ebuild
+++ b/dev-lang/php/php-7.1.16.ebuild
@@ -145,7 +145,12 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 "
 
-PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+PATCHES=(
+	"${FILESDIR}/mbstring-oniguruma-6.8.patch"
+	# hopefully upstream will include the same version check fixes in upcoming releases
+	# patch added 20180429
+	"${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"
 
diff --git a/dev-lang/php/php-7.1.17.ebuild b/dev-lang/php/php-7.1.17.ebuild
index 34ff2d2648dc..fcd553f31484 100644
--- a/dev-lang/php/php-7.1.17.ebuild
+++ b/dev-lang/php/php-7.1.17.ebuild
@@ -144,6 +144,11 @@ REQUIRED_USE="
 	session-mm? ( session !threads )
 	mysql? ( || ( mysqli pdo ) )
 "
+PATCHES=(
+	# hopefully upstream will include the same version check fixes in upcoming releases
+	# patch added 20180429
+	"${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"
 
diff --git a/dev-lang/php/php-7.2.5.ebuild b/dev-lang/php/php-7.2.5.ebuild
index 5407f131e1a1..558d91754f32 100644
--- a/dev-lang/php/php-7.2.5.ebuild
+++ b/dev-lang/php/php-7.2.5.ebuild
@@ -149,6 +149,11 @@ REQUIRED_USE="
 	mysql? ( || ( mysqli pdo ) )
 	zip-encryption? ( zip )
 "
+PATCHES=(
+	# hopefully upstream will include the same version check fixes in upcoming releases
+	# patch added 20180429
+	"${FILESDIR}/libressl-compatibility.patch"
+)
 
 PHP_MV="$(get_major_version)"