diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2021-09-01 07:51:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-01 07:51:07 +0200 |
| commit | 1f132a184b60b3fc5e263a88d4b6559cd3adf819 (patch) | |
| tree | bba3b2f00a8c3956cdeb4343da34635a691c6258 | |
| parent | 37ca4e923d2efe21a4c6c8d8d9ab8b6720a4cd3a (diff) | |
| parent | fb9e05615b40a8015168d8e6d8ab1cb9eb636fd5 (diff) | |
Merge pull request #16508 from mhei/php7-update
php7: update to 7.4.23
| -rw-r--r-- | lang/php7/Makefile | 4 | ||||
| -rw-r--r-- | lang/php7/patches/0032-Use-system-timezone.patch | 2 | ||||
| -rw-r--r-- | lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lang/php7/Makefile b/lang/php7/Makefile index 4b1667897..0876dcbc4 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=7.4.22 +PKG_VERSION:=7.4.23 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de> @@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=8e078cd7d2f49ac3fcff902490a5bb1addc885e7e3b0d8dd068f42c68297bde8 +PKG_HASH:=cea52313fcffe56343bcd3c66dbb23cd5507dc559cc2e3547cf8f5452e88a05d PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 diff --git a/lang/php7/patches/0032-Use-system-timezone.patch b/lang/php7/patches/0032-Use-system-timezone.patch index 14e5b8660..588690297 100644 --- a/lang/php7/patches/0032-Use-system-timezone.patch +++ b/lang/php7/patches/0032-Use-system-timezone.patch @@ -15,7 +15,7 @@ To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezon --- a/ext/date/php_date.c +++ b/ext/date/php_date.c -@@ -1032,6 +1032,23 @@ static char* guess_timezone(const timeli +@@ -1039,6 +1039,23 @@ static char* guess_timezone(const timeli DATEG(timezone_valid) = 1; return DATEG(default_timezone); } diff --git a/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch b/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch index f6e50e197..d39042a48 100644 --- a/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch +++ b/lang/php7/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch @@ -47,7 +47,7 @@ Subject: Add patch to remove build timestamps from generated binaries. *aix*) --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c -@@ -2400,9 +2400,9 @@ parent_loop_end: +@@ -2401,9 +2401,9 @@ parent_loop_end: SG(headers_sent) = 1; SG(request_info).no_headers = 1; #if ZEND_DEBUG @@ -74,7 +74,7 @@ Subject: Add patch to remove build timestamps from generated binaries. #else --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c -@@ -1717,9 +1717,9 @@ int main(int argc, char *argv[]) +@@ -1718,9 +1718,9 @@ int main(int argc, char *argv[]) SG(request_info).no_headers = 1; #if ZEND_DEBUG |