[1/1] package/php: bump version to 8.3.4

Removed patch 0006 which is included in this release.
Rebased patch 0005.

Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3
Release notes: https://www.php.net/releases/8_3_4.php
Release notes: https://www.php.net/releases/8_3_3.php
Release notes: https://www.php.net/releases/8_3_2.php
Release notes: https://www.php.net/releases/8_3_1.php
Release notes: https://www.php.net/releases/8_3_0.php

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .../0005-allow-opcache-cross-compiling.patch  |  4 +-
 package/php/0006-xxhash-h-Fix-GCC-12-Og.patch | 94 -------------------
 package/php/php.hash                          |  2 +-
 package/php/php.mk                            |  2 +-
 4 files changed, 4 insertions(+), 98 deletions(-)
 delete mode 100644 package/php/0006-xxhash-h-Fix-GCC-12-Og.patch

On 15/03/2024 22:13, Bernd Kuhls wrote:
> Removed patch 0006 which is included in this release.

  It would be nice to get the first 5 upstream as well...

> Rebased patch 0005.
> 
> Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3
> Release notes: https://www.php.net/releases/8_3_4.php
> Release notes: https://www.php.net/releases/8_3_3.php
> Release notes: https://www.php.net/releases/8_3_2.php
> Release notes: https://www.php.net/releases/8_3_1.php
> Release notes: https://www.php.net/releases/8_3_0.php
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   .../0005-allow-opcache-cross-compiling.patch  |  4 +-
>   package/php/0006-xxhash-h-Fix-GCC-12-Og.patch | 94 -------------------
>   package/php/php.hash                          |  2 +-
>   package/php/php.mk                            |  2 +-
>   4 files changed, 4 insertions(+), 98 deletions(-)
>   delete mode 100644 package/php/0006-xxhash-h-Fix-GCC-12-Og.patch
> 
> diff --git a/package/php/0005-allow-opcache-cross-compiling.patch b/package/php/0005-allow-opcache-cross-compiling.patch
> index f9bc8b3ef5..468864b0a4 100644
> --- a/package/php/0005-allow-opcache-cross-compiling.patch
> +++ b/package/php/0005-allow-opcache-cross-compiling.patch
> @@ -14,7 +14,7 @@ CFLAGS when opcache is enabled:
>   
>   Signed-off-by: Adam Duskett <aduskett@gmail.com>
>   Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> -[Bernd: rebased for 8.1.7]
> +[Bernd: rebased for 8.1.7 & 8.3.3]
>   ---
>    ext/opcache/config.m4 | 4 ----
>    1 file changed, 4 deletions(-)
> @@ -23,7 +23,7 @@ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
>   index 5492fd92..10c150ff 100644
>   --- a/ext/opcache/config.m4
>   +++ b/ext/opcache/config.m4
> -@@ -331,10 +331,6 @@ int main() {
> +@@ -315,10 +315,6 @@ int main() {
>    
>      PHP_ADD_EXTENSION_DEP(opcache, pcre)
>    
> diff --git a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch
> deleted file mode 100644
> index 9b5b9966cd..0000000000
> --- a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch
> +++ /dev/null
> @@ -1,94 +0,0 @@
> -From adcb38b1ffa8e401293e5028ee5af586fd304e00 Mon Sep 17 00:00:00 2001
> -From: Mingli Yu <mingli.yu@windriver.com>
> -Date: Wed, 12 Apr 2023 13:33:07 +0800
> -Subject: [PATCH] xxhash.h: Fix GCC 12 -Og
> -
> -Change whether to inline XXH3_hashLong_withSecret to a config option
> -
> -Ref: https://github.com/Cyan4973/xxHash/commit/ace22bddc7a366a5dd8a71e8b8247694530684ec
> -
> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> -
> -Closes GH-11062.
> -
> -Upstream: https://github.com/php/php-src/commit/adcb38b1ffa8e401293e5028ee5af586fd304e00
> -
> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ----
> - ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++--
> - 1 file changed, 33 insertions(+), 2 deletions(-)
> -
> -diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h
> -index b5bd286496c7..8e816c0584eb 100644
> ---- a/ext/hash/xxhash/xxhash.h
> -+++ b/ext/hash/xxhash/xxhash.h
> -@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr,
> -  */
> - #  define XXH_NO_INLINE_HINTS 0
> -
> -+/*!
> -+ * @def XXH3_INLINE_SECRET
> -+ * @brief Determines whether to inline the XXH3 withSecret code.
> -+ *
> -+ * When the secret size is known, the compiler can improve the performance
> -+ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret().
> -+ *
> -+ * However, if the secret size is not known, it doesn't have any benefit. This
> -+ * happens when xxHash is compiled into a global symbol. Therefore, if
> -+ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0.
> -+ *
> -+ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers
> -+ * that are *sometimes* force inline on -Og, and it is impossible to automatically
> -+ * detect this optimization level.
> -+ */
> -+#  define XXH3_INLINE_SECRET 0
> -+
> - /*!
> -  * @def XXH32_ENDJMP
> -  * @brief Whether to use a jump for `XXH32_finalize`.
> -@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr,
> - #  endif
> - #endif
> -
> -+#ifndef XXH3_INLINE_SECRET
> -+#  if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \
> -+     || !defined(XXH_INLINE_ALL)
> -+#    define XXH3_INLINE_SECRET 0
> -+#  else
> -+#    define XXH3_INLINE_SECRET 1
> -+#  endif
> -+#endif
> -+
> - #ifndef XXH32_ENDJMP
> - /* generally preferable for performance */
> - #  define XXH32_ENDJMP 0
> -@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size)
> - #  define XXH_NO_INLINE static
> - #endif
> -
> -+#if XXH3_INLINE_SECRET
> -+#  define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE
> -+#else
> -+#  define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE
> -+#endif
> -
> -
> - /* *************************************
> -@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len,
> -  * so that the compiler can properly optimize the vectorized loop.
> -  * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set.
> -  */
> --XXH_FORCE_INLINE XXH64_hash_t
> -+XXH3_WITH_SECRET_INLINE XXH64_hash_t
> - XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len,
> -                              XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen)
> - {
> -@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len,
> -  * It's important for performance to pass @secretLen (when it's static)
> -  * to the compiler, so that it can properly optimize the vectorized loop.
> -  */
> --XXH_FORCE_INLINE XXH128_hash_t
> -+XXH3_WITH_SECRET_INLINE XXH128_hash_t
> - XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len,
> -                               XXH64_hash_t seed64,
> -                               const void* XXH_RESTRICT secret, size_t secretLen)
> diff --git a/package/php/php.hash b/package/php/php.hash
> index 4ce3616de3..96f16ff2a7 100644
> --- a/package/php/php.hash
> +++ b/package/php/php.hash
> @@ -1,5 +1,5 @@
>   # From https://www.php.net/downloads.php
> -sha256  28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593  php-8.2.16.tar.xz
> +sha256  39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63  php-8.3.4.tar.xz
>   
>   # License file
>   sha256  b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a  LICENSE
> diff --git a/package/php/php.mk b/package/php/php.mk
> index 28893be4c6..99dbec9de7 100644
> --- a/package/php/php.mk
> +++ b/package/php/php.mk
> @@ -4,7 +4,7 @@
>   #
>   ################################################################################
>   
> -PHP_VERSION = 8.2.16
> +PHP_VERSION = 8.3.4
>   PHP_SITE = https://www.php.net/distributions
>   PHP_SOURCE = php-$(PHP_VERSION).tar.xz
>   PHP_INSTALL_STAGING = YES