diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2013-10-02 20:43:33 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2013-10-02 20:47:12 +0000 |
| commit | ffa5a7ba752651a39fb80af8a6347a31460742c5 (patch) | |
| tree | 7a06b864d2ba59bdcea063aa4eb105e0d8968d41 | |
| parent | f0f86159202072b72546e80c4872256c3c51334d (diff) | |
| download | aports-ffa5a7ba752651a39fb80af8a6347a31460742c5.tar.bz2 aports-ffa5a7ba752651a39fb80af8a6347a31460742c5.tar.xz | |
main/php: upgrade to 5.5.4
| -rw-r--r-- | main/php/APKBUILD | 21 | ||||
| -rw-r--r-- | main/php/gd-iconv.patch | 8 |
2 files changed, 15 insertions, 14 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index c7e57d84c6..04d45bcc60 100644 --- a/main/php/APKBUILD +++ b/main/php/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Matt Smith <mcs@darkregion.net> pkgname=php -pkgver=5.4.20 +pkgver=5.5.4 pkgrel=0 pkgdesc="The PHP language runtime engine" url="http://www.php.net/" @@ -46,6 +46,7 @@ makedepends=" unixodbc-dev zlib-dev autoconf + bison " subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi $pkgname-cli $pkgname-fpm $pkgname-apache2 $pkgname-embed @@ -99,6 +100,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi $pkgname-mssql $pkgname-pdo_dblib $pkgname-wddx + $pkgname-opcache " source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 @@ -108,7 +110,7 @@ source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2 gd-iconv.patch " -_apiver="20100412" +_apiver="20121113" _extdir="/usr/lib/php/modules" _srcdir="$srcdir"/$pkgname-$pkgver @@ -168,7 +170,6 @@ build() { --with-cdb \ --enable-ctype=shared \ --with-curl=shared \ - --with-curlwrappers \ --enable-dba=shared \ --with-db4=shared \ --enable-dom=shared \ @@ -232,6 +233,7 @@ build() { --without-qdbm \ --with-mssql=shared \ --with-pdo-dblib=shared \ + --enable-opcache \ " # cgi, fcgi, cli, pear and extensions @@ -475,19 +477,20 @@ zlib() { _mv_ext zlib; } mssql() { _mv_ext mssql; } pdo_dblib() { _mv_ext pdo_dblib "php-pdo freetds"; } wddx() { _mv_ext wddx; } +opcache() { _mv_ext opcache; } -md5sums="e25db5592ed14842b4239be9d990cce8 php-5.4.20.tar.bz2 +md5sums="456f2eb1ee36f2a277bd4cc778e720eb php-5.5.4.tar.bz2 9ab162ff3428511a68aa9801c746e0d5 php-fpm.initd 67719f428f44ec004da18705cbabe2ee php5-module.conf 483bc0a85c50a9a9aedbe14a19ed4526 php-install-pear-xml.patch -3e0faaaf0abd573300d54f92325e4dba gd-iconv.patch" -sha256sums="cd0e42cf8b01b2fe23d5acbb30e04d64e8df21b0b4093e28aef36743646759e1 php-5.4.20.tar.bz2 +162d8d079944387eab2bc80edab347ae gd-iconv.patch" +sha256sums="49f87e8cf0bbec53a6e7f1c8ab132fcec37bb09990404c7c959f81dfb1637439 php-5.5.4.tar.bz2 96e68f7c545adcac56ed1f5824b33041e270680ca884a9cfe27e7f4ac8abfd3b php-fpm.initd ceec4d5b2a128c6a97e49830af604f0bb555bca1a86a9cd0366b828ba392257f php5-module.conf f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab php-install-pear-xml.patch -acbbc559063e04f69b3c481af007c00541846750c7d47a6daeb72b22c1b793fe gd-iconv.patch" -sha512sums="952cbeaf60813104be2ee03aaa4a402b2a52f3ea3eb706532318afc6c4f7ce642ab92e30108167ca08124da5d26d8181ecd395bdff8d75fdaaf6e9293f06380f php-5.4.20.tar.bz2 +6122bf279cdb7c387dd000761b2426969a73cf63a10a132aa98a79eb1dd259b2 gd-iconv.patch" +sha512sums="69c4c6279c0a74da7d500ffc14f5dd60e13600b69957f0d8b8ec6e94ffb65510c0a970eaa574dfc1fa89d4e9179543313d47d1a67efa100be0b1570b653237ba php-5.5.4.tar.bz2 33247a1c9188eba893bb0be13456eeeec9b971c7f482a4e2bd0f318fb63d8c67d379a021840768bef8e4d630be859c5bdb424c1e90b9b816ec691c078147e915 php-fpm.initd 895e94c791bd82060ad820fef049d366a09c932097faa6b7b9a2c2e9e00a18cb7c0f9b128679c7659b404379266fd0f95dba5c0333f626194cf60f7bf6044102 php5-module.conf f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 php-install-pear-xml.patch -18836154d589fd105e220ad12557789bf4f253f91fb11292c27a96f8ab4ba1619bc21a2f8e5e9df296fb9914c0d94394baad79ffbf9a459d56f7e0a6558094f4 gd-iconv.patch" +59443fb464f49ff7d9b64739df982e7240f9d4792226d96ad1538286945125fc7eb6f0cab88b64d5c81ee3679fd89bffdca59ebd20eca2778ab801ee54529028 gd-iconv.patch" diff --git a/main/php/gd-iconv.patch b/main/php/gd-iconv.patch index ed7384ee9d..c6ea84a368 100644 --- a/main/php/gd-iconv.patch +++ b/main/php/gd-iconv.patch @@ -31,16 +31,14 @@ index 0e35ece..3593cd7 100644 else if test "$PHP_GD" != "no"; then -diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 -index 389d4ad..a12575b 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 -@@ -18,9 +18,6 @@ fi +@@ -18,9 +18,6 @@ PHP_ARG_WITH(libexpat-dir, libexpat dir for XMLRPC-EPI, - [ --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no) + [ --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no) -PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI, --[ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI],no,no) +-[ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI],no,no) - if test "$PHP_XMLRPC" != "no"; then |