v 8.1.7

8 files changed, 53 insertions, 123 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8cdb2d5fe967..e0ee4d7d341c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = php-zts
-	pkgver = 8.0.3
+	pkgver = 8.1.7
 	pkgrel = 1
 	url = https://www.php.net/
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = php-zts
 	makedepends = aspell
 	makedepends = c-client
 	makedepends = db
+	makedepends = gdbm
 	makedepends = enchant
 	makedepends = gd
 	makedepends = gmp
@@ -29,22 +30,24 @@ pkgbase = php-zts
 	makedepends = pcre2
 	makedepends = libnsl
 	makedepends = oniguruma
-	source = https://php.net/distributions/php-8.0.3.tar.xz
-	source = https://php.net/distributions/php-8.0.3.tar.xz.asc
+	options = debug
+	source = https://php.net/distributions/php-8.1.7.tar.xz
+	source = https://php.net/distributions/php-8.1.7.tar.xz.asc
 	source = apache.patch
 	source = apache.conf
 	source = php-fpm.patch
 	source = php-fpm.tmpfiles
 	source = php.ini.patch
-	validpgpkeys = 1729F83938DA44E27BA0F4D3DBDB397470D12172
-	validpgpkeys = BFDDD28642824F8118EF77909B67A5C12229118F
-	sha256sums = c9816aa9745a9695672951eaff3a35ca5eddcb9cacf87a4f04b9fb1169010251
+	validpgpkeys = F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD,
+	validpgpkeys = 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E
+	validpgpkeys = 39B641343D8C104B2B146DC3F9C39DC0B9698544
+	sha256sums = f042322f1b5a9f7c2decb84b7086ef676896c2f7178739b9672afafa964ed0e5
 	sha256sums = SKIP
 	sha256sums = c24122c0a742d3f153d52076137e737da0191584dab178bafed547b3bf2a28e8
 	sha256sums = aee6ee73d1b3cf161069c355e8472a2ceda0886e98bf6a69d57c1dcf6b09ab17
-	sha256sums = 2228131cc65139bd819b617bba06c2406e559c55fbfb38a29f9853ce48c58eeb
+	sha256sums = aa55fa4fc5c2b2493065bbd00cfe3c97a1b22b3dc7d34f8fd303de18cafe844f
 	sha256sums = 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5
-	sha256sums = b538a7c974adde626c35481e4a66d506dc12c598f369dfe79f3fcb9585d8b920
+	sha256sums = b3b3385f1c36e272671c7db238b2a69896e11a82db90dafd74964f2eabbfa2f2
 
 pkgname = php-zts
 	pkgdesc = A general-purpose scripting language that is especially suited to web development(ZTS enabled)
@@ -54,8 +57,10 @@ pkgname = php-zts
 	depends = pcre2
 	depends = argon2
 	depends = oniguruma
-	provides = php=8.0.3
-	provides = php-ldap=8.0.3
+	depends = db
+	depends = gdbm
+	provides = php=8.1.7
+	provides = php-ldap=8.1.7
 	conflicts = php
 	conflicts = php-ldap
 	replaces = php
@@ -65,7 +70,7 @@ pkgname = php-zts
 pkgname = php-zts-cgi
 	pkgdesc = CGI and FCGI SAPI for PHP
 	depends = php-zts
-	provides = php-cgi=8.0.3
+	provides = php-cgi=8.1.7
 	conflicts = php-cgi
 	replaces = php-cgi
 
@@ -74,7 +79,7 @@ pkgname = php-zts-apache
 	depends = php-zts
 	depends = apache
 	depends = libnsl
-	provides = php-apache=8.0.3
+	provides = php-apache=8.1.7
 	conflicts = php-apache
 	replaces = php-apache
 	backup = etc/httpd/conf/extra/php7_module.conf
@@ -83,7 +88,7 @@ pkgname = php-zts-fpm
 	pkgdesc = FastCGI Process Manager for PHP
 	depends = php-zts
 	depends = systemd
-	provides = php-fpm=8.0.3
+	provides = php-fpm=8.1.7
 	conflicts = php-fpm
 	replaces = php-fpm
 	options = !emptydirs
@@ -96,7 +101,7 @@ pkgname = php-zts-embed
 	depends = systemd-libs
 	depends = libnsl
 	depends = libxcrypt
-	provides = php-embed=8.0.3
+	provides = php-embed=8.1.7
 	conflicts = php-embed
 	replaces = php-embed
 	options = !emptydirs
@@ -104,7 +109,7 @@ pkgname = php-zts-embed
 pkgname = php-zts-phpdbg
 	pkgdesc = Interactive PHP debugger
 	depends = php-zts
-	provides = php-phpdbg=8.0.3
+	provides = php-phpdbg=8.1.7
 	conflicts = php-phpdbg
 	replaces = php-phpdbg
 	options = !emptydirs
@@ -113,7 +118,7 @@ pkgname = php-zts-dblib
 	pkgdesc = dblib module for PHP
 	depends = php-zts
 	depends = freetds
