Date: Thursday, January 5, 2023 @ 16:06:29
  Author: pierre
Revision: 465955

upgpkg: php-legacy 8.1.14-1

Modified:
  php-legacy/trunk/PKGBUILD
  php-legacy/trunk/php.ini.patch

---------------+
 PKGBUILD      |   20 +++++++-------------
 php.ini.patch |   10 ++++++++--
 2 files changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-01-05 14:54:30 UTC (rev 465954)
+++ PKGBUILD    2023-01-05 16:06:29 UTC (rev 465955)
@@ -10,7 +10,6 @@
          'php-legacy-dblib'
          'php-legacy-enchant'
          'php-legacy-gd'
-         'php-legacy-intl'
          'php-legacy-sodium'
          'php-legacy-odbc'
          'php-legacy-pgsql'
@@ -19,7 +18,7 @@
          'php-legacy-sqlite'
          'php-legacy-tidy'
          'php-legacy-xsl')
-pkgver=8.1.13
+pkgver=8.1.14
 pkgrel=1
 arch=('x86_64')
 license=('PHP')
@@ -31,13 +30,13 @@
 options=('debug')
 source=("https://php.net/distributions/php-${pkgver}.tar.xz"{,.asc}
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 
'php.ini.patch' 'php-legacy.patch')
-sha256sums=('b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856'
+sha256sums=('e16e47a872d58685913ac848ce92ec49f42c1828110c98c65fb6265a08724a1a'
             'SKIP'
             '702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca'
             '2173046ac22ac50c7a6721306d3f79b2086f66a7a6ff5d8af249a474763197a1'
             '632aaa2e87f7d687b0b55a6a89e473d57891fdb0d20eef1b7733dabc02b78ba8'
             'f3236ca866095d5e42e51e3fa600082ccd0afcfb7f1aecbeb286ef9d4f0dd564'
-            '789e88053846996e3a3f9e02355ce51de13456318ea5a9d6cb71b05b742549ab'
+            '0d651c14cbd76bf430cd9b0c3b3ebf12fd19bf3ca4a18cb6dc329e0352aabe66'
             'a1859005c9fad835079470e6fb3c0721b9bd024c8f3ae1f34cb082ec41c63194')
 validpgpkeys=('F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD'
               '39B641343D8C104B2B146DC3F9C39DC0B9698544')
@@ -183,7 +182,9 @@
 package_php-legacy() {
        pkgdesc='A general-purpose scripting language that is especially suited 
to web development'
        depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma' 'gdbm')
-       provides=("php-interpreter=$_interpreter")
+       provides=("php-interpreter=${_interpreter}" "php-legacy-intl=${pkgver}")
+       replaces=('php-legacy-intl')
+       conflicts=('php-legacy-intl')
        backup=('etc/php-legacy/php.ini')
 
        cd "${srcdir}/build"
@@ -194,7 +195,7 @@
        # remove static modules
        rm -f "${pkgdir}/usr/lib/php-legacy/modules/"*.a
        # remove modules provided by sub packages
-       rm -f 
"${pkgdir}/usr/lib/php-legacy/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-legacy/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-legacy/php/include"
 }
@@ -268,13 +269,6 @@
        install -D -m755 "${srcdir}/build/modules/gd.so" 
"${pkgdir}/usr/lib/php-legacy/modules/gd.so"
 }
 
-package_php-legacy-intl() {
-       pkgdesc='intl module for PHP'
-       depends=('php-legacy' 'icu')
-
-       install -D -m755 "${srcdir}/build/modules/intl.so" 
"${pkgdir}/usr/lib/php-legacy/modules/intl.so"
-}
-
 package_php-legacy-sodium() {
        pkgdesc='sodium module for PHP'
        depends=('php-legacy' 'libsodium')

Modified: php.ini.patch
===================================================================
--- php.ini.patch       2023-01-05 14:54:30 UTC (rev 465954)
+++ php.ini.patch       2023-01-05 16:06:29 UTC (rev 465955)
@@ -9,7 +9,7 @@
  ; On windows:
  ;extension_dir = "ext"
  
-@@ -908,51 +908,43 @@
+@@ -908,56 +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

Reply via email to