From: Michael Heimpold <mhei@heimpold.de>
Date: Tue, 4 Oct 2022 05:45:10 +0000 (+0200)
Subject: php8: update to 8.0.24
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0498d79d74f5af53d3f88024d20a006c43e896b2;p=feed%2Fpackages.git

php8: update to 8.0.24

This fixes:
    - CVE-2022-31629
    - CVE-2022-31628

Also refresh patch to apply cleanly.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
---

diff --git a/lang/php8/Makefile b/lang/php8/Makefile
index a472949bec..534cbce139 100644
--- a/lang/php8/Makefile
+++ b/lang/php8/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
-PKG_VERSION:=8.0.20
+PKG_VERSION:=8.0.24
 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:=973fec765336ee01f47536a5db1c2eee98df9d34a41522b7b6c760159bf0a77b
+PKG_HASH:=8e6a63ac9cdabe4c345b32a54b18f348d9e50a1decda217faf2d61278d22f08b
 
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
diff --git a/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch b/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
index 39275c165b..6b2ed167a9 100644
--- a/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
+++ b/lang/php8/patches/0041-Add-patch-to-remove-build-timestamps-from-generated-.patch
@@ -54,7 +54,7 @@ Subject: Add patch to remove build timestamps from generated binaries.
  							fcgi_shutdown();
 --- a/sapi/cli/php_cli.c
 +++ b/sapi/cli/php_cli.c
-@@ -635,8 +635,8 @@ static int do_cli(int argc, char **argv)
+@@ -633,8 +633,8 @@ static int do_cli(int argc, char **argv)
  				goto out;
  
  			case 'v': /* show php version & quit */