-	provides = php-dblib=8.0.3
+	provides = php-dblib=8.1.7
 	conflicts = php-dblib
 	replaces = php-dblib
 
@@ -121,7 +126,7 @@ pkgname = php-zts-enchant
 	pkgdesc = enchant module for PHP
 	depends = php-zts
 	depends = enchant
-	provides = php-enchant=8.0.3
+	provides = php-enchant=8.1.7
 	conflicts = php-enchant
 	replaces = php-enchant
 
@@ -129,7 +134,7 @@ pkgname = php-zts-gd
 	pkgdesc = gd module for PHP
 	depends = php-zts
 	depends = gd
-	provides = php-gd=8.0.3
+	provides = php-gd=8.1.7
 	conflicts = php-gd
 	replaces = php-gd
 
@@ -138,7 +143,7 @@ pkgname = php-zts-imap
 	depends = php-zts
 	depends = c-client
 	depends = libxcrypt
-	provides = php-imap=8.0.3
+	provides = php-imap=8.1.7
 	conflicts = php-imap
 	replaces = php-imap
 
@@ -146,7 +151,7 @@ pkgname = php-zts-intl
 	pkgdesc = intl module for PHP
 	depends = php-zts
 	depends = icu
-	provides = php-intl=8.0.3
+	provides = php-intl=8.1.7
 	conflicts = php-intl
 	replaces = php-intl
 
@@ -154,7 +159,7 @@ pkgname = php-zts-sodium
 	pkgdesc = sodium module for PHP
 	depends = php-zts
 	depends = libsodium
-	provides = php-sodium=8.0.3
+	provides = php-sodium=8.1.7
 	conflicts = php-sodium
 	replaces = php-sodium
 
@@ -162,7 +167,7 @@ pkgname = php-zts-odbc
 	pkgdesc = ODBC modules for PHP
 	depends = php-zts
 	depends = unixodbc
-	provides = php-odbc=8.0.3
+	provides = php-odbc=8.1.7
 	conflicts = php-odbc
 	replaces = php-odbc
 
@@ -170,7 +175,7 @@ pkgname = php-zts-pgsql
 	pkgdesc = PostgreSQL modules for PHP
 	depends = php-zts
 	depends = postgresql-libs
-	provides = php-pgsql=8.0.3
+	provides = php-pgsql=8.1.7
 	conflicts = php-pgsql
 	replaces = php-pgsql
 
@@ -178,7 +183,7 @@ pkgname = php-zts-pspell
 	pkgdesc = pspell module for PHP
 	depends = php-zts
 	depends = aspell
-	provides = php-pspell=8.0.3
+	provides = php-pspell=8.1.7
 	conflicts = php-pspell
 	replaces = php-pspell
 
@@ -186,7 +191,7 @@ pkgname = php-zts-snmp
 	pkgdesc = snmp module for PHP
 	depends = php-zts
 	depends = net-snmp
-	provides = php-snmp=8.0.3
+	provides = php-snmp=8.1.7
 	conflicts = php-snmp
 	replaces = php-snmp
 
@@ -194,7 +199,7 @@ pkgname = php-zts-sqlite
 	pkgdesc = sqlite module for PHP
 	depends = php-zts
 	depends = sqlite
-	provides = php-sqlite=8.0.3
+	provides = php-sqlite=8.1.7
 	conflicts = php-sqlite
 	replaces = php-sqlite
 
@@ -202,7 +207,7 @@ pkgname = php-zts-tidy
 	pkgdesc = tidy module for PHP
 	depends = php-zts
 	depends = tidy
-	provides = php-tidy=8.0.3
+	provides = php-tidy=8.1.7
 	conflicts = php-tidy
 	replaces = php-tidy
 
@@ -210,7 +215,6 @@ pkgname = php-zts-xsl
 	pkgdesc = xsl module for PHP
 	depends = php-zts
 	depends = libxslt
-	provides = php-xsl=8.0.3
+	provides = php-xsl=8.1.7
 	conflicts = php-xsl
 	replaces = php-xsl
-
diff --git a/.gitignore b/.gitignore
index e0d371dae6b5..691a299b9118 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ src/
 pkg/
 *.pkg.tar.xz
 *.xz
+*.zst
 *.asc
 .project
 .settings
diff --git a/PKGBUILD b/PKGBUILD
index d71cfc434c03..f388890d0e17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,26 +24,29 @@ pkgname=("${pkgbase}"
          "${pkgbase}-tidy"
          "${pkgbase}-xsl")
 
-pkgver=8.0.3
+pkgver=8.1.7
 pkgrel=1
 arch=('x86_64')
 license=('PHP')
 url='https://www.php.net/'
-makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
+makedepends=('apache' 'aspell' 'c-client' 'db' 'gdbm' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
              'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl'
              'oniguruma')
 checkdepends=('procps-ng')
