From fda7e51568483590e3ad2ed9ee2f3097d5c3d25e Mon Sep 17 00:00:00 2001
From: Simon Frankenberger <simon@fraho.eu>
Date: Tue, 18 Dec 2018 23:19:02 +0000
Subject: community/php7: Update php to 7.3.6

---
 community/php7/APKBUILD                             | 21 ++++++++++-----------
 .../php7/allow-build-recode-and-imap-together.patch |  2 +-
 community/php7/fix-tests-devserver.patch            |  2 +-
 community/php7/includedir.patch                     |  2 +-
 community/php7/php7-fpm-version-suffix.patch        |  8 ++++----
 community/php7/sharedir.patch                       |  2 +-
 6 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'community')

diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD
index 38a262586c..6de1f32eb8 100644
--- a/community/php7/APKBUILD
+++ b/community/php7/APKBUILD
@@ -26,9 +26,9 @@
 
 pkgname=php7
 _pkgreal=php
-pkgver=7.2.19
+pkgver=7.3.6
 pkgrel=0
-_apiver=20170718
+_apiver=20180731
 _suffix=${pkgname#php}
 # Is this package the default (latest) PHP version?
 _default_php="yes"
@@ -37,7 +37,7 @@ url="https://secure.php.net"
 arch="all"
 license="PHP-3.01 BSD LGPL-2.0-or-later MIT Zend-2.0"
 depends="$pkgname-common"
-depends_dev="$pkgname=$pkgver-r$pkgrel autoconf pcre-dev"
+depends_dev="$pkgname=$pkgver-r$pkgrel autoconf pcre2-dev"
 # Most dependencies between extensions is auto-discovered (see _extension()).
 _depends_mysqlnd="$pkgname-openssl"
 _depends_pdo_mysql="$pkgname-pdo $pkgname-mysqlnd"
@@ -46,7 +46,7 @@ _depends_phar="$pkgname"
 # load index based on number of dependencies.
 _depends_mysqli="$pkgname-mysqlnd $pkgname-openssl"
 makedepends="
-	autoconf
+	$depends_dev
 	apache2-dev
 	aspell-dev
 	bison
@@ -75,7 +75,6 @@ makedepends="
 	libzip-dev
 	net-snmp-dev
 	openldap-dev
-	pcre-dev
 	postgresql-dev
 	re2c
 	recode-dev
@@ -667,14 +666,14 @@ _mv() {
 	mv $@
 }
 
-sha512sums="79077e73075f4aaba86699c536d8bad4929d351ad40f89c35b6f9ff0d1237b9e3d528be2918dae16519659bdaf93c5ab16fc81653fe13f667e6251871f05d722  php-7.2.19.tar.bz2
+sha512sums="3da2d1edfbffc1f7af77f391b10db1ae31ccfbabc756c49c1425b970b92157005c6c5086472769c3d5439d724d277e4dff87f6d40e97b9c3961419cde45e3b17  php-7.3.6.tar.bz2
 1c708de82d1086f272f484faf6cf6d087af7c31750cc2550b0b94ed723961b363f28a947b015b2dfc0765caea185a75f5d2c2f2b099c948b65c290924f606e4f  php7-fpm.initd
 cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691  php7-fpm.logrotate
 274bd7b0b2b7002fa84c779640af37b59258bb37b05cb7dd5c89452977d71807f628d91b523b5039608376d1f760f3425d165242ca75ee5129b2730e71c4e198  php7-module.conf
 6593accfe1ef0d9d28d257b2825823afdbfaa72bbf2e09e4ed689b644571a0d085cd4d6c92ffdff6ca9d0bb6d31cf84e5db5c4a4d88f192bba3f95a0c9b1dfd7  disabled-tests.list
 f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505  install-pear.patch
-199aecdbd3b4035aabf5379c215f82412d3c98b79a1ee186944e7fe1f0ed6f40789ea30e2355149491de6be34fc66c5e486e2a79a7e41ab2ae18706ef3ffe79b  includedir.patch
-db4c47cb254d208e4055db9287f4f4bacc0339f1f5912d2bf9c66e8a0fd0db9d53fb02aaa6d30a823a4b8504a04a9ce906706f3792684654131bb5b26aeb77b2  sharedir.patch
-6d4aa75b94ce7c88f97574a06964fafd7cb6657c1cb19c0b93776dedef05857331cce9c40f69a442ef84c66aa9137ad9f6197cc25f2384a27b8fd7350838292e  php7-fpm-version-suffix.patch
-f8ecae241a90cbc3e98aa4deb3d5d35ef555f51380e29f4e182a8060dffeb84be74f030a14c6b452668471030d78964f52795ca74275db05543ccad20ef1f2cc  allow-build-recode-and-imap-together.patch
-5bb1f90de8c543d4efffa8bc604fb3239e478d9d9625d30cd03449643906a0fe5407123403206ec57f4bf9f18893a7ff4524ccf417b2bd8bce4ee7d18815b576  fix-tests-devserver.patch"
+ebf571c5e595221b9944d7e840807ebb68c1be38bf117186e19a3bd1070310ece5918bcaa5f941679f3371a2108ad57bf179c3f90e612a5a2b982db941172859  includedir.patch
+2128eb8e7e44e4f45909f2aa83c071bf7677f5c96e29a0182ac59d5850c7b3437e4b1b67c1a20f14d65f4b370985f838ea061541690ebcfbc9cb21d64744bc7a  sharedir.patch
+fc680157c9bfaa600a82da0b2b8b96c9515eda653479bc9a9424e96683ea7c983190af0e54dcaf34256646069924df55f3f2d9a97fb11e971463a60f6df0e90f  php7-fpm-version-suffix.patch
+a07f6f54a298be6f10caa0ce68cebdf1c7cd1404ddb6a0f2c3a77fb7af3c4172bc4474ffc784f3dc92514e4da2639e558aca6dc1cffcc2e55af0743eaad7de47  allow-build-recode-and-imap-together.patch
+695ce980ea659575ba26b8443051620e83dc806e04b3bbace791f14af5c581ae4329e2c6326b554c60dab1a13f6b7c3fde49f20032540e53f80ecfade88c5b94  fix-tests-devserver.patch"
diff --git a/community/php7/allow-build-recode-and-imap-together.patch b/community/php7/allow-build-recode-and-imap-together.patch
index 555092f452..6c79786bc9 100644
--- a/community/php7/allow-build-recode-and-imap-together.patch
+++ b/community/php7/allow-build-recode-and-imap-together.patch
@@ -4,7 +4,7 @@ together, and that's what we want.
 Source: https://src.fedoraproject.org/cgit/rpms/php.git/tree/php-5.3.0-recode.patch?h=f26
 --- a/ext/recode/config9.m4
 +++ b/ext/recode/config9.m4
-@@ -4,13 +4,6 @@ dnl
+@@ -2,13 +2,6 @@ dnl
  
  dnl Check for extensions with which Recode can not work
  if test "$PHP_RECODE" != "no"; then
diff --git a/community/php7/fix-tests-devserver.patch b/community/php7/fix-tests-devserver.patch
index 67d23fa222..317ceb0ffc 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
-@@ -2009,6 +2009,9 @@
+@@ -1986,6 +1986,9 @@
  	// Does the output match what is expected?
  	$output = preg_replace("/\r\n/", "\n", trim($out));
  
diff --git a/community/php7/includedir.patch b/community/php7/includedir.patch
index 0e1eafe83d..c8874df69c 100644
--- a/community/php7/includedir.patch
+++ b/community/php7/includedir.patch
@@ -1,6 +1,6 @@
 --- a/scripts/Makefile.frag
 +++ b/scripts/Makefile.frag
-@@ -3,7 +3,7 @@
+@@ -2,7 +2,7 @@
  # Build environment install
  #
  
diff --git a/community/php7/php7-fpm-version-suffix.patch b/community/php7/php7-fpm-version-suffix.patch
index 0d4dee7c2e..36911fc88c 100644
--- a/community/php7/php7-fpm-version-suffix.patch
+++ b/community/php7/php7-fpm-version-suffix.patch
@@ -1,6 +1,6 @@
 --- a/sapi/fpm/fpm/fpm_conf.c
 +++ b/sapi/fpm/fpm/fpm_conf.c
-@@ -1205,7 +1205,7 @@
+@@ -1211,7 +1211,7 @@
  	}
  
  	if (!fpm_global_config.error_log) {
@@ -9,7 +9,7 @@
  	}
  
  #ifdef HAVE_SYSTEMD
