From a8ff4663b592fe83bf4312512dfd8292edcf3695 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 25 Feb 2020 22:33:52 +0100 Subject: [PATCH] php7: update to 7.4.3 This fixes: - CVE-2020-7061 - CVE-2020-7062 - CVE-2020-7063 Signed-off-by: Michael Heimpold --- lang/php7/Makefile | 6 +++--- .../patches/1010-zend-alloc-mm-alignment.patch | 17 ----------------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 lang/php7/patches/1010-zend-alloc-mm-alignment.patch diff --git a/lang/php7/Makefile b/lang/php7/Makefile index 828b7f6e7..63eb6aee4 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=7.4.2 -PKG_RELEASE:=2 +PKG_VERSION:=7.4.3 +PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold PKG_LICENSE:=PHP-3.01 @@ -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:=98284deac017da0d426117ecae7599a1f1bf62ae3911e8bc16c4403a8f4bdf13 +PKG_HASH:=cf1f856d877c268124ded1ede40c9fb6142b125fdaafdc54f855120b8bc6982a PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 diff --git a/lang/php7/patches/1010-zend-alloc-mm-alignment.patch b/lang/php7/patches/1010-zend-alloc-mm-alignment.patch deleted file mode 100644 index 88d4a0835..000000000 --- a/lang/php7/patches/1010-zend-alloc-mm-alignment.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/Zend/zend_alloc.h -+++ b/Zend/zend_alloc.h -@@ -27,12 +27,12 @@ - #include "zend.h" - - #ifndef ZEND_MM_ALIGNMENT --# define ZEND_MM_ALIGNMENT ((size_t) 8) -+# define ZEND_MM_ALIGNMENT (8) - # define ZEND_MM_ALIGNMENT_LOG2 Z_L(3) - #elif ZEND_MM_ALIGNMENT < 4 - # undef ZEND_MM_ALIGNMENT - # undef ZEND_MM_ALIGNMENT_LOG2 --# define ZEND_MM_ALIGNMENT ((size_t) 4) -+# define ZEND_MM_ALIGNMENT (4) - # define ZEND_MM_ALIGNMENT_LOG2 Z_L(2) - #endif -