+options=(debug)
 source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"{,.asc}
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch')
-sha256sums=('c9816aa9745a9695672951eaff3a35ca5eddcb9cacf87a4f04b9fb1169010251'
+sha256sums=('f042322f1b5a9f7c2decb84b7086ef676896c2f7178739b9672afafa964ed0e5'
             'SKIP'
             'c24122c0a742d3f153d52076137e737da0191584dab178bafed547b3bf2a28e8'
             'aee6ee73d1b3cf161069c355e8472a2ceda0886e98bf6a69d57c1dcf6b09ab17'
-            '2228131cc65139bd819b617bba06c2406e559c55fbfb38a29f9853ce48c58eeb'
+            'aa55fa4fc5c2b2493065bbd00cfe3c97a1b22b3dc7d34f8fd303de18cafe844f'
             '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
-            'b538a7c974adde626c35481e4a66d506dc12c598f369dfe79f3fcb9585d8b920')
-validpgpkeys=('1729F83938DA44E27BA0F4D3DBDB397470D12172'
-              'BFDDD28642824F8118EF77909B67A5C12229118F')
+            'b3b3385f1c36e272671c7db238b2a69896e11a82db90dafd74964f2eabbfa2f2')
+validpgpkeys=('F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD',
+              '528995BFEDFBA7191D46839EF9BA0ADA31CBD89E'
+              '39B641343D8C104B2B146DC3F9C39DC0B9698544')
+_interpreter=${pkgver%.*}
 
 prepare() {
 	cd "${srcdir}/${_pkgbase}-${pkgver}"
@@ -70,6 +73,7 @@ build() {
 		--with-config-file-scan-dir=/etc/php/conf.d \
 		--disable-rpath \
 		--mandir=/usr/share/man \
+		--disable-gcc-global-regs \
 		"
 
 	local _phpextensions="\
@@ -181,10 +185,11 @@ check() {
 
 package_php-zts() {
 	pkgdesc='A general-purpose scripting language that is especially suited to web development(ZTS enabled)'
-	depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma')
+	depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma' 'db' 'gdbm')
 	replaces=("${_pkgbase}" 'php-ldap')
 	conflicts=("${_pkgbase}" 'php-ldap')
 	provides=("${_pkgbase}=${pkgver}" "php-ldap=${pkgver}")
+
 	backup=('etc/php/php.ini')
 
 	cd "${srcdir}/build"
diff --git a/enchant-2.patch b/enchant-2.patch
deleted file mode 100644
index 5aee2f7294bb..000000000000
--- a/enchant-2.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- ext/enchant/config.m4.orig
-+++ ext/enchant/config.m4
-@@ -4,7 +4,7 @@
-     [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)
---- ext/enchant/enchant.c.orig
-+++ 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));
- }
- /* }}} */
- 
diff --git a/generate_patches b/generate_patches
index 794f282e9dd5..7b38e3e99c3a 100755
--- a/generate_patches
+++ b/generate_patches
@@ -91,7 +91,7 @@ sed \
 	-e 's#^;extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \
 	-i php.ini-production
 
-diff -u configure.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch
+diff -u configure sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch
 diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch
 
 {
diff --git a/php-fpm.patch b/php-fpm.patch
index 4aa71ce18ad7..b62fff1158cf 100644
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -52,7 +52,7 @@
  ;listen.mode = 0660
  ; When POSIX Access Control Lists are supported you can set them using
  ; these options, value is a comma separated list of user/group names.
-@@ -387,7 +387,7 @@
+@@ -395,7 +395,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
diff --git a/php.ini.patch b/php.ini.patch
index 7918d5bf1f33..5c60b6e5920c 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -1,15 +1,15 @@
 --- php.ini-production.orig
 +++ php.ini-production
-@@ -765,7 +765,7 @@
+@@ -760,7 +760,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
- ; http://php.net/extension-dir
+ ; https://php.net/extension-dir
 -;extension_dir = "./"
 +extension_dir = "/usr/lib/php/modules/"
  ; On windows:
  ;extension_dir = "ext"
  
-@@ -913,51 +913,44 @@
+@@ -908,51 +908,44 @@
  ; deprecated in a future PHP major version. So, when it is possible, please
  ; move to the new ('extension=<ext>) syntax.
  ;
@@ -58,7 +58,7 @@
  ;extension=shmop
 -
 -; The MIBS data available in the PHP distribution must be installed.
--; See http://www.php.net/manual/en/snmp.installation.php
+-; See https://www.php.net/manual/en/snmp.installation.php
  ;extension=snmp
 -
  ;extension=soap
diff --git a/php.patch b/php.patch
deleted file mode 100644
index 28c1c7c117f9..000000000000
--- a/php.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.orig
-+++ configure
-@@ -7008,27 +7008,7 @@
-     ;;
-   esac
- 
--  if test "$APACHE_VERSION" -lt 2004001; then
--    APXS_MPM=`$APXS -q MPM_NAME`
--    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
--
--  enable_maintainer_zts=yes
--  if test "$pthreads_working" != "yes"; then
--    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
--  fi
--
--    fi
--  else
--    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
--    if test -n "$APACHE_THREADED_MPM"; then
--
--  enable_maintainer_zts=yes
--  if test "$pthreads_working" != "yes"; then
--    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
--  fi
--
--    fi
--  fi
-+enable_maintainer_zts=yes
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-