From 40737341a8e4d2620634be77717e483b16305422 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Sat, 8 Jan 2022 00:12:31 +0100 Subject: [PATCH] Ports: Update `php` port to version 8.1.1 --- Ports/AvailablePorts.md | 2 +- Ports/php/package.sh | 4 ++-- Ports/php/patches/config.sub.patch | 11 ----------- Ports/php/patches/configure-inet_aton.patch | 11 +++++++++++ ...sable-pharcmd.patch => configure-pharcmd.patch} | 6 +++--- Ports/php/patches/configure.patch | 11 ----------- Ports/php/patches/fopen-getdtablesize.patch | 14 ++++++++++++++ Ports/php/patches/php_fopen_wrapper.c.patch | 11 ----------- 8 files changed, 31 insertions(+), 39 deletions(-) delete mode 100644 Ports/php/patches/config.sub.patch create mode 100644 Ports/php/patches/configure-inet_aton.patch rename Ports/php/patches/{configure-disable-pharcmd.patch => configure-pharcmd.patch} (62%) delete mode 100644 Ports/php/patches/configure.patch create mode 100644 Ports/php/patches/fopen-getdtablesize.patch delete mode 100644 Ports/php/patches/php_fopen_wrapper.c.patch diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index bdcd64360f..78677623ee 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -142,7 +142,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`pcre`](pcre/) | Perl-compatible Regular Expressions (PCRE) | 8.45 | https://www.pcre.org/ | | [`pcre2`](pcre2/) | Perl-compatible Regular Expressions (PCRE2) | 10.39 | https://www.pcre.org/ | | [`pfetch`](pfetch/) | pfetch | a906ff8 | https://github.com/dylanaraps/pfetch/ | -| [`php`](php/) | PHP | 8.0.10 | https://www.php.net/ | +| [`php`](php/) | PHP | 8.1.1 | https://www.php.net/ | | [`pkgconf`](pkgconf/) | pkgconf | 1.8.0 | https://github.com/pkgconf/pkgconf | | [`SDLPoP`](SDLPoP/) | Prince of Persia game | | https://github.com/NagyD/SDLPoP | | [`printf`](printf/) | printf (OpenBSD) | 6.6 | https://github.com/ibara/libpuffy | diff --git a/Ports/php/package.sh b/Ports/php/package.sh index 133202e680..7b4bcc18b1 100755 --- a/Ports/php/package.sh +++ b/Ports/php/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port=php useconfigure="true" -version="8.0.10" -files="https://www.php.net/distributions/php-${version}.tar.xz php-${version}.tar.xz 66dc4d1bc86d9c1bc255b51b79d337ed1a7a035cf71230daabbf9a4ca35795eb" +version="8.1.1" +files="https://www.php.net/distributions/php-${version}.tar.xz php-${version}.tar.xz 33c09d76d0a8bbb5dd930d9dd32e6bfd44e9efcf867563759eb5492c3aff8856" auth_type=sha256 depends=("libiconv" "libxml2" "openssl" "readline" "sqlite" "zlib") configopts=( diff --git a/Ports/php/patches/config.sub.patch b/Ports/php/patches/config.sub.patch deleted file mode 100644 index c349198426..0000000000 --- a/Ports/php/patches/config.sub.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-8.0.6/build/config.sub 2021-05-04 19:26:18.000000000 +0200 -+++ php-8.0.6-patched/build/config.sub 2021-06-03 22:49:12.463974784 +0200 -@@ -1366,7 +1366,7 @@ - | skyos* | haiku* | rdos* | toppers* | drops* | es* \ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ -- | nsk* | powerunix) -+ | nsk* | powerunix | serenity*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - qnx*) diff --git a/Ports/php/patches/configure-inet_aton.patch b/Ports/php/patches/configure-inet_aton.patch new file mode 100644 index 0000000000..dddf8b607e --- /dev/null +++ b/Ports/php/patches/configure-inet_aton.patch @@ -0,0 +1,11 @@ +--- php-8.1.1/configure 2021-12-15 03:00:45.000000000 +0100 ++++ php-8.1.1-patched/configure 2022-01-07 23:44:20.361165350 +0100 +@@ -14229,7 +14229,7 @@ + then : + found=yes + else $as_nop +- found=no ++ found=yes + fi + + fi diff --git a/Ports/php/patches/configure-disable-pharcmd.patch b/Ports/php/patches/configure-pharcmd.patch similarity index 62% rename from Ports/php/patches/configure-disable-pharcmd.patch rename to Ports/php/patches/configure-pharcmd.patch index 0861cb1e4b..9e5b4b100c 100644 --- a/Ports/php/patches/configure-disable-pharcmd.patch +++ b/Ports/php/patches/configure-pharcmd.patch @@ -1,6 +1,6 @@ ---- php-8.0.6/configure 2021-06-04 20:36:10.053986191 +0200 -+++ php-8.0.6-patched/configure 2021-06-04 20:36:20.769935808 +0200 -@@ -91478,8 +91478,8 @@ +--- php-8.1.1/configure 2022-01-07 23:44:48.117187609 +0100 ++++ php-8.1.1-patched/configure 2022-01-07 23:47:02.228957328 +0100 +@@ -96803,8 +96803,8 @@ CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then diff --git a/Ports/php/patches/configure.patch b/Ports/php/patches/configure.patch deleted file mode 100644 index 92052c2791..0000000000 --- a/Ports/php/patches/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-8.0.6/configure 2021-05-04 19:26:18.000000000 +0200 -+++ php-8.0.6-patched/configure 2021-06-03 23:48:41.087223727 +0200 -@@ -13587,7 +13587,7 @@ - if test "x$ac_cv_func___inet_aton" = xyes; then : - found=yes - else -- found=no -+ found=yes - fi - - fi diff --git a/Ports/php/patches/fopen-getdtablesize.patch b/Ports/php/patches/fopen-getdtablesize.patch new file mode 100644 index 0000000000..55abbe9581 --- /dev/null +++ b/Ports/php/patches/fopen-getdtablesize.patch @@ -0,0 +1,14 @@ +--- php-8.1.1/ext/standard/php_fopen_wrapper.c 2021-12-15 03:00:45.000000000 +0100 ++++ php-8.1.1-patched/ext/standard/php_fopen_wrapper.c 2022-01-07 23:45:58.357132436 +0100 +@@ -317,11 +317,7 @@ + return NULL; + } + +-#if HAVE_UNISTD_H +- dtablesize = getdtablesize(); +-#else + dtablesize = INT_MAX; +-#endif + + if (fildes_ori < 0 || fildes_ori >= dtablesize) { + php_stream_wrapper_log_error(wrapper, options, diff --git a/Ports/php/patches/php_fopen_wrapper.c.patch b/Ports/php/patches/php_fopen_wrapper.c.patch deleted file mode 100644 index ee75892f6d..0000000000 --- a/Ports/php/patches/php_fopen_wrapper.c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-8.0.6/ext/standard/php_fopen_wrapper.c 2021-05-04 19:26:18.000000000 +0200 -+++ php-8.0.6-patched/ext/standard/php_fopen_wrapper.c 2021-06-04 01:04:07.104126109 +0200 -@@ -317,7 +317,7 @@ - return NULL; - } - --#if HAVE_UNISTD_H -+#if !HAVE_UNISTD_H - dtablesize = getdtablesize(); - #else - dtablesize = INT_MAX;