-@@ -1216,7 +1216,7 @@
+@@ -1222,7 +1222,7 @@
  
  #ifdef HAVE_SYSLOG_H
  	if (!fpm_global_config.syslog_ident) {
@@ -18,7 +18,7 @@
  	}
  
  	if (fpm_global_config.syslog_facility < 0) {
-@@ -1710,7 +1710,7 @@
+@@ -1720,7 +1720,7 @@
  		if (fpm_globals.prefix == NULL) {
  			spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR);
  		} else {
@@ -69,7 +69,7 @@
  
  ; The timeout for serving a single request after which a PHP backtrace will be
  ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
-@@ -418,6 +418,6 @@
+@@ -425,6 +425,6 @@
  ;                specified at startup with the -d argument
  ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
  ;php_flag[display_errors] = off
diff --git a/community/php7/sharedir.patch b/community/php7/sharedir.patch
index 10bdbc4e31..f8f5b83236 100644
--- a/community/php7/sharedir.patch
+++ b/community/php7/sharedir.patch
@@ -1,6 +1,6 @@
 --- a/php.ini-production	2018-07-28 18:05:51.737130931 +0300
 +++ b/php.ini-production	2018-07-28 18:06:45.177774666 +0300
-@@ -711,7 +711,7 @@
+@@ -729,7 +729,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
-- 
cgit v1.2.3