package/php: security bump version to 7.4.5
PATCH 1/1 package/php: security bump version to 7.4.5
Changelog: https://www.php.net/ChangeLog-7.php#7.4.5
Fixes CVE-2020-7067.
Removed patch applied upstream.
Signed-off-by Bernd Kuhls <[email protected]>
--- ...Check-for-sys-auxv.h-before-using-it.patch | 60 ------------------- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 package/php/0005-Check-for-sys-auxv.h-before-using-it.patch
package/php/0005-Check-for-sys-auxv.h-before-using-it.patch deleted +0 -60
@@ -1,60 +0,0 @@ -From f150702d5ab72878d45b722b6d7d4194db92c44a Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <[email protected]> -Date: Mon, 9 Mar 2020 15:36:48 +0100 -Subject: [PATCH] Check for sys/auxv.h before using it. - -Fixes aarch64 compile wiht uclibc-ng (does not provide -sys/auxv.h header file). - -Signed-off-by: Peter Seiderer <[email protected]> -Upstream: https://github.com/php/php-src/commit/f73528f0e0d59ac744ccb4a94a3a9d7b9f0fba1b ---- - configure.ac | 1 + - ext/standard/crc32.c | 9 +++++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5219a5f2..caf62302 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -440,6 +440,7 @@ resolv.h \ - strings.h \ - syslog.h \ - sysexits.h \ -+sys/auxv.h \ - sys/ioctl.h \ - sys/file.h \ - sys/mman.h \ -diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c -index c3ca5903..e59ab45f 100644 ---- a/ext/standard/crc32.c -+++ b/ext/standard/crc32.c -@@ -17,10 +17,15 @@ - */ - - #include "php.h" -+#ifdef PHP_WIN32 -+#include "config.w32.h" -+#else -+#include <php_config.h> -+#endif - #include "basic_functions.h" - #include "crc32.h" - --#if defined(__aarch64__) -+#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) - # include <arm_acle.h> - # if defined(__linux__) - # include <sys/auxv.h> -@@ -85,7 +90,7 @@ PHP_NAMED_FUNCTION(php_if_crc32) - - crc = crcinit^0xFFFFFFFF; - --#if defined(__aarch64__) -+#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) - if (has_crc32_insn()) { - crc = crc32_aarch64(crc, p, nr); - RETURN_LONG(crc^0xFFFFFFFF); --- -2.25.1 -
package/php/php.hash +1 -1
@@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 1873c4cefdd3df9a78dcffb2198bba5c2f0464f55c9c960720c84df483fca74c php-7.4.4.tar.xz +sha256 d059fd7f55bdc4d2eada15a00a2976697010d3631ef6f83149cc5289e1f23c2c php-7.4.5.tar.xz # License file sha256 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 LICENSE
package/php/php.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.4.4 +PHP_VERSION = 7.4.5 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES
Signature · 1 line
2.26.1
Thomas Petazzoni
AppliedPATCH 1/1 package/php: security bump version to 7.4.5
Quoted 6 lines · On Thu, 16 Apr 2020 19:41:35 +0200 Bernd Kuhls <[email protected]> wrote:
Changelog: https://www.php.net/ChangeLog-7.php#7.4.5
Fixes CVE-2020-7067.
Removed patch applied upstream.
Quoted 7 lines
Signed-off-by Bernd Kuhls <[email protected]>--- ...Check-for-sys-auxv.h-before-using-it.patch | 60 ------------------- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 package/php/0005-Check-for-sys-auxv.h-before-using-it.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/php: security bump version to 7.4.5
In reply to Bernd KuhlsQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Changelog: https://www.php.net/ChangeLog-7.php#7.4.5
Fixes CVE-2020-7067.Removed patch applied upstream.
Signed-off-by Bernd Kuhls <[email protected]>
Committed to 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard