[arch-commits] Commit in php/trunk (4 files)

[Pierre Schmitz]

    Date: Saturday, December 8, 2018 @ 12:16:14
  Author: pierre
Revision: 341256

upgpkg: php 7.3.0-1

Modified:
  php/trunk/PKGBUILD
  php/trunk/apache.patch
  php/trunk/generate_patches
  php/trunk/php.ini.patch

------------------+
 PKGBUILD         |   28 ++++++++++++++--------------
 apache.patch     |    2 +-
 generate_patches |    2 +-
 php.ini.patch    |    9 +++++----
 4 files changed, 21 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-08 11:30:32 UTC (rev 341255)
+++ PKGBUILD	2018-12-08 12:16:14 UTC (rev 341256)
@@ -20,28 +20,28 @@
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=7.2.13
+pkgver=7.3.0
 pkgrel=1
 arch=('x86_64')
 license=('PHP')
-url='http://www.php.net'
+url='https://secure.php.net/'
 makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp'
-             'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre' 'libnsl')
+             'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl')
 checkdepends=('procps-ng')
 source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
         'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch'
         'enchant-2.patch' 'freetype.patch')
-sha512sums=('9df1d43e9cd701db10281811b328721b85cb90c6c8dae1842b0fd848cb5388328918b3040bbad7634b340550d82b93746ea479ed45f4d8a80e8a316e6324115d'
+sha256sums=('7d195cad55af8b288c3919c67023a14ff870a73e3acc2165a6d17a4850a560b5'
             'SKIP'
-            'bb9abfc51c41e1de180ef09244691c909ee64feebd9749978e1ecb7f576466a37232d9c6e97c1a01a96b8413a33c4818a91dc79f63078dc1946f56dad516bb05'
-            'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
-            'c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb'
-            '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
-            '85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0'
-            '06b49fb044fe8cdeef5109aa7bb6858906396e3f3643827cdb241264029579c71b0a7661d24b78b16573c54832505491c4b2a1fd77ae7c313cb082731c2efd9e'
-            '97ca469d5234f5cc71af38bb99a60130fdab5f849ad1f49f112101779c7659ca4d6700aef72e0294c85bdcb18e487fc0cdda855cc51084b9e8cacb02ec0fb1eb')
-validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
-              '1729F83938DA44E27BA0F4D3DBDB397470D12172')
+            '62e5ceea3c90a3c6eab1166488f876e766efcfd7d4e973c44060a9e72d51a98a'
+            'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
+            '3de3c76930874c81824c23aa033cb9e66631659fd31f925d7c58f0479aeb18a9'
+            '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
+            'ba63ff727d911882726e4e5e513249d29e9ccc842ebee10a07b160b4718ba20d'
+            '3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32'
+            '07c4648669dc05afc3c1ad5a4739768079c423b817eabf5296ca3d1ea5ffd163')
+validpgpkeys=('CBAF69F173A0FEA4B537F470D66C9593118BCCB6'
+              'F38252826ACD957EF380D39F2F7956BC5DA04B5D')
 
 prepare() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
@@ -181,7 +181,7 @@
 
 package_php() {
 	pkgdesc='A general-purpose scripting language that is especially suited to web development'
-	depends=('libxml2' 'curl' 'libzip' 'pcre' 'argon2')
+	depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2')
 	replaces=('php-ldap')
 	conflicts=('php-ldap')
 	provides=("php-ldap=${pkgver}")

Modified: apache.patch
===================================================================
--- apache.patch	2018-12-08 11:30:32 UTC (rev 341255)
+++ apache.patch	2018-12-08 12:16:14 UTC (rev 341256)
@@ -1,6 +1,6 @@
 --- sapi/apache2handler/config.m4.orig
 +++ sapi/apache2handler/config.m4
-@@ -122,7 +122,6 @@
+@@ -113,7 +113,6 @@
        PHP_BUILD_THREAD_SAFE
      fi
    else

Modified: generate_patches
===================================================================
--- generate_patches	2018-12-08 11:30:32 UTC (rev 341255)
+++ generate_patches	2018-12-08 12:16:14 UTC (rev 341256)
@@ -32,7 +32,7 @@
 	-r ":a;N;\$!ba;s/; Notes for Windows environments :\n.+;?extension=\w+\n/${extensions}/g" \
 	-i.orig php.ini-production
 sed \
-	-e 's#^; extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \
+	-e 's#^;extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \
 	-i php.ini-production
 
 diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch

Modified: php.ini.patch
===================================================================
--- php.ini.patch	2018-12-08 11:30:32 UTC (rev 341255)
+++ php.ini.patch	2018-12-08 12:16:14 UTC (rev 341256)
@@ -1,15 +1,15 @@
 --- php.ini-production.orig
 +++ php.ini-production
-@@ -734,7 +734,7 @@
+@@ -752,7 +752,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
--; extension_dir = "./"
+-;extension_dir = "./"
 +extension_dir = "/usr/lib/php/modules/"
  ; On windows:
- ; extension_dir = "ext"
+ ;extension_dir = "ext"
  
-@@ -883,47 +883,44 @@
+@@ -900,48 +900,44 @@
  ; deprecated in a future PHP major version. So, when it is possible, please
  ; move to the new ('extension=<ext>) syntax.
  ;
@@ -64,6 +64,7 @@
 -
  ;extension=soap
  ;extension=sockets
+-;extension=sodium
  ;extension=sqlite3
 +;extension=sysvmsg
 +;extension=sysvsem