* update php to 8.2.1-1

php/PKGBUILD

@@ -11,7 +11,6 @@ pkgname=('php'
          'php-dblib'
          'php-enchant'
          'php-gd'
-         'php-intl'
          'php-sodium'
          'php-odbc'
          'php-pgsql'
@@ -20,25 +19,24 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=8.2.0
+pkgver=8.2.1
 pkgrel=1
-arch=(x86_64 powerpc64le powerpc riscv64)
+arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 license=('PHP')
 url='https://www.php.net/'
 makedepends=('apache' 'aspell' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
              'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2'
              '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=('6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943'
+sha256sums=('650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af'
             'SKIP'
             '702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca'
             '4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e'
             '69beb06f8eed1b9d61f1f2ad71b8d1026e0389b7f4cbedbf540ab84427c86d95'
             '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
-            'eac1a34bc38434c6bcb66d44a179191dd9076df2ac9d04d782af5b7febd157b3')
+            '16f3bf5a378c096214d8c480cc624f0f4fe240b927c18b43f3b724e756bedc9d')
 validpgpkeys=('1198C0117593497A5EC5C199286AF1F9897469DC'
               '39B641343D8C104B2B146DC3F9C39DC0B9698544'
               'E60913E4DF209907D8E30D96659A97C9CF2A795A')
@@ -123,14 +121,13 @@ build() {
 		--with-zip=shared \
 		--with-zlib \
 		"
-
-	EXTENSION_DIR=/usr/lib/php/modules
-	export EXTENSION_DIR
-
         case "${CARCH}" in
           riscv64) CFLAGS+=" -latomic" ;;
         esac
 
+	EXTENSION_DIR=/usr/lib/php/modules
+	export EXTENSION_DIR
+
 	mkdir "${srcdir}/build"
 	cd "${srcdir}/build"
 	ln -s "../${pkgbase}-${pkgver}/configure"
@@ -182,7 +179,9 @@ check() {
 package_php() {
 	pkgdesc='A general-purpose scripting language that is especially suited to web development'
 	depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma')
-	provides=("php-interpreter=$_interpreter")
+	provides=("php-interpreter=${_interpreter}" "php-intl=${pkgver}")
+	replaces=('php-intl')
+	conflicts=('php-intl')
 	backup=('etc/php/php.ini')
 
 	cd "${srcdir}/build"
@@ -193,7 +192,7 @@ package_php() {
 	# remove static modules
 	rm -f "${pkgdir}/usr/lib/php/modules/"*.a
 	# remove modules provided by sub packages
-	rm -f "${pkgdir}/usr/lib/php/modules/"{enchant,gd,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+	rm -f "${pkgdir}/usr/lib/php/modules/"{enchant,gd,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
 	# remove empty directory
 	rmdir "${pkgdir}/usr/include/php/include"
 }
@@ -266,13 +265,6 @@ package_php-gd() {
 	install -D -m755 "${srcdir}/build/modules/gd.so" "${pkgdir}/usr/lib/php/modules/gd.so"
 }
 
-package_php-intl() {
-	pkgdesc='intl module for PHP'
-	depends=('php')
-
-	install -D -m755 "${srcdir}/build/modules/intl.so" "${pkgdir}/usr/lib/php/modules/intl.so"
-}
-
 package_php-sodium() {
 	pkgdesc='sodium module for PHP'
 	depends=('php' 'libsodium')

php/generate_patches

@@ -42,7 +42,6 @@ availableExtensions=(
 	gettext
 	gmp
 	iconv
-	imap
 	intl
 	ldap
 	mysqli

php/php.ini.patch

@@ -9,7 +9,7 @@
  ; On windows:
  ;extension_dir = "ext"
  
-@@ -908,52 +908,43 @@
+@@ -908,57 +908,43 @@
  ; deprecated in a future PHP major version. So, when it is possible, please
  ; move to the new ('extension=<ext>) syntax.
  ;
@@ -21,6 +21,12 @@
 -;
 +;extension=bcmath
  ;extension=bz2
+-
+-; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used
+-; otherwise it results in segfault when unloading after using SASL.
+-; See https://github.com/php/php-src/issues/8620 for more info.
+-;extension=ldap
+-
 -;extension=curl
 +;extension=calendar
 +extension=curl
@@ -36,9 +42,9 @@
 +;extension=iconv
  ;extension=intl
 -;extension=imap
- ;extension=ldap
 -;extension=mbstring
 -;extension=exif      ; Must be after mbstring as it depends on it
++;extension=ldap
  ;extension=mysqli
 -;extension=oci8_12c  ; Use with Oracle Database 12c Instant Client
 -;extension=oci8_19  ; Use with Oracle Database 19 Instant Client