diff options
| -rw-r--r-- | .SRCINFO | 66 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | apache.patch | 2 | ||||
| -rwxr-xr-x | generate_patches | 4 | ||||
| -rw-r--r-- | php-fpm.patch | 2 | ||||
| -rw-r--r-- | php.ini.patch | 131 |
6 files changed, 94 insertions, 145 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Thu Aug 17 02:32:50 UTC 2017 +# Sat Aug 19 18:06:53 UTC 2017 pkgbase = php-zts - pkgver = 7.1.8 - pkgrel = 2 + pkgver = 7.2.0beta3 + pkgrel = 1 url = http://www.php.net arch = i686 arch = x86_64 @@ -16,7 +16,6 @@ pkgbase = php-zts makedepends = gd makedepends = gmp makedepends = icu - makedepends = libmcrypt makedepends = libxslt makedepends = libzip makedepends = net-snmp @@ -30,20 +29,20 @@ pkgbase = php-zts makedepends = postfix makedepends = freetds makedepends = pcre - source = https://php.net/distributions/php-7.1.8.tar.xz - source = https://php.net/distributions/php-7.1.8.tar.xz.asc + source = https://downloads.php.net/~remi/php-7.2.0beta3.tar.xz + source = https://downloads.php.net/~remi/php-7.2.0beta3.tar.xz.asc source = apache.patch source = apache.conf source = php-fpm.patch source = php-fpm.tmpfiles source = php.ini.patch - sha256sums = 8943858738604acb33ecedb865d6c4051eeffe4e2d06f3a3c8f794daccaa2aab + sha256sums = 86ab60f96223768d2cb6b3669ce5d048ce904beccf532119aa02058e7cc9e498 sha256sums = SKIP - sha256sums = 258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3 + sha256sums = bd26c9be85e30334369d9d12e623842e1c0552f424d857641318883dfe1f83a3 sha256sums = ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce - sha256sums = 7d982a3cefb3eaec0b3458340e4991c2959c10d1518ecb7c1d041884b14efc73 + sha256sums = d62ffe6a693336752d4decb2acba09b67bdf7cad19807eccf8795f9386303923 sha256sums = 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5 - sha256sums = 78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c + sha256sums = 8ab87630a2e1e031a1f42ce6063a1d9646b0d4299a9260fe4ebeb5cfc38e6972 pkgname = php-zts pkgdesc = PHP with ZTS enabled @@ -51,8 +50,8 @@ pkgname = php-zts depends = curl depends = libzip depends = pcre - provides = php=7.1.8 - provides = php-ldap=7.1.8 + provides = php=7.2.0beta3 + provides = php-ldap=7.2.0beta3 conflicts = php conflicts = php-ldap replaces = php @@ -62,7 +61,7 @@ pkgname = php-zts pkgname = php-zts-cgi pkgdesc = CGI and FCGI SAPI for PHP depends = php-zts - provides = php-cgi=7.1.8 + provides = php-cgi=7.2.0beta3 conflicts = php-cgi replaces = php-cgi @@ -70,7 +69,7 @@ pkgname = php-zts-apache pkgdesc = Apache SAPI for PHP depends = php-zts depends = apache - provides = php-apache=7.1.8 + provides = php-apache=7.2.0beta3 conflicts = php-apache replaces = php-apache backup = etc/httpd/conf/extra/php7_module.conf @@ -79,7 +78,7 @@ pkgname = php-zts-fpm pkgdesc = FastCGI Process Manager for PHP depends = php-zts depends = systemd - provides = php-fpm=7.1.8 + provides = php-fpm=7.2.0beta3 conflicts = php-fpm replaces = php-fpm options = !emptydirs @@ -90,7 +89,7 @@ pkgname = php-zts-embed pkgdesc = Embedded PHP SAPI library depends = php-zts depends = libsystemd - provides = php-embed=7.1.8 + provides = php-embed=7.2.0beta3 conflicts = php-embed replaces = php-embed options = !emptydirs @@ -98,7 +97,7 @@ pkgname = php-zts-embed pkgname = php-zts-phpdbg pkgdesc = Interactive PHP debugger depends = php-zts - provides = php-phpdbg=7.1.8 + provides = php-phpdbg=7.2.0beta3 conflicts = php-phpdbg replaces = php-phpdbg options = !emptydirs @@ -107,7 +106,7 @@ pkgname = php-zts-dblib pkgdesc = dblib module for PHP depends = php-zts depends = freetds - provides = php-dblib=7.1.8 + provides = php-dblib=7.2.0beta3 conflicts = php-dblib replaces = php-dblib @@ -115,7 +114,7 @@ pkgname = php-zts-enchant pkgdesc = enchant module for PHP depends = php-zts depends = enchant - provides = php-enchant=7.1.8 + provides = php-enchant=7.2.0beta3 conflicts = php-enchant replaces = php-enchant @@ -123,7 +122,7 @@ pkgname = php-zts-gd pkgdesc = gd module for PHP depends = php-zts depends = gd - provides = php-gd=7.1.8 + provides = php-gd=7.2.0beta3 conflicts = php-gd replaces = php-gd @@ -131,7 +130,7 @@ pkgname = php-zts-imap pkgdesc = imap module for PHP depends = php-zts depends = c-client - provides = php-imap=7.1.8 + provides = php-imap=7.2.0beta3 conflicts = php-imap replaces = php-imap @@ -139,24 +138,15 @@ pkgname = php-zts-intl pkgdesc = intl module for PHP depends = php-zts depends = icu - provides = php-intl=7.1.8 + provides = php-intl=7.2.0beta3 conflicts = php-intl replaces = php-intl -pkgname = php-zts-mcrypt - pkgdesc = mcrypt module for PHP - depends = php-zts - depends = libmcrypt - depends = libtool - provides = php-mcrypt=7.1.8 - conflicts = php-mcrypt - replaces = php-mcrypt - pkgname = php-zts-odbc pkgdesc = ODBC modules for PHP depends = php-zts depends = unixodbc - provides = php-odbc=7.1.8 + provides = php-odbc=7.2.0beta3 conflicts = php-odbc replaces = php-odbc @@ -164,7 +154,7 @@ pkgname = php-zts-pgsql pkgdesc = PostgreSQL modules for PHP depends = php-zts depends = postgresql-libs - provides = php-pgsql=7.1.8 + provides = php-pgsql=7.2.0beta3 conflicts = php-pgsql replaces = php-pgsql @@ -172,7 +162,7 @@ pkgname = php-zts-pspell pkgdesc = pspell module for PHP depends = php-zts depends = aspell - provides = php-pspell=7.1.8 + provides = php-pspell=7.2.0beta3 conflicts = php-pspell replaces = php-pspell @@ -180,7 +170,7 @@ pkgname = php-zts-snmp pkgdesc = snmp module for PHP depends = php-zts depends = net-snmp - provides = php-snmp=7.1.8 + provides = php-snmp=7.2.0beta3 conflicts = php-snmp replaces = php-snmp @@ -188,7 +178,7 @@ pkgname = php-zts-sqlite pkgdesc = sqlite module for PHP depends = php-zts depends = sqlite - provides = php-sqlite=7.1.8 + provides = php-sqlite=7.2.0beta3 conflicts = php-sqlite replaces = php-sqlite @@ -196,7 +186,7 @@ pkgname = php-zts-tidy pkgdesc = tidy module for PHP depends = php-zts depends = tidy - provides = php-tidy=7.1.8 + provides = php-tidy=7.2.0beta3 conflicts = php-tidy replaces = php-tidy @@ -204,7 +194,7 @@ pkgname = php-zts-xsl pkgdesc = xsl module for PHP depends = php-zts depends = libxslt - provides = php-xsl=7.1.8 + provides = php-xsl=7.2.0beta3 conflicts = php-xsl replaces = php-xsl @@ -13,7 +13,6 @@ pkgname=("${pkgbase}" "${pkgbase}-gd" "${pkgbase}-imap" "${pkgbase}-intl" - "${pkgbase}-mcrypt" "${pkgbase}-odbc" "${pkgbase}-pgsql" "${pkgbase}-pspell" @@ -21,25 +20,24 @@ pkgname=("${pkgbase}" "${pkgbase}-sqlite" "${pkgbase}-tidy" "${pkgbase}-xsl") -pkgver=7.1.8 -pkgrel=2 +pkgver=7.2.0beta3 +pkgrel=1 arch=('i686' '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' '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} +source=("https://downloads.php.net/~remi/${_pkgbase}-${pkgver}.tar.xz"{,.asc} 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch') -sha256sums=('8943858738604acb33ecedb865d6c4051eeffe4e2d06f3a3c8f794daccaa2aab' +sha256sums=('86ab60f96223768d2cb6b3669ce5d048ce904beccf532119aa02058e7cc9e498' 'SKIP' - '258b33b6531b1128d9804c8b608b6013423a421edcf764747042d07e79ec6df3' + 'bd26c9be85e30334369d9d12e623842e1c0552f424d857641318883dfe1f83a3' 'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce' - '7d982a3cefb3eaec0b3458340e4991c2959c10d1518ecb7c1d041884b14efc73' + 'd62ffe6a693336752d4decb2acba09b67bdf7cad19807eccf8795f9386303923' '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5' - '78f60b1d9f3a0ef8af77208feed76e303b3a13e93b80613c1e5a729004a5343c') -validpgpkeys=('A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0' - '528995BFEDFBA7191D46839EF9BA0ADA31CBD89E') + '8ab87630a2e1e031a1f42ce6063a1d9646b0d4299a9260fe4ebeb5cfc38e6972') +validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F') prepare() { cd ${srcdir}/${_pkgbase}-${pkgver} @@ -70,7 +68,6 @@ build() { --enable-dba=shared \ --enable-exif=shared \ --enable-ftp=shared \ - --enable-gd-native-ttf \ --enable-intl=shared \ --enable-mbstring \ --enable-shmop=shared \ @@ -96,7 +93,6 @@ build() { --with-ldap=shared \ --with-ldap-sasl \ --with-libzip \ - --with-mcrypt=shared \ --with-mhash \ --with-mysql-sock=/run/mysqld/mysqld.sock \ --with-mysqli=shared,mysqlnd \ @@ -186,7 +182,7 @@ package_php-zts() { # 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,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 } @@ -303,16 +299,6 @@ package_php-zts-intl() { install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so } -package_php-zts-mcrypt() { - pkgdesc='mcrypt module for PHP' - depends=("${pkgbase}" 'libmcrypt' 'libtool') - replaces=("${_pkgbase}-mcrypt") - conflicts=("${_pkgbase}-mcrypt") - provides=("${_pkgbase}-mcrypt=${pkgver}") - - install -D -m755 ${srcdir}/build/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so -} - package_php-zts-odbc() { pkgdesc='ODBC modules for PHP' depends=("${pkgbase}" 'unixodbc') diff --git a/apache.patch b/apache.patch index 432df402139f..ccfeecb10b86 100644 --- a/apache.patch +++ b/apache.patch @@ -10,7 +10,7 @@ fi --- configure.orig +++ configure -@@ -6932,7 +6932,6 @@ +@@ -7020,7 +7020,6 @@ fi else diff --git a/generate_patches b/generate_patches index 98fec442eea3..de45eb7234a0 100755 --- a/generate_patches +++ b/generate_patches @@ -26,10 +26,10 @@ sed \ -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=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/;extension=bz2\n.+;?extension=[a-z]+\n/${extensions}/g" \ -i.orig php.ini-production sed \ -e 's#^; extension_dir = "\./"$#extension_dir = "/usr/lib/php/modules/"#g' \ diff --git a/php-fpm.patch b/php-fpm.patch index d26034639000..d32d3920d681 100644 --- a/php-fpm.patch +++ b/php-fpm.patch @@ -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 diff --git a/php.ini.patch b/php.ini.patch index 474f825921d4..3cc0d81e13ce 100644 --- a/php.ini.patch +++ b/php.ini.patch @@ -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 @@ -9,89 +9,62 @@ ; On windows: ; 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. +@@ -890,40 +890,43 @@ + ; extension folders as well as the separate PECL DLL download (PHP 5+). + ; Be sure to appropriately set the extension_dir directive. ; --; 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. --; --;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 ++;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=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 ; |