From de6a1251f46ce6c6d1c5ff78c4a89d9bf01664d4 Mon Sep 17 00:00:00 2001
From: EWouters <6179932+EWouters@users.noreply.github.com>
Date: Sat, 2 Sep 2023 00:00:54 +0200
Subject: [PATCH] Ports/php: Update php to version 8.2.10

---
 Ports/AvailablePorts.md                                   | 2 +-
 Ports/php/package.sh                                      | 4 ++--
 Ports/php/patches/0001-Build-Disable-pharcmd.patch        | 4 ++--
 .../patches/0002-Build-Force-inet_aton-detection.patch    | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index b75fa75575..42da57139f 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -250,7 +250,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`pcre2`](pcre2/)                                   | Perl-compatible Regular Expressions (PCRE2)                     | 10.42                     | https://www.pcre.org/                                                          |
 | [`perl5`](perl5/)                                   | Perl                                                            | 5.38.0                    | https://www.perl.org/                                                          |
 | [`pfetch`](pfetch/)                                 | pfetch                                                          | a906ff8                   | https://github.com/dylanaraps/pfetch/                                          |
-| [`php`](php/)                                       | PHP                                                             | 8.2.8                     | https://www.php.net/                                                           |
+| [`php`](php/)                                       | PHP                                                             | 8.2.10                    | https://www.php.net/                                                           |
 | [`pixman`](pixman/)                                 | pixman                                                          | 0.40.0                    | http://pixman.org                                                              |
 | [`pkgconf`](pkgconf/)                               | pkgconf                                                         | 1.8.0                     | https://github.com/pkgconf/pkgconf                                             |
 | [`poppler`](poppler/)                               | Poppler is a PDF rendering library                              | 23.08.0                   | https://poppler.freedesktop.org/                                               |
diff --git a/Ports/php/package.sh b/Ports/php/package.sh
index 30891556f6..5849e8b478 100755
--- a/Ports/php/package.sh
+++ b/Ports/php/package.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port='php'
 useconfigure='true'
-version='8.2.8'
+version='8.2.10'
 files=(
-    "https://www.php.net/distributions/php-${version}.tar.xz#cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801"
+    "https://www.php.net/distributions/php-${version}.tar.xz#561dc4acd5386e47f25be76f2c8df6ae854756469159248313bcf276e282fbb3"
 )
 depends=(
     'libiconv'
diff --git a/Ports/php/patches/0001-Build-Disable-pharcmd.patch b/Ports/php/patches/0001-Build-Disable-pharcmd.patch
index e2be317a7d..4fadd64020 100644
--- a/Ports/php/patches/0001-Build-Disable-pharcmd.patch
+++ b/Ports/php/patches/0001-Build-Disable-pharcmd.patch
@@ -10,10 +10,10 @@ not try to run phar locally.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ee2d248105f6af61540dfde3eb9e7297c515f0ea..6190cfb73f01cc68d439cb99fdfc9f18341a4cd6 100644
+index 42d6a3b6ca968b488c871f7c6f5395530481138b..dd244cdbc28e650237249ae8b636f6034a578826 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1567,8 +1567,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
+@@ -1639,8 +1639,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
  
  if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then
diff --git a/Ports/php/patches/0002-Build-Force-inet_aton-detection.patch b/Ports/php/patches/0002-Build-Force-inet_aton-detection.patch
index 3c1ea450a3..fd85b92b7f 100644
--- a/Ports/php/patches/0002-Build-Force-inet_aton-detection.patch
+++ b/Ports/php/patches/0002-Build-Force-inet_aton-detection.patch
@@ -11,12 +11,12 @@ and tries to redefine it with its own implementation in
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6190cfb73f01cc68d439cb99fdfc9f18341a4cd6..b5b8bcc21dd2330adbe81bbc5ad0b6ec256b1ce9 100644
+index dd244cdbc28e650237249ae8b636f6034a578826..1cbb6027c42d09b8fe0bc6f69afd023528795d74 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -365,8 +365,7 @@ if test "$ac_cv_func_dlopen" = "yes"; then
- fi
- AC_CHECK_LIB(m, sin)
+@@ -383,8 +383,7 @@ case $host_alias in
+     ;;
+ esac
  
 -dnl Check for inet_aton in -lc, -lbind and -lresolv.
 -PHP_CHECK_FUNC(inet_aton, resolv, bind)