From 4a9aa77fbab6b0611234fafe5cbb8a1228439687 Mon Sep 17 00:00:00 2001 From: Philip Brown Date: Sat, 20 Apr 2024 11:29:35 +0000 Subject: [PATCH] php 8.2: update to 8.2.18 --- build/php/build-82.sh | 2 +- build/php/patches-82/ldap.patch | 9 ++++----- build/php/patches-82/sockets.patch | 2 +- doc/packages.md | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build/php/build-82.sh b/build/php/build-82.sh index dd7808f83..41773f8d8 100755 --- a/build/php/build-82.sh +++ b/build/php/build-82.sh @@ -18,7 +18,7 @@ PROG=php PKG=ooce/application/php-82 -VER=8.2.17 +VER=8.2.18 SUMMARY="PHP 8.2" DESC="A popular general-purpose scripting language" diff --git a/build/php/patches-82/ldap.patch b/build/php/patches-82/ldap.patch index 34f61f648..86597c713 100644 --- a/build/php/patches-82/ldap.patch +++ b/build/php/patches-82/ldap.patch @@ -1,11 +1,10 @@ - Use the thread-safe LDAP library by default. This also prevents a conflict with the illumos libldap in /usr/lib. diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure --- a~/configure 1970-01-01 00:00:00 +++ a/configure 1970-01-01 00:00:00 -@@ -50136,7 +50136,7 @@ fi +@@ -46581,7 +46581,7 @@ fi if test "$ext_shared" = "yes"; then @@ -14,7 +13,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure if test -n "$LDAP_LIBDIR"; then if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then -@@ -50220,7 +50220,7 @@ fi +@@ -46665,7 +46665,7 @@ fi case ldap in c|c_r) ;; *) @@ -23,7 +22,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure ;; esac -@@ -50235,7 +50235,7 @@ fi +@@ -46680,7 +46680,7 @@ fi if test "$ext_shared" = "yes"; then @@ -32,7 +31,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure if test -n "$LDAP_LIBDIR"; then if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then -@@ -50319,7 +50319,7 @@ fi +@@ -46764,7 +46764,7 @@ fi case ldap in c|c_r) ;; *) diff --git a/build/php/patches-82/sockets.patch b/build/php/patches-82/sockets.patch index a4439015b..5a35e2bcd 100644 --- a/build/php/patches-82/sockets.patch +++ b/build/php/patches-82/sockets.patch @@ -1,7 +1,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure --- a~/configure 1970-01-01 00:00:00 +++ a/configure 1970-01-01 00:00:00 -@@ -75575,6 +75575,7 @@ printf "%s\n" "#define ANC_CREDS_CMSGCRE +@@ -71353,6 +71353,7 @@ $as_echo "#define ANC_CREDS_CMSGCRED 1" case $host_alias in *darwin*) PHP_SOCKETS_CFLAGS="$PHP_SOCKETS_CFLAGS -D__APPLE_USE_RFC_3542" esac diff --git a/doc/packages.md b/doc/packages.md index 7b0ec5260..c29bfefb8 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -19,7 +19,7 @@ | ooce/application/nagios-plugins | 2.4.8 | http://www.nagios-plugins.org/download/ | [omniosorg](https://github.com/omniosorg) | ooce/application/novnc | 1.4.0 | https://github.com/novnc/noVNC/releases | Currently used solely by zadm | ooce/application/php-81 | 8.1.28 | https://www.php.net/downloads.php | [omniosorg](https://github.com/omniosorg) -| ooce/application/php-82 | 8.2.17 | https://www.php.net/downloads.php | [omniosorg](https://github.com/omniosorg) +| ooce/application/php-82 | 8.2.18 | https://www.php.net/downloads.php | [omniosorg](https://github.com/omniosorg) | ooce/application/php-83 | 8.3.6 | https://www.php.net/downloads.php | [omniosorg](https://github.com/omniosorg) | ooce/application/php-XX/imagick | 3.7.0 | https://github.com/Imagick/imagick/tags | [omniosorg](https://github.com/omniosorg) | ooce/application/texlive | 20230313 | https://pi.kwarc.info/historic/systems/texlive/2023/ | [omniosorg](https://github.com/omniosorg)