php7: update to 7.4.3
authorMichael Heimpold <redacted>
Tue, 25 Feb 2020 21:33:52 +0000 (22:33 +0100)
committerMichael Heimpold <redacted>
Tue, 25 Feb 2020 21:56:15 +0000 (22:56 +0100)
This fixes:
  - CVE-2020-7061
  - CVE-2020-7062
  - CVE-2020-7063

Signed-off-by: Michael Heimpold <redacted>
lang/php7/Makefile
lang/php7/patches/1010-zend-alloc-mm-alignment.patch [deleted file]

index 828b7f6e765f7ddda39bfebab6eb40c6495f09b7..63eb6aee47998beaf3d197df43e794e7fda4d1b0 100644 (file)
@@ -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 <mhei@heimpold.de>
 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 (file)
index 88d4a08..0000000
+++ /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
git clone https://git.99rst.org/PROJECT