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

Pierre Schmitz pierre at archlinux.org
Fri Nov 29 17:28:25 UTC 2019


    Date: Friday, November 29, 2019 @ 17:28:24
  Author: pierre
Revision: 369923

upgpkg: php 7.4.0-1

Modified:
  php/trunk/PKGBUILD
  php/trunk/apache.patch
  php/trunk/enchant-2.patch
  php/trunk/generate_patches
  php/trunk/php-fpm.patch
  php/trunk/php.ini.patch
Deleted:
  php/trunk/freetype.patch

------------------+
 PKGBUILD         |   56 +++++++++++++++++++++++++----------------------------
 apache.patch     |    4 +--
 enchant-2.patch  |   44 +++++++++++++++--------------------------
 freetype.patch   |   38 -----------------------------------
 generate_patches |   18 ++++++++++++++++-
 php-fpm.patch    |    2 -
 php.ini.patch    |   13 +++++-------
 7 files changed, 69 insertions(+), 106 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-29 15:59:38 UTC (rev 369922)
+++ PKGBUILD	2019-11-29 17:28:24 UTC (rev 369923)
@@ -20,28 +20,28 @@
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=7.3.12
+pkgver=7.4.0
 pkgrel=1
 arch=('x86_64')
 license=('PHP')
 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' 'pcre2' 'libnsl')
+             'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl'
+             'oniguruma')
 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')
-sha256sums=('aafe5e9861ad828860c6af8c88cdc1488314785962328eb1783607c1fdd855df'
+        'enchant-2.patch')
+sha256sums=('9bb751b20e5d6cc1ea9b1ebf23ef2d5f07f99b2d9cc417bf1d70c04f8b20ec42'
             'SKIP'
-            '62e5ceea3c90a3c6eab1166488f876e766efcfd7d4e973c44060a9e72d51a98a'
+            'b4ea038f2863801175d6c4e74c685913feecdd5be3d49aff7d9b3fa92d8c4159'
             'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
-            '7ae4870d54340ee5be5a4fbb61bf81d3bfa33fa3b8d59bafcfa17509e2775234'
+            '41f23ebc2d986473b9a4eb3f233428349367b2baa2bb715c53e720cc34c9378c'
             '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
-            '07627f57bbc5559a63bfc77e21edd4e2a5d3aa15fed4d9dfe00e877dd31b7c9f'
-            '3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32'
-            '07c4648669dc05afc3c1ad5a4739768079c423b817eabf5296ca3d1ea5ffd163')
-validpgpkeys=('CBAF69F173A0FEA4B537F470D66C9593118BCCB6'
-              'F38252826ACD957EF380D39F2F7956BC5DA04B5D')
+            '03beeb8b62a499805a4b912cb19d048635cb5542478753e58364bf24fb42ff3c'
+            '92a048073713c3600713b3dd46e96b33a2dde2aef1fbdf175d83da1dc679a0c5')
+validpgpkeys=('5A52880781F755608BF815FC910DEB46F53EA312'
+              '42670A7FE4D0441C8E4632349E4FDC074A4EF02D')
 
 prepare() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
@@ -49,8 +49,7 @@
 	patch -p0 -i ${srcdir}/apache.patch
 	patch -p0 -i ${srcdir}/php-fpm.patch
 	patch -p0 -i ${srcdir}/php.ini.patch
-	patch -p1 -i ${srcdir}/enchant-2.patch
-	patch -p1 -i ${srcdir}/freetype.patch
+	patch -p0 -i ${srcdir}/enchant-2.patch
 	autoconf
 
 	rm tests/output/stream_isatty_*.phpt
@@ -71,7 +70,6 @@
 		--with-config-file-scan-dir=/etc/php/conf.d \
 		--disable-rpath \
 		--mandir=/usr/share/man \
-		--without-pear \
 		"
 
 	local _phpextensions="\
@@ -80,8 +78,10 @@
 		--enable-dba=shared \
 		--enable-exif=shared \
 		--enable-ftp=shared \
+		--enable-gd=shared \
 		--enable-intl=shared \
 		--enable-mbstring \
+		--enable-pcntl \
 		--enable-shmop=shared \
 		--enable-soap=shared \
 		--enable-sockets=shared \
@@ -88,13 +88,13 @@
 		--enable-sysvmsg=shared \
 		--enable-sysvsem=shared \
 		--enable-sysvshm=shared \
-		--enable-zip=shared \
 		--with-bz2=shared \
 		--with-curl=shared \
 		--with-db4=/usr \
