php: update to 8.2.1

2 files changed, 4 insertions, 85 deletions

diff --git a/package/php/Makefile b/package/php/Makefile
index 83aa35b0d..f158d6f35 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		php
-PKG_VERSION:=		7.4.25
+PKG_VERSION:=		8.2.1
 PKG_RELEASE:=		1
-PKG_HASH:=		12a758f1d7fee544387a28d3cf73226f47e3a52fb3049f07fcc37d156d393c0a
+PKG_HASH:=		650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af
 PKG_DESCR:=		php language interpreter
 PKG_SECTION:=		dev/lang
 PKG_BUILDDEP:=		libpng
@@ -25,7 +25,7 @@ PKGSN_PHP_CLI:=		php
 
 PKG_FLAVOURS_PHP:=	MOD_BZ2 MOD_CURL MOD_FTP MOD_GD MOD_GMP MOD_MARIADB
 PKG_FLAVOURS_PHP+=	MOD_SSL MOD_SESSION MOD_SNMP MOD_SQLITE 
-PKG_FLAVOURS_PHP+=	MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB MOD_JSON
+PKG_FLAVOURS_PHP+=	MOD_SOCKETS MOD_XML MOD_SIMPLEXML MOD_ZLIB
 PKG_FLAVOURS_PHP+=	MOD_LDAP MOD_PCNTL
 
 PKGFD_MOD_BZ2:=		bzip2 support
@@ -39,12 +39,11 @@ PKGFD_MOD_GD:=		gd support
 PKGFD_MOD_GMP:=		gmp support
 PKGFB_MOD_GMP:=		gmp
 PKGFS_MOD_GMP:=		libgmp
-PKGFD_MOD_JSON:=	json support
 PKGFD_MOD_LDAP:=	ldap support
 PKGFB_MOD_LDAP:=	openldap
 PKGFS_MOD_LDAP:=	libopenldap
 PKGFD_MOD_MARIADB:=	mariadb support
-PKGFS_MOD_MARIADB:=	libmariadb
+PKGFS_MOD_MARIADB:=	libmariadbclient
 PKGFB_MOD_MARIADB:=	mariadb
 PKGFD_MOD_SSL:=		ssl support
 PKGFB_MOD_SSL:=		libressl
@@ -135,11 +134,6 @@ PKG_CONFIGURE_OPTS+=	--with-gmp=shared,"$(STAGING_TARGET_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+=	--without-gmp
 endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_JSON),)
-PKG_CONFIGURE_OPTS+=	--enable-json=shared,"$(STAGING_TARGET_DIR)/usr"
-else
-PKG_CONFIGURE_OPTS+=	--disable-json
-endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),)
 PKG_CONFIGURE_OPTS+=	--with-ldap=shared,"$(STAGING_TARGET_DIR)/usr" \
 			--with-ldap-sasl="$(STAGING_TARGET_DIR)/usr"
@@ -208,7 +202,6 @@ $(eval $(call PKG_template,PHP_MOD_CURL,php-mod-curl,$(PKG_VERSION)-${PKG_RELEAS
 $(eval $(call PKG_template,PHP_MOD_FTP,php-mod-ftp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_GD,php-mod-gd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,PHP_MOD_JSON,php-mod-json,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_MARIADB,php-mod-mariadb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -225,7 +218,6 @@ $(eval $(call PKG_mod_template,PHP_MOD_CURL,curl))
 $(eval $(call PKG_mod_template,PHP_MOD_FTP,ftp))
 $(eval $(call PKG_mod_template,PHP_MOD_GD,gd))
 $(eval $(call PKG_mod_template,PHP_MOD_GMP,gmp))
-$(eval $(call PKG_mod_template,PHP_MOD_JSON,json))
 $(eval $(call PKG_mod_template,PHP_MOD_LDAP,ldap))
 $(eval $(call PKG_mod_template,PHP_MOD_MARIADB,pdo_mysql))
 $(eval $(call PKG_mod_template,PHP_MOD_OPENSSL,openssl))
diff --git a/package/php/patches/patch-ext_standard_crc32_c b/package/php/patches/patch-ext_standard_crc32_c
deleted file mode 100644
index 2d55e1ed5..000000000
--- a/package/php/patches/patch-ext_standard_crc32_c
+++ /dev/null
@@ -1,73 +0,0 @@
---- php-7.4.25.orig/ext/standard/crc32.c	2021-10-19 17:18:19.000000000 +0200
-+++ php-7.4.25/ext/standard/crc32.c	2021-10-29 14:58:12.777563842 +0200
-@@ -20,56 +20,6 @@
- #include "basic_functions.h"
- #include "crc32.h"
- 
--#if HAVE_AARCH64_CRC32
--# include <arm_acle.h>
--# if defined(__linux__)
--#  include <sys/auxv.h>
--#  include <asm/hwcap.h>
--# endif
--
--static inline int has_crc32_insn() {
--	/* Only go through the runtime detection once. */
--	static int res = -1;
--	if (res != -1)
--		return res;
--# if defined(HWCAP_CRC32)
--	res = getauxval(AT_HWCAP) & HWCAP_CRC32;
--	return res;
--# elif defined(HWCAP2_CRC32)
--	res = getauxval(AT_HWCAP2) & HWCAP2_CRC32;
--	return res;
--# else
--	res = 0;
--	return res;
--# endif
--}
--
--# pragma GCC push_options
--# pragma GCC target ("+nothing+crc")
--static uint32_t crc32_aarch64(uint32_t crc, char *p, size_t nr) {
--	while (nr >= sizeof(uint64_t)) {
--		crc = __crc32d(crc, *(uint64_t *)p);
--		p += sizeof(uint64_t);
--		nr -= sizeof(uint64_t);
--	}
--	if (nr >= sizeof(int32_t)) {
--		crc = __crc32w(crc, *(uint32_t *)p);
--		p += sizeof(uint32_t);
--		nr -= sizeof(uint32_t);
--	}
--	if (nr >= sizeof(int16_t)) {
--		crc = __crc32h(crc, *(uint16_t *)p);
--		p += sizeof(uint16_t);
--		nr -= sizeof(uint16_t);
--	}
--	if (nr) {
--		crc = __crc32b(crc, *p);
--	}
--	return crc;
--}
--# pragma GCC pop_options
--#endif
--
- /* {{{ proto string crc32(string str)
-    Calculate the crc32 polynomial of a string */
- PHP_NAMED_FUNCTION(php_if_crc32)
-@@ -85,13 +35,6 @@ PHP_NAMED_FUNCTION(php_if_crc32)
- 
- 	crc = crcinit^0xFFFFFFFF;
- 
--#if HAVE_AARCH64_CRC32
--	if (has_crc32_insn()) {
--		crc = crc32_aarch64(crc, p, nr);
--		RETURN_LONG(crc^0xFFFFFFFF);
--	}
--#endif
--
- 	for (; nr--; ++p) {
- 		crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32tab[(crc ^ (*p)) & 0xFF ];
- 	}