community/php7: upgrade to 7.2.7

3 files changed, 6 insertions, 94 deletions

diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD
index 9944a60fea..d614ca78bb 100644
--- a/community/php7/APKBUILD
+++ b/community/php7/APKBUILD
@@ -25,7 +25,7 @@
 
 pkgname=php7
 _pkgreal=php
-pkgver=7.2.6
+pkgver=7.2.7
 pkgrel=0
 _apiver=20170718
 _suffix=${pkgname#php}
@@ -99,7 +99,6 @@ source="http://php.net/distributions/$_pkgreal-$pkgver.tar.bz2
 	php7-fpm-version-suffix.patch
 	allow-build-recode-and-imap-together.patch
 	fix-tests-devserver.patch
-	libressl-2.7.patch
 	"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
@@ -176,8 +175,8 @@ subpackages="$subpackages $pkgname-common::noarch"
 
 # FIXME: tests fails on s390x and x86_64
 case "$CARCH" in
-x86_64) options="$options !check";;
-s390x) options="$options !check";;
+	x86_64) options="$options !check";;
+	s390x) options="$options !check";;
 esac
 
 # secfixes:
@@ -261,7 +260,6 @@ _build() {
 		--with-gd=shared \
 			--with-freetype-dir=/usr \
 			--disable-gd-jis-conv \
-			--enable-gd-native-ttf \
 			--with-jpeg-dir=/usr \
 			--with-png-dir=/usr \
 			--with-webp-dir=/usr \
@@ -638,7 +636,7 @@ _mv() {
 	mv $@
 }
 
-sha512sums="aace53b0b523484715b218e8e77ede355e73c6433e18ebd960a07c371940568d576f54455040c201b95856fa607febc19ef6539bc661a4db7984edc804c50408  php-7.2.6.tar.bz2
+sha512sums="7817e082963a4f185c5dd4a7bdd9358e25ae1dc83fa6b353313660c9907a2ead308676be86d5e1f7d586d394308e451dd8139a7879a68ab5d0c4a59fcbe73027  php-7.2.7.tar.bz2
 1c708de82d1086f272f484faf6cf6d087af7c31750cc2550b0b94ed723961b363f28a947b015b2dfc0765caea185a75f5d2c2f2b099c948b65c290924f606e4f  php7-fpm.initd
 cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691  php7-fpm.logrotate
 274bd7b0b2b7002fa84c779640af37b59258bb37b05cb7dd5c89452977d71807f628d91b523b5039608376d1f760f3425d165242ca75ee5129b2730e71c4e198  php7-module.conf
@@ -647,5 +645,4 @@ f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c93976
 199aecdbd3b4035aabf5379c215f82412d3c98b79a1ee186944e7fe1f0ed6f40789ea30e2355149491de6be34fc66c5e486e2a79a7e41ab2ae18706ef3ffe79b  includedir.patch
 6d4aa75b94ce7c88f97574a06964fafd7cb6657c1cb19c0b93776dedef05857331cce9c40f69a442ef84c66aa9137ad9f6197cc25f2384a27b8fd7350838292e  php7-fpm-version-suffix.patch
 f8ecae241a90cbc3e98aa4deb3d5d35ef555f51380e29f4e182a8060dffeb84be74f030a14c6b452668471030d78964f52795ca74275db05543ccad20ef1f2cc  allow-build-recode-and-imap-together.patch
-f8bb322e56df79dd9f391737fb8737945cc730b14c7dc2ae8688979c565a9b97f5f2a12c9fcd0d8124624a9d09bd10228147d9e999bb94909bbe249f0a50646c  fix-tests-devserver.patch
-d7d8d35669871bc466db5e8eede418722dc854ef35f52d2f2146e60bff706654323ac69f2b7d4cec1d889334418654f7888093e0fbe596711d7dbcc544b76a7a  libressl-2.7.patch"
+5bb1f90de8c543d4efffa8bc604fb3239e478d9d9625d30cd03449643906a0fe5407123403206ec57f4bf9f18893a7ff4524ccf417b2bd8bce4ee7d18815b576  fix-tests-devserver.patch"
diff --git a/community/php7/fix-tests-devserver.patch b/community/php7/fix-tests-devserver.patch
index 80a72f0f17..67d23fa222 100644
--- a/community/php7/fix-tests-devserver.patch
+++ b/community/php7/fix-tests-devserver.patch
@@ -11,7 +11,7 @@ happens here...
 
 --- a/run-tests.php
 +++ b/run-tests.php
-@@ -2005,6 +2005,9 @@
+@@ -2009,6 +2009,9 @@
  	// Does the output match what is expected?
  	$output = preg_replace("/\r\n/", "\n", trim($out));
  
diff --git a/community/php7/libressl-2.7.patch b/community/php7/libressl-2.7.patch
deleted file mode 100644
index 4ba31ac93a..0000000000
--- a/community/php7/libressl-2.7.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
-index 524192a..9c126a2 100644
---- a/ext/openssl/openssl.c
-+++ b/ext/openssl/openssl.c
-@@ -566,7 +566,7 @@ ZEND_GET_MODULE(openssl)
- #endif
- 
- /* {{{ OpenSSL compatibility functions and macros */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #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
-@@ -683,7 +683,7 @@ static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
- 	return M_ASN1_STRING_data(asn1);
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L
- 
- static int X509_get_signature_nid(const X509 *x)
- {
-@@ -1243,7 +1243,7 @@ static void php_openssl_dispose_config(struct php_x509_request * req) /* {{{ */
- }
- /* }}} */
- 
--#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
-+#if defined(PHP_WIN32) || (OPENSSL_VERSION_NUMBER >= 0x10100000L)
- #define PHP_OPENSSL_RAND_ADD_TIME() ((void) 0)
- #else
- #define PHP_OPENSSL_RAND_ADD_TIME() php_openssl_rand_add_timeval()
-@@ -1330,7 +1330,7 @@ static EVP_MD * php_openssl_get_evp_md_from_algo(zend_long algo) { /* {{{ */
- 			mdtype = (EVP_MD *) EVP_md2();
- 			break;
- #endif
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 		case OPENSSL_ALGO_DSS1:
- 			mdtype = (EVP_MD *) EVP_dss1();
- 			break;
-@@ -1418,7 +1418,7 @@ PHP_MINIT_FUNCTION(openssl)
- 	le_x509 = zend_register_list_destructors_ex(php_openssl_x509_free, NULL, "OpenSSL X.509", module_number);
- 	le_csr = zend_register_list_destructors_ex(php_openssl_csr_free, NULL, "OpenSSL X.509 CSR", module_number);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	OPENSSL_config(NULL);
- 	SSL_library_init();
- 	OpenSSL_add_all_ciphers();
-@@ -1461,7 +1461,7 @@ PHP_MINIT_FUNCTION(openssl)
- #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
- 	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);
-@@ -1599,7 +1599,7 @@ PHP_MINFO_FUNCTION(openssl)
-  */
- PHP_MSHUTDOWN_FUNCTION(openssl)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	EVP_cleanup();
- 
- 	/* prevent accessing locking callback from unloaded extension */
-@@ -3644,7 +3644,7 @@ PHP_FUNCTION(openssl_csr_get_public_key)
- 		RETURN_FALSE;
- 	}
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
- 	/* 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.
-@@ -3655,7 +3655,7 @@ PHP_FUNCTION(openssl_csr_get_public_key)
- 	/* 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
- 	/* We need to free the CSR as it was duplicated */
- 	X509_REQ_free(csr);
- #endif