summaryrefslogtreecommitdiffstats
path: root/source/n/php
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/php')
-rwxr-xr-xsource/n/php/fetch-php.sh4
-rw-r--r--source/n/php/mod_php.conf.example2
-rwxr-xr-xsource/n/php/php.SlackBuild11
-rw-r--r--source/n/php/php.enchant-2.patch76
-rw-r--r--source/n/php/php.imap.api.diff89
-rw-r--r--source/n/php/php.ini-development.diff13
6 files changed, 50 insertions, 145 deletions
diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh
index 66c1d5f62..aec301cb7 100755
--- a/source/n/php/fetch-php.sh
+++ b/source/n/php/fetch-php.sh
@@ -1,2 +1,2 @@
-lftpget http://us.php.net/distributions/php-7.4.23.tar.xz.asc
-lftpget http://us.php.net/distributions/php-7.4.23.tar.xz
+lftpget http://us.php.net/distributions/php-8.3.6.tar.xz.asc
+lftpget http://us.php.net/distributions/php-8.3.6.tar.xz
diff --git a/source/n/php/mod_php.conf.example b/source/n/php/mod_php.conf.example
index d8f96eb09..6ca1d3a87 100644
--- a/source/n/php/mod_php.conf.example
+++ b/source/n/php/mod_php.conf.example
@@ -3,7 +3,7 @@
#
# Load the PHP module:
-LoadModule php7_module lib/httpd/modules/libphp7.so
+LoadModule php_module lib/httpd/modules/libphp.so
# Tell Apache to feed all *.php files through PHP. If you'd like to
# parse PHP embedded in files with different extensions, comment out
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index 9b7cde933..a37ab12dd 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=php
VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-ALPINE=2.24
+ALPINE=2.26
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
@@ -155,11 +155,6 @@ zcat $CWD/php-fpm.conf.diff.gz | patch -p1 --verbose || exit 1
# Fix for imap API change:
zcat $CWD/php.imap.api.diff.gz | patch -p1 --verbose || exit 1
-# Use enchant-2:
-zcat $CWD/php.enchant-2.patch.gz | patch -p1 --verbose || exit 1
-export ENCHANT_CFLAGS="-I/usr/include/enchant-2"
-export ENCHANT_LIBS="-lenchant-2"
-
# Install the build folder into /usr/lib$LIBDIRSUFFIX/php/build
# and adapt phpize accordingly:
sed -i "s|build$|php/build|" scripts/Makefile.frag
@@ -190,7 +185,6 @@ CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1 -DU_DEFINE_FALSE_AND_TRUE=1" \
--enable-fpm \
--with-fpm-user=apache \
--with-fpm-group=apache \
- --enable-maintainer-zts \
--enable-pcntl \
--enable-mbregex \
--enable-tokenizer=shared \
@@ -199,7 +193,6 @@ CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1 -DU_DEFINE_FALSE_AND_TRUE=1" \
--with-layout=PHP \
--disable-sigchild \
--with-libxml \
- --with-xmlrpc=shared \
--with-expat \
--enable-simplexml \
--enable-xmlreader=shared \
@@ -251,7 +244,6 @@ CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1 -DU_DEFINE_FALSE_AND_TRUE=1" \
--enable-sysvshm \
--with-xsl=shared,/usr \
--with-zip=shared \
- --with-tsrm-pthreads \
--enable-intl=shared \
--enable-opcache \
--enable-shared=yes \
@@ -343,4 +335,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -l y -c n $TMP/php-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/php/php.enchant-2.patch b/source/n/php/php.enchant-2.patch
deleted file mode 100644
index 9d421c3bf..000000000
--- a/source/n/php/php.enchant-2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- php-7.4.4/ext/enchant/config.m4 2020-03-17 10:40:22.000000000 +0000
-+++ php-7.4.4/ext/enchant/config.m4 2020-03-27 21:25:27.754470703 +0000
-@@ -4,21 +4,21 @@ PHP_ARG_WITH([enchant],
- [Include Enchant support])])
-
- if test "$PHP_ENCHANT" != "no"; then
-- PKG_CHECK_MODULES([ENCHANT], [enchant])
-+ PKG_CHECK_MODULES([ENCHANT], [enchant-2])
-
- PHP_EVAL_INCLINE($ENCHANT_CFLAGS)
- PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD)
-
- AC_DEFINE(HAVE_ENCHANT, 1, [ ])
-
-- PHP_CHECK_LIBRARY(enchant, enchant_get_version,
-+ PHP_CHECK_LIBRARY(enchant-2, enchant_get_version,
- [
- AC_DEFINE(HAVE_ENCHANT_GET_VERSION, 1, [ ])
- ], [ ], [
- $ENCHANT_LIBS
- ])
-
-- PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
-+ PHP_CHECK_LIBRARY(enchant-2, enchant_broker_set_param,
- [
- AC_DEFINE(HAVE_ENCHANT_BROKER_SET_PARAM, 1, [ ])
- ], [ ], [
---- a/ext/enchant/enchant.c.orig
-+++ b/ext/enchant/enchant.c
-@@ -738,7 +738,7 @@
- for (i = 0; i < n_sugg; i++) {
- add_next_index_string(sugg, suggs[i]);
- }
-- enchant_dict_free_suggestions(pdict->pdict, suggs);
-+ enchant_dict_free_string_list(pdict->pdict, suggs);
- }
-
-
-@@ -793,7 +793,7 @@
- add_next_index_string(return_value, suggs[i]);
- }
-
-- enchant_dict_free_suggestions(pdict->pdict, suggs);
-+ enchant_dict_free_string_list(pdict->pdict, suggs);
- }
- }
- /* }}} */
-@@ -813,7 +813,7 @@
-
- PHP_ENCHANT_GET_DICT;
-
-- enchant_dict_add_to_personal(pdict->pdict, word, wordlen);
-+ enchant_dict_add(pdict->pdict, word, wordlen);
- }
- /* }}} */
-
-@@ -851,7 +851,7 @@
-
- PHP_ENCHANT_GET_DICT;
-
-- RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen));
-+ RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen));
- }
- /* }}} */
-
---- php-7.4.4/build/php.m4 2020-03-17 06:40:21.000000000 -0400
-+++ php-7.4.4/build/php.m4 2020-04-05 09:27:14.634620646 -0400
-@@ -1541,7 +1541,7 @@ AC_DEFUN([PHP_CHECK_LIBRARY], [
- ],[
- LDFLAGS=$save_old_LDFLAGS
- ext_shared=$save_ext_shared
-- unset ac_cv_lib_$1[]_$2
-+ unset ac_cv_lib_[]translit($1, -, _)_$2
- $4
- ])dnl
- ])
diff --git a/source/n/php/php.imap.api.diff b/source/n/php/php.imap.api.diff
index b767e1558..01b985dde 100644
--- a/source/n/php/php.imap.api.diff
+++ b/source/n/php/php.imap.api.diff
@@ -1,6 +1,42 @@
---- ./ext/imap/php_imap.c.orig 2020-03-17 05:40:25.000000000 -0500
-+++ ./ext/imap/php_imap.c 2020-03-17 16:20:15.600685744 -0500
-@@ -5081,7 +5081,7 @@
+--- ./configure.orig 2024-03-12 18:42:26.000000000 -0500
++++ ./configure 2024-03-15 13:22:46.014768956 -0500
+@@ -43591,6 +43591,7 @@
+ PHP_IMAP_EXPORT void mm_nocritical(void){}
+ PHP_IMAP_EXPORT void mm_notify(void){}
+ PHP_IMAP_EXPORT void mm_login(void){}
++ PHP_IMAP_EXPORT void mm_login_method(void){}
+ PHP_IMAP_EXPORT void mm_diskerror(void){}
+ PHP_IMAP_EXPORT void mm_status(void){}
+ PHP_IMAP_EXPORT void mm_lsub(void){}
+@@ -43770,6 +43771,7 @@
+ PHP_IMAP_EXPORT void mm_nocritical(void){}
+ PHP_IMAP_EXPORT void mm_notify(void){}
+ PHP_IMAP_EXPORT void mm_login(void){}
++ PHP_IMAP_EXPORT void mm_login_method(void){}
+ PHP_IMAP_EXPORT void mm_diskerror(void){}
+ PHP_IMAP_EXPORT void mm_status(void){}
+ PHP_IMAP_EXPORT void mm_lsub(void){}
+--- ./ext/imap/config.m4.orig 2024-03-12 18:42:26.000000000 -0500
++++ ./ext/imap/config.m4 2024-03-15 13:21:36.270772814 -0500
+@@ -46,6 +46,7 @@
+ PHP_IMAP_EXPORT void mm_nocritical(void){}
+ PHP_IMAP_EXPORT void mm_notify(void){}
+ PHP_IMAP_EXPORT void mm_login(void){}
++ PHP_IMAP_EXPORT void mm_login_method(void){}
+ PHP_IMAP_EXPORT void mm_diskerror(void){}
+ PHP_IMAP_EXPORT void mm_status(void){}
+ PHP_IMAP_EXPORT void mm_lsub(void){}
+@@ -282,6 +283,7 @@
+ PHP_IMAP_EXPORT void mm_nocritical(void){}
+ PHP_IMAP_EXPORT void mm_notify(void){}
+ PHP_IMAP_EXPORT void mm_login(void){}
++ PHP_IMAP_EXPORT void mm_login_method(void){}
+ PHP_IMAP_EXPORT void mm_diskerror(void){}
+ PHP_IMAP_EXPORT void mm_status(void){}
+ PHP_IMAP_EXPORT void mm_lsub(void){}
+--- ./ext/imap/php_imap.c.orig 2024-03-12 18:42:26.000000000 -0500
++++ ./ext/imap/php_imap.c 2024-03-15 13:21:36.271772814 -0500
+@@ -4778,7 +4778,7 @@
php debugger? */
}
@@ -9,7 +45,7 @@
{
if (*mb->user) {
-@@ -5089,7 +5089,13 @@
+@@ -4786,7 +4786,13 @@
} else {
strlcpy (user, IMAPG(imap_user), MAILTMPLEN);
}
@@ -24,48 +60,3 @@
}
PHP_IMAP_EXPORT void mm_critical(MAILSTREAM *stream)
---- ./ext/imap/config.m4.orig 2020-03-17 05:40:25.000000000 -0500
-+++ ./ext/imap/config.m4 2020-03-17 16:20:15.588685745 -0500
-@@ -34,6 +34,7 @@
- PHP_IMAP_EXPORT void mm_nocritical(void){}
- PHP_IMAP_EXPORT void mm_notify(void){}
- PHP_IMAP_EXPORT void mm_login(void){}
-+ PHP_IMAP_EXPORT void mm_login_method(void){}
- PHP_IMAP_EXPORT void mm_diskerror(void){}
- PHP_IMAP_EXPORT void mm_status(void){}
- PHP_IMAP_EXPORT void mm_lsub(void){}
-@@ -262,6 +263,7 @@
- PHP_IMAP_EXPORT void mm_nocritical(void){}
- PHP_IMAP_EXPORT void mm_notify(void){}
- PHP_IMAP_EXPORT void mm_login(void){}
-+ PHP_IMAP_EXPORT void mm_login_method(void){}
- PHP_IMAP_EXPORT void mm_diskerror(void){}
- PHP_IMAP_EXPORT void mm_status(void){}
- PHP_IMAP_EXPORT void mm_lsub(void){}
---- ./configure.orig 2020-03-17 05:40:20.000000000 -0500
-+++ ./configure 2020-03-17 16:22:03.768679101 -0500
-@@ -39870,6 +39870,7 @@
- PHP_IMAP_EXPORT void mm_nocritical(void){}
- PHP_IMAP_EXPORT void mm_notify(void){}
- PHP_IMAP_EXPORT void mm_login(void){}
-+ PHP_IMAP_EXPORT void mm_login_method(void){}
- PHP_IMAP_EXPORT void mm_diskerror(void){}
- PHP_IMAP_EXPORT void mm_status(void){}
- PHP_IMAP_EXPORT void mm_lsub(void){}
-@@ -39937,6 +39938,8 @@
- PHP_IMAP_EXPORT void mm_nocritical(void){}
- PHP_IMAP_EXPORT void mm_notify(void){}
- PHP_IMAP_EXPORT void mm_login(void){}
-+ PHP_IMAP_EXPORT void mm_login_method(void){}
-+ PHP_IMAP_EXPORT void mm_login_method(void){}
- PHP_IMAP_EXPORT void mm_diskerror(void){}
- PHP_IMAP_EXPORT void mm_status(void){}
- PHP_IMAP_EXPORT void mm_lsub(void){}
-@@ -40078,6 +40081,7 @@
- PHP_IMAP_EXPORT void mm_nocritical(void){}
- PHP_IMAP_EXPORT void mm_notify(void){}
- PHP_IMAP_EXPORT void mm_login(void){}
-+ PHP_IMAP_EXPORT void mm_login_method(void){}
- PHP_IMAP_EXPORT void mm_diskerror(void){}
- PHP_IMAP_EXPORT void mm_status(void){}
- PHP_IMAP_EXPORT void mm_lsub(void){}
diff --git a/source/n/php/php.ini-development.diff b/source/n/php/php.ini-development.diff
index ce12f5a4b..b64460d04 100644
--- a/source/n/php/php.ini-development.diff
+++ b/source/n/php/php.ini-development.diff
@@ -1,6 +1,6 @@
---- ./php.ini-development.orig 2020-05-12 03:09:16.000000000 -0500
-+++ ./php.ini-development 2020-05-12 14:14:32.901530776 -0500
-@@ -899,7 +899,50 @@
+--- ./php.ini-development.orig 2023-11-21 08:40:35.000000000 -0600
++++ ./php.ini-development 2023-11-25 12:56:46.764896688 -0600
+@@ -920,7 +920,49 @@
; 'extension='php_<ext>.dll') is supported for legacy reasons and may be
; deprecated in a future PHP major version. So, when it is possible, please
; move to the new ('extension=<ext>) syntax.
@@ -43,18 +43,17 @@
+extension=tidy
+extension=tokenizer
+extension=xmlreader
-+extension=xmlrpc
+extension=xsl
+extension=zip
+extension=zlib
+
; Notes for Windows environments :
;
- ; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
-@@ -1335,7 +1378,7 @@
+ ; - Many DLL files are located in the ext/
+@@ -1379,7 +1421,7 @@
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
- ; http://php.net/session.save-path
+ ; https://php.net/session.save-path
-;session.save_path = "/tmp"
+session.save_path = "/var/lib/php"
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-30 16:52:25 +0000