diff options
| -rw-r--r-- | abs/core/php/PKGBUILD | 89 | ||||
| -rw-r--r-- | abs/core/php/__changelog | 5 | ||||
| -rw-r--r-- | abs/core/php/logrotate.d.php-fpm | 2 | ||||
| -rw-r--r-- | abs/core/php/php-fpm.conf.in.patch | 8 | ||||
| -rw-r--r-- | abs/core/php/php.ini.patch | 28 |
5 files changed, 87 insertions, 45 deletions
diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD index 47981e4..b092e71 100644 --- a/abs/core/php/PKGBUILD +++ b/abs/core/php/PKGBUILD @@ -7,6 +7,7 @@ pkgname=('php' 'php-apache' 'php-fpm' 'php-embed' + 'php-phpdbg' 'php-pear' 'php-enchant' 'php-gd' @@ -21,21 +22,20 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.5.11 -pkgrel=3 +pkgver=5.6.3 +pkgrel=1 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' '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" + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'gd' 'icu' + 'curl' 'libxslt' 'openssl' 'db' 'gmp' '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') - prepare() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -85,7 +85,8 @@ build() { --with-enchant=shared,/usr \ --with-fpm-systemd \ --with-freetype-dir=/usr \ - --with-gd=shared \ + --with-xpm-dir=/usr \ + --with-gd=shared,/usr \ --with-gdbm \ --with-gettext=shared \ --with-gmp=shared \ @@ -97,6 +98,7 @@ build() { --with-vpx-dir=/usr \ --with-ldap=shared \ --with-ldap-sasl \ + --with-libzip \ --with-mcrypt=shared \ --with-mhash \ --with-mssql=shared \ @@ -178,6 +180,17 @@ build() { ${_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 @@ -201,7 +214,7 @@ build() { package_php() { pkgdesc='An HTML-embedded scripting language' - depends=('pcre' 'libxml2' 'bzip2' 'curl' 'php-gd' 'php-mcrypt') + depends=('pcre' 'libxml2' 'curl' 'libzip' 'php-gd' 'php-mcrypt') backup=('etc/php/php.ini') install='php.install' @@ -252,13 +265,20 @@ package_php-fpm() { } 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 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') @@ -270,90 +290,103 @@ package_php-pear() { } package_php-enchant() { - depends=('php' 'enchant') pkgdesc='enchant module for PHP' + depends=('php' 'enchant') + 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' 'gd') + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so } package_php-intl() { - depends=('php' 'icu') pkgdesc='intl module for PHP' + depends=('php' 'icu') + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so } package_php-ldap() { - depends=('php' 'libldap') pkgdesc='ldap module for PHP' + depends=('php' 'libldap') + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so } package_php-mcrypt() { - depends=('php' 'libmcrypt' 'libltdl') pkgdesc='mcrypt module for PHP' + depends=('php' 'libmcrypt' 'libltdl') + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so } package_php-mssql() { - depends=('php' 'freetds') pkgdesc='mssql module for PHP' + depends=('php' 'freetds') + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so } package_php-odbc() { - depends=('php' 'unixodbc') pkgdesc='ODBC modules for PHP' + depends=('php' 'unixodbc') + 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() { - depends=('php' 'postgresql-libs') pkgdesc='PostgreSQL modules for PHP' + depends=('php' 'postgresql-libs') + 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() { - depends=('php' 'aspell') pkgdesc='pspell module for PHP' + depends=('php' 'aspell') + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so } package_php-snmp() { - depends=('php' 'net-snmp') pkgdesc='snmp module for PHP' + depends=('php' 'net-snmp') + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so } package_php-sqlite() { - depends=('php' 'sqlite') pkgdesc='sqlite module for PHP' + depends=('php' 'sqlite') + 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() { - depends=('php' 'tidyhtml') pkgdesc='tidy module for PHP' + depends=('php' 'tidyhtml') + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so } package_php-xsl() { - depends=('php' 'libxslt') pkgdesc='xsl module for PHP' + depends=('php' 'libxslt') + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so } -md5sums=('9156fcd4b254cbfa9a7535f931da29d5' +md5sums=('7635f344145a4edd7dff6ecec795aaea' 'SKIP' - '2882de6eb210c826df0872b3ce606765' + '8768a43f8e435e9bbe56ef714214f9b6' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - '9f8263996836e27f5be1483e86ac2e33' - 'e036c721e5ad927cd1613c7475a58b3a' + '6bc1fc4ceee039d21ff3b56aa845cc5a' + '25bc67ad828e8147a817410b68d8016c' 'cc2940f5312ba42e7aa1ddfab74b84c4' 'c60343df74f8e1afb13b084d5c0e47ed') diff --git a/abs/core/php/__changelog b/abs/core/php/__changelog index 26c0ff4..43aa7f6 100644 --- a/abs/core/php/__changelog +++ b/abs/core/php/__changelog @@ -1,8 +1,9 @@ PKGBUILD: package_php: add deps 'php-gd' 'php-mcrypt' since we have them in php.ini + php.ini.patch: short_open_tags = On php.ini.patch: open_basedir commented out -php.ini.patch: error_log = syslog uncommented -pho.ini.patch: +php.ini.patch: error_log = syslog uncommented +php.ini.patch: ==> check and make sure these are uncommented: ==> "extension=ftp.so" ==> "extension=gd.so" diff --git a/abs/core/php/logrotate.d.php-fpm b/abs/core/php/logrotate.d.php-fpm index 1895c5b..2146ddd 100644 --- a/abs/core/php/logrotate.d.php-fpm +++ b/abs/core/php/logrotate.d.php-fpm @@ -3,6 +3,6 @@ notifempty delaycompress postrotate - systemctl reload php-fpm.service || true + /bin/kill -SIGUSR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true endscript } diff --git a/abs/core/php/php-fpm.conf.in.patch b/abs/core/php/php-fpm.conf.in.patch index 4bcdb73..81eabf7 100644 --- a/abs/core/php/php-fpm.conf.in.patch +++ b/abs/core/php/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/php-fpm.conf.in 2013-11-12 15:17:27.000000000 +0100 -+++ sapi/fpm/php-fpm.conf.in 2013-11-12 17:27:21.283279538 +0100 +--- sapi/fpm/php-fpm.conf.in 2014-04-29 10:04:30.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2014-05-01 07:36:14.762839158 +0200 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) @@ -31,10 +31,10 @@ @@ -167,9 +168,9 @@ ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user - ; mode is set to 0666 + ; mode is set to 0660 -;listen.owner = @php_fpm_user@ -;listen.group = @php_fpm_group@ --;listen.mode = 0666 +-;listen.mode = 0660 +listen.owner = @php_fpm_user@ +listen.group = @php_fpm_group@ +listen.mode = 0660 diff --git a/abs/core/php/php.ini.patch b/abs/core/php/php.ini.patch index c27db10..78f51d4 100644 --- a/abs/core/php/php.ini.patch +++ b/abs/core/php/php.ini.patch @@ -1,5 +1,5 @@ ---- php.ini-production.orig 2014-04-15 22:32:53.462733214 +0000 -+++ php.ini-production 2014-04-15 23:16:41.483582108 +0000 +--- php.ini-production.orig 2014-12-08 15:38:39.686053082 +0000 ++++ php.ini-production 2014-12-08 15:45:54.966578982 +0000 @@ -199,7 +199,7 @@ ; Development Value: Off ; Production Value: Off @@ -9,16 +9,25 @@ ; Allow ASP-style <% %> tags. ; http://php.net/asp-tags +@@ -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. + ; http://php.net/open-basedir +-;open_basedir = ++;open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is @@ -574,7 +574,7 @@ ; Example: ;error_log = php_errors.log - ; Log errors to syslog (Event Log on NT, not valid in Windows 95). + ; Log errors to syslog (Event Log on Windows). -;error_log = syslog +error_log = syslog ;windows.show_crt_warning ; Default value: 0 -@@ -693,7 +693,7 @@ +@@ -709,7 +709,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -27,16 +36,16 @@ ; ; 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 -; extension_dir = "./" -+extension_dir = "/usr/lib/php/modules" ++extension_dir = "/usr/lib/php/modules/" ; 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. ; @@ -60,8 +69,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 @@ -101,8 +109,8 @@ +;extension=ldap.so +extension=mcrypt.so +;extension=mssql.so -+extension=mysqli.so +extension=mysql.so ++extension=mysqli.so +;extension=odbc.so +;zend_extension=opcache.so +extension=openssl.so |