From 49ffbab9caa28b32ce11df1aec844839470a3b74 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sun, 26 Sep 2021 21:57:36 +0200 Subject: [PATCH 1/2] php7: fix module loading with glibc (refs #16642) Without -ldl linker flag .so extensions are not loaded when glibc is used. Fix it by providing adjusted LDFLAGS for this case. Signed-off-by: Michael Heimpold (cherry picked from commit d153c61650c0e5a55f4d9d00fcae6f257992c35f) --- lang/php7/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lang/php7/Makefile b/lang/php7/Makefile index ed1566459..97ef1fe63 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=7.4.23 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Michael Heimpold PKG_LICENSE:=PHP-3.01 @@ -175,6 +175,10 @@ CONFIGURE_ARGS+= \ --with-external-pcre \ --with-zlib="$(STAGING_DIR)/usr" +ifeq ($(CONFIG_LIBC_USE_GLIBC),y) +TARGET_LDFLAGS += -ldl +endif + ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-bcmath),) CONFIGURE_ARGS+= --enable-bcmath=shared else From 998d21563d7e936ac61c6f897ff233e2ebd583bf Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Mon, 27 Sep 2021 20:42:47 +0200 Subject: [PATCH 2/2] php7: update to 7.4.24 This fixes: - CVE-2021-21706 Signed-off-by: Michael Heimpold (cherry picked from commit 96a04adbf3a3c76360c8be6f7a18c7e9c04561d4) --- lang/php7/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/php7/Makefile b/lang/php7/Makefile index 97ef1fe63..d343986f2 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=7.4.23 -PKG_RELEASE:=3 +PKG_VERSION:=7.4.24 +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:=cea52313fcffe56343bcd3c66dbb23cd5507dc559cc2e3547cf8f5452e88a05d +PKG_HASH:=ff7658ee2f6d8af05b48c21146af5f502e121def4e76e862df5ec9fa06e98734 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0