openwrt/packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages.git synced 2025-05-01 15:59:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

php8: update to 8.1.8 (#488)

Browse Source 
* php8: fixup libiconv usage (refs openwrt/openwrt#10024)

Since the OpenWrt's stub libiconv implementation is now gone,
we can build against musl's internal one or the external libiconv
implementation.
This needs minor adjustements in the makefile to allow PHPs build
to choose the right path when cross-compiling.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

* php8: update to 8.1.8

This fixes:
    - CVE-2022-31627

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Co-authored-by: Michael Heimpold <mhei@heimpold.de>
This commit is contained in:
breakings 2022-07-30 22:39:35 +08:00 committed by GitHub
parent 2944d7533c
commit afdf986224
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lang/php8/Makefile
View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=php
PKG_VERSION:=8.1.7
PKG_VERSION:=8.1.8
PKG_RELEASE:=1
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
@ -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:=f042322f1b5a9f7c2decb84b7086ef676896c2f7178739b9672afafa964ed0e5
PKG_HASH:=04c065515bc347bc68e0bb1ac7182669a98a731e4a17727e5731650ad3d8de4c
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
@ -270,7 +270,13 @@ else
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-iconv),)
ifeq ($(CONFIG_BUILD_NLS),y)
CONFIGURE_VARS+= iconv_impl_name="gnu_libiconv"
CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)"
else
CONFIGURE_VARS+= ac_cv_func_iconv=yes
CONFIGURE_ARGS+= --with-iconv=shared
endif
else
CONFIGURE_ARGS+= --without-iconv
endif
@ -485,7 +491,6 @@ endif
CONFIGURE_VARS+= \
ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \
php_cv_cc_rpath="no" \
iconv_impl_name="gnu_libiconv" \
ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \
ac_cv_u8t_decompose=yes \
ac_cv_have_pcre2_jit=no