-		--with-enchant=shared,/usr \
-		--with-freetype-dir=/usr \
-		--with-gd=shared,/usr \
+		--with-enchant=shared \
+		--with-external-gd \
+		--with-external-pcre \
+		--with-ffi=shared \
 		--with-gdbm \
 		--with-gettext=shared \
 		--with-gmp=shared \
@@ -101,33 +101,31 @@
 		--with-iconv=shared \
 		--with-imap-ssl \
 		--with-imap=shared \
-		--with-kerberos=/usr \
+		--with-kerberos \
 		--with-ldap=shared \
 		--with-ldap-sasl \
-		--with-libzip \
 		--with-mhash \
 		--with-mysql-sock=/run/mysqld/mysqld.sock \
 		--with-mysqli=shared,mysqlnd \
 		--with-openssl \
 		--with-password-argon2 \
-		--with-pcre-regex=/usr \
 		--with-pdo-dblib=shared,/usr \
 		--with-pdo-mysql=shared,mysqlnd \
 		--with-pdo-odbc=shared,unixODBC,/usr \
 		--with-pdo-pgsql=shared \
-		--with-pdo-sqlite=shared,/usr \
+		--with-pdo-sqlite=shared \
 		--with-pgsql=shared \
 		--with-pspell=shared \
 		--with-readline \
 		--with-snmp=shared \
 		--with-sodium=shared \
-		--with-sqlite3=shared,/usr \
+		--with-sqlite3=shared \
 		--with-tidy=shared \
-		--with-unixODBC=shared,/usr \
+		--with-unixODBC=shared \
 		--with-xmlrpc=shared \
 		--with-xsl=shared \
+		--with-zip=shared \
 		--with-zlib \
-		--enable-pcntl \
 		"
 
 	EXTENSION_DIR=/usr/lib/php/modules
@@ -166,10 +164,10 @@
 }
 
 check() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
+	cd ${srcdir}/build
 
 	# Check if sendmail was configured correctly (FS#47600)
-	${srcdir}/build/sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail'
+	sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail'
 
 	export REPORT_EXIT_STATUS=1
 	export NO_INTERACTION=1
@@ -176,12 +174,12 @@
 	export SKIP_ONLINE_TESTS=1
 	export SKIP_SLOW_TESTS=1
 
-	${srcdir}/build/sapi/cli/php -n run-tests.php -n -P {tests,Zend}
+	sapi/cli/php -n ${srcdir}/${pkgbase}-${pkgver}/run-tests.php -n
 }
 
 package_php() {
 	pkgdesc='A general-purpose scripting language that is especially suited to web development'
-	depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2')
+	depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma')
 	replaces=('php-ldap')
 	conflicts=('php-ldap')
 	provides=("php-ldap=${pkgver}")

Modified: apache.patch
===================================================================
--- apache.patch	2019-11-29 15:59:38 UTC (rev 369922)
+++ apache.patch	2019-11-29 17:28:24 UTC (rev 369923)
@@ -1,10 +1,10 @@
 --- sapi/apache2handler/config.m4.orig
 +++ sapi/apache2handler/config.m4
-@@ -113,7 +113,6 @@
+@@ -111,7 +111,6 @@
        PHP_BUILD_THREAD_SAFE
      fi
    else
--    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'`
      if test -n "$APACHE_THREADED_MPM"; then
        PHP_BUILD_THREAD_SAFE
      fi

Modified: enchant-2.patch
===================================================================
--- enchant-2.patch	2019-11-29 15:59:38 UTC (rev 369922)
+++ enchant-2.patch	2019-11-29 17:28:24 UTC (rev 369923)
@@ -1,29 +1,17 @@
---- php-7.1.13/ext/enchant/config.m4.orig	2018-01-03 02:32:29.000000000 +0000
-+++ php-7.1.13/ext/enchant/config.m4	2018-01-21 22:10:03.788875780 +0000
-@@ -14,9 +14,9 @@
- 	    ENCHANT_SEARCH_DIRS="/usr/local /usr"
- 	fi
- 	for i in $ENCHANT_SEARCH_DIRS; do
--		if test -f $i/include/enchant/enchant.h; then
-+		if test -f $i/include/enchant-2/enchant.h; then
- 			ENCHANT_DIR=$i
--			ENCHANT_INCDIR=$i/include/enchant
-+			ENCHANT_INCDIR=$i/include/enchant-2
- 		elif test -f $i/include/enchant.h; then
- 			ENCHANT_DIR=$i
- 			ENCHANT_INCDIR=$i/include
-@@ -31,7 +31,7 @@
+--- ext/enchant/config.m4.orig
++++ ext/enchant/config.m4
+@@ -4,7 +4,7 @@
+     [Include Enchant support])])
  
