[arch-commits] Commit in php/trunk (PKGBUILD php.ini.patch)
Pierre Schmitz
pierre at archlinux.org
Thu Aug 28 09:21:41 UTC 2014
Date: Thursday, August 28, 2014 @ 11:21:40
Author: pierre
Revision: 220727
upgpkg: php 5.6.0-3
Modified:
php/trunk/PKGBUILD
php/trunk/php.ini.patch
---------------+
PKGBUILD | 77 ++++++++++++++++++++++++++++++++++++++++----------------
php.ini.patch | 15 +++++-----
2 files changed, 62 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-08-28 01:56:21 UTC (rev 220726)
+++ PKGBUILD 2014-08-28 09:21:40 UTC (rev 220727)
@@ -7,6 +7,7 @@
'php-apache'
'php-fpm'
'php-embed'
+ 'php-phpdbg'
'php-pear'
'php-enchant'
'php-gd'
@@ -21,8 +22,8 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.5.16
-pkgrel=2
+pkgver=5.6.0
+pkgrel=3
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -29,14 +30,14 @@
makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
- 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz"
- "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc"
+ 'curl' 'libxslt' 'openssl' 'db' 'gmp' 'freetype2' 'systemd')
+source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"
+ "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz.asc"
'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('5def6d89792caa70448c67cd510e0f3e'
+md5sums=('642825d75ce2634d9513d5b21dbee521'
'SKIP'
- '510f9092ebfe6e378e12817e197a88b6'
+ 'c0da10d91c06b07489f495e78116ab1b'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'6bc1fc4ceee039d21ff3b56aa845cc5a'
'25bc67ad828e8147a817410b68d8016c'
@@ -104,6 +105,7 @@
--with-vpx-dir=/usr \
--with-ldap=shared \
--with-ldap-sasl \
+ --with-libzip \
--with-mcrypt=shared \
--with-mhash \
--with-mssql=shared \
@@ -185,6 +187,17 @@
${_phpextensions}
make
+ # phpdbg
+ cp -a ${srcdir}/build-php ${srcdir}/build-phpdbg
+ cd ${srcdir}/build-phpdbg
+ ./configure ${_phpconfig} \
+ --disable-cli \
+ --disable-cgi \
+ --with-readline \
+ --enable-phpdbg \
+ ${_phpextensions}
+ make
+
# pear
cp -a ${srcdir}/build-php ${srcdir}/build-pear
cd ${srcdir}/build-pear
@@ -208,7 +221,7 @@
package_php() {
pkgdesc='An HTML-embedded scripting language'
- depends=('pcre' 'libxml2' 'bzip2' 'curl')
+ depends=('pcre' 'libxml2' 'curl' 'libzip')
backup=('etc/php/php.ini')
cd ${srcdir}/build-php
@@ -258,7 +271,7 @@
}
package_php-embed() {
- pkgdesc='Embed SAPI for PHP'
+ pkgdesc='Embedded PHP SAPI library'
depends=('php')
install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so
@@ -265,6 +278,13 @@
install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
}
+package_php-phpdbg() {
+ pkgdesc='Interactive PHP debugger'
+ depends=('php')
+
+ install -D -m755 ${srcdir}/build-phpdbg/sapi/phpdbg/phpdbg ${pkgdir}/usr/bin/phpdbg
+}
+
package_php-pear() {
pkgdesc='PHP Extension and Application Repository'
depends=('php')
@@ -276,82 +296,95 @@
}
package_php-enchant() {
+ pkgdesc='enchant module for PHP'
depends=('php' 'enchant')
- pkgdesc='enchant module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
}
package_php-gd() {
- depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx')
pkgdesc='gd module for PHP'
+ depends=('php' 'libjpeg' 'libvpx')
+
install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
}
package_php-intl() {
+ pkgdesc='intl module for PHP'
depends=('php' 'icu')
- pkgdesc='intl module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
}
package_php-ldap() {
+ pkgdesc='ldap module for PHP'
depends=('php' 'libldap')
- pkgdesc='ldap module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so
}
package_php-mcrypt() {
+ pkgdesc='mcrypt module for PHP'
depends=('php' 'libmcrypt' 'libltdl')
- pkgdesc='mcrypt module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so
}
package_php-mssql() {
+ pkgdesc='mssql module for PHP'
depends=('php' 'freetds')
- pkgdesc='mssql module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so
}
package_php-odbc() {
+ pkgdesc='ODBC modules for PHP'
depends=('php' 'unixodbc')
- pkgdesc='ODBC modules for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
}
package_php-pgsql() {
+ pkgdesc='PostgreSQL modules for PHP'
depends=('php' 'postgresql-libs')
- pkgdesc='PostgreSQL modules for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
}
package_php-pspell() {
+ pkgdesc='pspell module for PHP'
depends=('php' 'aspell')
- pkgdesc='pspell module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
}
package_php-snmp() {
+ pkgdesc='snmp module for PHP'
depends=('php' 'net-snmp')
- pkgdesc='snmp module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
}
package_php-sqlite() {
+ pkgdesc='sqlite module for PHP'
depends=('php' 'sqlite')
- pkgdesc='sqlite module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
}
package_php-tidy() {
+ pkgdesc='tidy module for PHP'
depends=('php' 'tidyhtml')
- pkgdesc='tidy module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
}
package_php-xsl() {
+ pkgdesc='xsl module for PHP'
depends=('php' 'libxslt')
- pkgdesc='xsl module for PHP'
+
install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
}
Modified: php.ini.patch
===================================================================
--- php.ini.patch 2014-08-28 01:56:21 UTC (rev 220726)
+++ php.ini.patch 2014-08-28 09:21:40 UTC (rev 220727)
@@ -1,5 +1,5 @@
---- php.ini-production 2014-04-29 10:04:30.000000000 +0200
-+++ php.ini-production 2014-05-01 07:32:06.928871679 +0200
+--- php.ini-production 2014-06-21 10:44:15.326264658 +0200
++++ php.ini-production 2014-06-21 10:46:29.652897480 +0200
@@ -296,7 +296,7 @@
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
@@ -9,7 +9,7 @@
; This directive allows you to disable certain functions for security reasons.
; It receives a comma-delimited list of function names. This directive is
-@@ -693,7 +693,7 @@
+@@ -709,7 +709,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -716,7 +716,7 @@
+@@ -732,7 +732,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
@@ -27,7 +27,7 @@
; On windows:
; extension_dir = "ext"
-@@ -854,50 +854,48 @@
+@@ -870,49 +870,48 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
@@ -51,8 +51,7 @@
-;extension=php_exif.dll ; Must be after mbstring as it depends on it
-;extension=php_mysql.dll
-;extension=php_mysqli.dll
--;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client
+-;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
@@ -92,8 +91,8 @@
+;extension=ldap.so
+;extension=mcrypt.so
+;extension=mssql.so
++;extension=mysql.so
+;extension=mysqli.so
-+;extension=mysql.so
+;extension=odbc.so
+;zend_extension=opcache.so
+;extension=openssl.so
More information about the arch-commits
mailing list