diff options
| author | root <root@rshg054.dnsready.net> | 2012-04-28 00:01:35 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-04-28 00:01:35 +0000 |
| commit | 00f77ef3b2b7856520daba393370f67b773c2184 (patch) | |
| tree | ac5b63574a95d0d851e012957254f7456ced564f /extra/php | |
| parent | 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 (diff) | |
Sat Apr 28 00:01:35 UTC 2012
Diffstat (limited to 'extra/php')
| -rw-r--r-- | extra/php/PKGBUILD | 25 | ||||
| -rw-r--r-- | extra/php/suhosin.patch | 13 |
2 files changed, 26 insertions, 12 deletions
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 04e73d509..dec279693 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157026 2012-04-23 09:27:54Z ibiru $ +# $Id: PKGBUILD 157229 2012-04-26 10:12:29Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,22 +21,22 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.10 +pkgver=5.3.11 _suhosinver=5.3.9-0.9.10 -pkgrel=5 +pkgrel=1 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' - 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm' 'pcre_info.patch') -md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' + 'logrotate.d.php-fpm' 'suhosin.patch') +md5sums=('94709f6e7c920cbe26e19fa991d9975d' 'c099b3d7eac95018ababd41ded7f3066' 'c15d18f846be1d69144a5d0056ee6506' 'ffc338e8ce2a990f6f2a486355bbab65' @@ -44,7 +44,7 @@ md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' 'b01be5f816988fcee7e78225836e5e27' '740ec5fe2ecfd9d7febd4081c90ec65b' '07c4e412909ac65a44ec90e7a2c4bade' - '8d3806bbb19e390f9b32ccf21611d937') + '07ca7da608553b4cb92797e655eb94f1') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ @@ -135,12 +135,13 @@ build() { PEAR_INSTALLDIR=/usr/share/pear export PEAR_INSTALLDIR - cd ${srcdir}/${pkgbase}-${pkgver} + # fix the suhosin patch + patch -i ${srcdir}/suhosin.patch - patch -p1 -i ${srcdir}/pcre_info.patch + cd ${srcdir}/${pkgbase}-${pkgver} # apply suhosin patch - patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + patch -F3 -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch # adjust paths patch -p0 -i ${srcdir}/php.ini.patch @@ -349,8 +350,8 @@ package_php-snmp() { } package_php-sqlite() { - depends=('php' 'sqlite3') - pkgdesc='sqlite3 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 } diff --git a/extra/php/suhosin.patch b/extra/php/suhosin.patch new file mode 100644 index 000000000..e5db52d40 --- /dev/null +++ b/extra/php/suhosin.patch @@ -0,0 +1,13 @@ +--- suhosin-patch-5.3.9-0.9.10.patch 2012-04-01 11:55:46.699676255 +0200
++++ suhosin-patch-5.3.9-0.9.10.patch 2012-04-01 11:56:19.322146479 +0200
+@@ -4515,8 +4515,8 @@
+ +#define SUHOSIN_PATCH 1
+ +EOF
+
+- echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
+- echo "configure:19377: checking for declared timezone" >&5
++ echo "$as_me:$LINENO: checking for declared timezone" >&5
++ echo $ECHO_N "checking for declared timezone... $ECHO_C" >&6
+ @@ -115830,7 +115833,7 @@
+ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
+ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
|