- 	AC_DEFINE(HAVE_ENCHANT,1,[ ])
- 	PHP_SUBST(ENCHANT_SHARED_LIBADD)
--	PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
-+	PHP_ADD_LIBRARY_WITH_PATH(enchant-2, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD)
- 	PHP_ADD_INCLUDE($ENCHANT_INCDIR)
- 	PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param,
- 	[
---- php-7.2.1/ext/enchant/enchant.c.orig	2018-01-02 22:36:05.000000000 +0000
-+++ php-7.2.1/ext/enchant/enchant.c	2018-01-21 22:34:50.205791491 +0000
-@@ -741,7 +741,7 @@
+ 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
+@@ -740,7 +740,7 @@
  			for (i = 0; i < n_sugg; i++) {
  				add_next_index_string(sugg, suggs[i]);
  			}
@@ -32,7 +20,7 @@
  		}
  
  
-@@ -798,7 +798,7 @@
+@@ -797,7 +797,7 @@
  			add_next_index_string(return_value, suggs[i]);
  		}
  
@@ -41,7 +29,7 @@
  	}
  }
  /* }}} */
-@@ -818,7 +818,7 @@
+@@ -817,7 +817,7 @@
  
  	PHP_ENCHANT_GET_DICT;
  
@@ -50,7 +38,7 @@
  }
  /* }}} */
  
-@@ -856,7 +856,7 @@
+@@ -855,7 +855,7 @@
  
  	PHP_ENCHANT_GET_DICT;
  

Deleted: freetype.patch
===================================================================
--- freetype.patch	2019-11-29 15:59:38 UTC (rev 369922)
+++ freetype.patch	2019-11-29 17:28:24 UTC (rev 369923)
@@ -1,38 +0,0 @@
-diff -u -r php-7.2.5/ext/gd/config.m4 php-7.2.5-freetype/ext/gd/config.m4
---- php-7.2.5/ext/gd/config.m4	2018-04-24 17:09:54.000000000 +0200
-+++ php-7.2.5-freetype/ext/gd/config.m4	2018-05-09 14:49:03.647108948 +0200
-@@ -186,6 +186,9 @@
- AC_DEFUN([PHP_GD_FREETYPE2],[
-   if test "$PHP_FREETYPE_DIR" != "no"; then
- 
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+
-+    AC_MSG_CHECKING([for freetype])
-     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-       if test -f "$i/bin/freetype-config"; then
-         FREETYPE2_DIR=$i
-@@ -194,13 +197,20 @@
-       fi
-     done
- 
--    if test -z "$FREETYPE2_DIR"; then
-+    if test -n "$FREETYPE2_CONFIG"; then
-+      FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
-+      FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
-+      AC_MSG_RESULT([found in $FREETYPE2_DIR])
-+    elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then
-+      FREETYPE2_DIR=pkg-config
-+      FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags`
-+      FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs`
-+      AC_MSG_RESULT([found by pkg-config])
-+    else
-+      AC_MSG_RESULT([not found])
-       AC_MSG_ERROR([freetype-config not found.])
-     fi
- 
--    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
--    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
--
-     PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
-     PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
-     AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])

Modified: generate_patches
===================================================================
--- generate_patches	2019-11-29 15:59:38 UTC (rev 369922)
+++ generate_patches	2019-11-29 17:28:24 UTC (rev 369923)
@@ -26,7 +26,7 @@
 	-e 's#^PIDFile=.*#PIDFile=/run/php-fpm/php-fpm.pid#' \
 	-i.orig sapi/fpm/php-fpm.service.in
 
-extensions=";extension=bcmath\n;extension=bz2\n;extension=calendar\nextension=curl\n;extension=dba\n;extension=enchant\n;extension=exif\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\n;extension=sodium\n;extension=ldap\n;extension=mysqli\n;extension=odbc\n;zend_extension=opcache\n;extension=pdo_dblib\n;extension=pdo_mysql\n;extension=pdo_odbc\n;extension=pdo_pgsql\n;extension=pdo_sqlite\n;extension=pgsql\n;extension=pspell\n;extension=shmop\n;extension=snmp\n;extension=soap\n;extension=sockets\n;extension=sqlite3\n;extension=sysvmsg\n;extension=sysvsem\n;extension=sysvshm\n;extension=tidy\n;extension=xmlrpc\n;extension=xsl\nextension=zip\n"
+extensions=";extension=bcmath\n;extension=bz2\n;extension=calendar\nextension=curl\n;extension=dba\n;extension=enchant\n;extension=exif\n;extension=ffi\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\n;extension=ldap\n;extension=mysqli\n;extension=odbc\n;zend_extension=opcache\n;extension=pdo_dblib\n;extension=pdo_mysql\n;extension=pdo_odbc\n;extension=pdo_pgsql\n;extension=pdo_sqlite\n;extension=pgsql\n;extension=pspell\n;extension=shmop\n;extension=snmp\n;extension=soap\n;extension=sockets\n;extension=sodium\n;extension=sqlite3\n;extension=sysvmsg\n;extension=sysvsem\n;extension=sysvshm\n;extension=tidy\n;extension=xmlrpc\n;extension=xsl\nextension=zip\n"
 
 sed \
 	-r ":a;N;\$!ba;s/; Notes for Windows environments :\n.+;?extension=\w+\n/${extensions}/g" \
