[arch-commits] Commit in php/trunk (5 files)
Pierre Schmitz
pierre at archlinux.org
Sun Dec 3 13:56:25 UTC 2017
Date: Sunday, December 3, 2017 @ 13:56:24
Author: pierre
Revision: 311556
upgpkg: php 7.2.0-1
Modified:
php/trunk/PKGBUILD
php/trunk/apache.patch
php/trunk/generate_patches
php/trunk/php-fpm.patch
php/trunk/php.ini.patch
------------------+
PKGBUILD | 36 +++++++-------
apache.patch | 2
generate_patches | 4 -
php-fpm.patch | 2
php.ini.patch | 135 ++++++++++++++++++++++-------------------------------
5 files changed, 80 insertions(+), 99 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-12-03 13:11:59 UTC (rev 311555)
+++ PKGBUILD 2017-12-03 13:56:24 UTC (rev 311556)
@@ -13,7 +13,7 @@
'php-gd'
'php-imap'
'php-intl'
- 'php-mcrypt'
+ 'php-sodium'
'php-odbc'
'php-pgsql'
'php-pspell'
@@ -21,25 +21,24 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=7.1.12
-pkgrel=2
+pkgver=7.2.0
+pkgrel=1
arch=('x86_64')
license=('PHP')
url='http://www.php.net'
-makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libmcrypt' 'libxslt' 'libzip' 'net-snmp'
+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')
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')
-sha256sums=('a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3'
+sha256sums=('87572a6b924670a5d4aac276aaa4a94321936283df391d702c845ffc112db095'
'SKIP'
- '258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3'
+ '07acff660e194197cfbcc955c0d362d6de063e6475668f3df03bfff023af11ed'
'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
- '7d982a3cefb3eaec0b3458340e4991c2959c10d1518ecb7c1d041884b14efc73'
+ 'd62ffe6a693336752d4decb2acba09b67bdf7cad19807eccf8795f9386303923'
'640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
- '78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c')
-validpgpkeys=('A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0'
- '528995BFEDFBA7191D46839EF9BA0ADA31CBD89E')
+ '6725b16ecbf423ef105c2f5fd16bea6affc7c88b67c52f123cf767812d7dd5de')
+validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F')
prepare() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -47,6 +46,8 @@
patch -p0 -i ${srcdir}/apache.patch
patch -p0 -i ${srcdir}/php-fpm.patch
patch -p0 -i ${srcdir}/php.ini.patch
+
+ rm tests/output/stream_isatty_*.phpt
}
build() {
@@ -70,7 +71,6 @@
--enable-dba=shared \
--enable-exif=shared \
--enable-ftp=shared \
- --enable-gd-native-ttf \
--enable-intl=shared \
--enable-mbstring \
--enable-shmop=shared \
@@ -96,7 +96,6 @@
--with-ldap=shared \
--with-ldap-sasl \
--with-libzip \
- --with-mcrypt=shared \
--with-mhash \
--with-mysql-sock=/run/mysqld/mysqld.sock \
--with-mysqli=shared,mysqlnd \
@@ -111,6 +110,7 @@
--with-pspell=shared \
--with-readline \
--with-snmp=shared \
+ --with-sodium=shared \
--with-sqlite3=shared,/usr \
--with-tidy=shared \
--with-unixODBC=shared,/usr \
@@ -173,7 +173,7 @@
pkgdesc='A general-purpose scripting language that is especially suited to web development'
depends=('libxml2' 'curl' 'libzip' 'pcre')
replaces=('php-ldap')
- conflicts=('php-ldap')
+ conflicts=('php-ldap' 'php-mcrypt<=7.1')
provides=("php-ldap=${pkgver}")
backup=('etc/php/php.ini')
@@ -185,7 +185,7 @@
# 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,imap,intl,mcrypt,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,imap,intl,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
}
@@ -272,11 +272,11 @@
install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
}
-package_php-mcrypt() {
- pkgdesc='mcrypt module for PHP'
- depends=('php' 'libmcrypt' 'libtool')
+package_php-sodium() {
+ pkgdesc='sodium module for PHP'
+ depends=('php' 'libsodium')
- install -D -m755 ${srcdir}/build/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so
+ install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/php/modules/sodium.so
}
package_php-odbc() {
Modified: apache.patch
===================================================================
--- apache.patch 2017-12-03 13:11:59 UTC (rev 311555)
+++ apache.patch 2017-12-03 13:56:24 UTC (rev 311556)
@@ -10,7 +10,7 @@
fi
--- configure.orig
+++ configure
-@@ -6932,7 +6932,6 @@
+@@ -7018,7 +7018,6 @@
fi
else
Modified: generate_patches
===================================================================
--- generate_patches 2017-12-03 13:11:59 UTC (rev 311555)
+++ generate_patches 2017-12-03 13:56:24 UTC (rev 311556)
@@ -26,10 +26,10 @@
-e 's#^PIDFile=.*#PIDFile=/run/php-fpm/php-fpm.pid#' \
-i.orig sapi/fpm/php-fpm.service.in
-extensions=";extension=bcmath.so\n;extension=bz2.so\n;extension=calendar.so\nextension=curl.so\n;extension=dba.so\n;extension=enchant.so\n;extension=exif.so\n;extension=ftp.so\n;extension=gd.so\n;extension=gettext.so\n;extension=gmp.so\n;extension=iconv.so\n;extension=imap.so\n;extension=intl.so\n;extension=ldap.so\n;extension=mcrypt.so\n;extension=mysqli.so\n;extension=odbc.so\n;zend_extension=opcache.so\n;extension=pdo_dblib.so\n;extension=pdo_mysql.so\n;extension=pdo_odbc.so\n;extension=pdo_pgsql.so\n;extension=pdo_sqlite.so\n;extension=pgsql.so\n;extension=pspell.so\n;extension=shmop.so\n;extension=snmp.so\n;extension=soap.so\n;extension=sockets.so\n;extension=sqlite3.so\n;extension=sysvmsg.so\n;extension=sysvsem.so\n;extension=sysvshm.so\n;extension=tidy.so\n;extension=xmlrpc.so\n;extension=xsl.so\nextension=zip.so\n"
+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"
sed \
- -r ":a;N;\$!ba;s/; Windows Extensions\n.+;?extension=php_[a-z]+\.dll\n/${extensions}/g" \
+ -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' \
Modified: php-fpm.patch
===================================================================
--- php-fpm.patch 2017-12-03 13:11:59 UTC (rev 311555)
+++ php-fpm.patch 2017-12-03 13:56:24 UTC (rev 311556)
@@ -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.
-@@ -352,7 +352,7 @@
+@@ -356,7 +356,7 @@
; Chdir to this directory at the start.
; Note: relative path can be used.
; Default Value: current directory or / when chroot
Modified: php.ini.patch
===================================================================
--- php.ini.patch 2017-12-03 13:11:59 UTC (rev 311555)
+++ php.ini.patch 2017-12-03 13:56:24 UTC (rev 311556)
@@ -1,6 +1,6 @@
--- php.ini-production.orig
+++ php.ini-production
-@@ -733,7 +733,7 @@
+@@ -734,7 +734,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
@@ -10,88 +10,69 @@
; extension_dir = "ext"
@@ -883,47 +883,44 @@
- ; If you only provide the name of the extension, PHP will look for it in its
- ; default extension directory.
+ ; deprecated in a future PHP major version. So, when it is possible, please
+ ; move to the new ('extension=<ext>) syntax.
;
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
--; extension folders as well as the separate PECL DLL download (PHP 5+).
--; Be sure to appropriately set the extension_dir directive.
+-; Notes for Windows environments :
-;
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_fileinfo.dll
--;extension=php_ftp.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_intl.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_exif.dll ; Must be after mbstring as it depends on it
--;extension=php_mysqli.dll
--;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client
--;extension=php_openssl.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_shmop.dll
+-; - ODBC support is built in, so no dll is needed for it.
+-; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
+-; extension folders as well as the separate PECL DLL download (PHP 5+).
+-; Be sure to appropriately set the extension_dir directive.
+-;
++;extension=bcmath
+ ;extension=bz2
+-;extension=curl
+-;extension=fileinfo
+-;extension=gd2
++;extension=calendar
++extension=curl
++;extension=dba
++;extension=enchant
++;extension=exif
++;extension=ftp
++;extension=gd
+ ;extension=gettext
+ ;extension=gmp
+-;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
+ ;extension=mysqli
+-;extension=oci8_12c ; Use with Oracle Database 12c Instant Client
+-;extension=openssl
+-;extension=pdo_firebird
++;extension=odbc
++;zend_extension=opcache
++;extension=pdo_dblib
+ ;extension=pdo_mysql
+-;extension=pdo_oci
+ ;extension=pdo_odbc
+ ;extension=pdo_pgsql
+ ;extension=pdo_sqlite
+ ;extension=pgsql
++;extension=pspell
+ ;extension=shmop
-
-; The MIBS data available in the PHP distribution must be installed.
-; See http://www.php.net/manual/en/snmp.installation.php
--;extension=php_snmp.dll
+ ;extension=snmp
-
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite3.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
-+;extension=bcmath.so
-+;extension=bz2.so
-+;extension=calendar.so
-+extension=curl.so
-+;extension=dba.so
-+;extension=enchant.so
-+;extension=exif.so
-+;extension=ftp.so
-+;extension=gd.so
-+;extension=gettext.so
-+;extension=gmp.so
-+;extension=iconv.so
-+;extension=imap.so
-+;extension=intl.so
-+;extension=ldap.so
-+;extension=mcrypt.so
-+;extension=mysqli.so
-+;extension=odbc.so
-+;zend_extension=opcache.so
-+;extension=pdo_dblib.so
-+;extension=pdo_mysql.so
-+;extension=pdo_odbc.so
-+;extension=pdo_pgsql.so
-+;extension=pdo_sqlite.so
-+;extension=pgsql.so
-+;extension=pspell.so
-+;extension=shmop.so
-+;extension=snmp.so
-+;extension=soap.so
-+;extension=sockets.so
-+;extension=sqlite3.so
-+;extension=sysvmsg.so
-+;extension=sysvsem.so
-+;extension=sysvshm.so
-+;extension=tidy.so
-+;extension=xmlrpc.so
-+;extension=xsl.so
-+extension=zip.so
+ ;extension=soap
+ ;extension=sockets
+ ;extension=sqlite3
++;extension=sysvmsg
++;extension=sysvsem
++;extension=sysvshm
+ ;extension=tidy
+ ;extension=xmlrpc
+ ;extension=xsl
++extension=zip
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
More information about the arch-commits
mailing list