From 51de4b108ee7e22fee84181cd0fbaa56b915e26a Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Mon, 7 Jun 2021 06:47:21 +0200 Subject: [PATCH] php7: update to 7.4.22 This fixes: - CVE-2021-21704 - CVE-2021-21705 Signed-off-by: Michael Heimpold (cherry picked from commits - 555d0c9a291cb9ffaefaa22da36095613857e10f - f15aba89f725f31d03edd95e03547670ca994e47 - 741d6d6768e4d3d9a85d83fb7a6dce422cefde5a) --- lang/php7/Makefile | 4 ++-- ...Add-patch-to-remove-build-timestamps-from-generated-.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/php7/Makefile b/lang/php7/Makefile index 15cf9fa894..4b1667897a 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=7.4.19 +PKG_VERSION:=7.4.22 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -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:=6c17172c4a411ccb694d9752de899bb63c72a0a3ebe5089116bc13658a1467b2 +PKG_HASH:=8e078cd7d2f49ac3fcff902490a5bb1addc885e7e3b0d8dd068f42c68297bde8 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 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 812262b4d3..f6e50e197f 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 @@ -13,7 +13,7 @@ Subject: Add patch to remove build timestamps from generated binaries. --- a/ext/standard/info.c +++ b/ext/standard/info.c -@@ -802,7 +802,6 @@ PHPAPI ZEND_COLD void php_print_info(int +@@ -803,7 +803,6 @@ PHPAPI ZEND_COLD void php_print_info(int php_info_print_box_end(); php_info_print_table_start(); php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));