@@ -35,6 +35,19 @@
 	-e 's#^;extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \
 	-i php.ini-production
 
+sed \
+	-r 's#PKG_CHECK_MODULES\(\[ENCHANT\], \[enchant\]\)#PKG_CHECK_MODULES([ENCHANT], [enchant-2])#g' \
+	-i.orig ext/enchant/config.m4
+sed \
+	-r 's#enchant_dict_free_suggestions\(pdict->pdict, suggs\)#enchant_dict_free_string_list(pdict->pdict, suggs)#g' \
+	-i.orig ext/enchant/enchant.c
+sed \
+	-r 's#enchant_dict_add_to_personal\(pdict->pdict, word, wordlen\)#enchant_dict_add(pdict->pdict, word, wordlen)#g' \
+	-i ext/enchant/enchant.c
+sed \
+	-r 's#enchant_dict_is_in_session\(pdict->pdict, word, wordlen\)#enchant_dict_is_added(pdict->pdict, word, wordlen)#g' \
+	-i ext/enchant/enchant.c
+
 diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 | filterdiff --clean --remove-timestamps > ../../apache.patch
 
 diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag | filterdiff --clean --remove-timestamps > ../../php-fpm.patch
@@ -44,4 +57,7 @@
 
 diff -u php.ini-production.orig php.ini-production | filterdiff --clean --remove-timestamps > ../../php.ini.patch
 
+diff -u ext/enchant/config.m4.orig ext/enchant/config.m4 | filterdiff --clean --remove-timestamps > ../../enchant-2.patch
+diff -u ext/enchant/enchant.c.orig ext/enchant/enchant.c | filterdiff --clean --remove-timestamps >> ../../enchant-2.patch
+
 popd

Modified: php-fpm.patch
===================================================================
--- php-fpm.patch	2019-11-29 15:59:38 UTC (rev 369922)
+++ php-fpm.patch	2019-11-29 17:28:24 UTC (rev 369923)
@@ -71,4 +71,4 @@
 +PIDFile=/run/php-fpm/php-fpm.pid
  ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
  ExecReload=/bin/kill -USR2 $MAINPID
- PrivateTmp=true
+ 

Modified: php.ini.patch
===================================================================
--- php.ini.patch	2019-11-29 15:59:38 UTC (rev 369922)
+++ php.ini.patch	2019-11-29 17:28:24 UTC (rev 369923)
@@ -1,6 +1,6 @@
 --- php.ini-production.orig
 +++ php.ini-production
-@@ -751,7 +751,7 @@
+@@ -756,7 +756,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -9,7 +9,7 @@
  ; On windows:
  ;extension_dir = "ext"
  
-@@ -899,48 +899,44 @@
+@@ -904,48 +904,45 @@
  ; deprecated in a future PHP major version. So, when it is possible, please
  ; move to the new ('extension=<ext>) syntax.
  ;
@@ -22,13 +22,14 @@
 +;extension=bcmath
  ;extension=bz2
 -;extension=curl
--;extension=fileinfo
--;extension=gd2
 +;extension=calendar
 +extension=curl
 +;extension=dba
 +;extension=enchant
 +;extension=exif
+ ;extension=ffi
+-;extension=fileinfo
+-;extension=gd2
 +;extension=ftp
 +;extension=gd
  ;extension=gettext
@@ -36,9 +37,7 @@
 -;extension=intl
 +;extension=iconv
  ;extension=imap
--;extension=interbase
 +;extension=intl
-+;extension=sodium
  ;extension=ldap
 -;extension=mbstring
 -;extension=exif      ; Must be after mbstring as it depends on it
@@ -64,7 +63,7 @@
 -
  ;extension=soap
  ;extension=sockets
--;extension=sodium
+ ;extension=sodium
  ;extension=sqlite3
 +;extension=sysvmsg
 +;extension=sysvsem



More information about the arch-commits mailing list