diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-04 11:57:36 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-04 11:57:36 +0100 |
commit | 0faf579c24046ce4256b76c0cedf751c3ef024a2 (patch) | |
tree | b34add6ffaf593bb556a93ac0fad20eda4204606 /extra/php | |
parent | 415b1b011936d464fe3042233910d0ac14a8d858 (diff) | |
parent | de078a89b9e3a45b6b2e3f0c9d866962e5125ba3 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/amsn/PKGBUILD
community/luakit/PKGBUILD
testing/feh/PKGBUILD
testing/gimp/PKGBUILD
testing/libpng/PKGBUILD
testing/libwebkit/PKGBUILD
testing/php/PKGBUILD
testing/vlc/PKGBUILD
Diffstat (limited to 'extra/php')
-rw-r--r-- | extra/php/PKGBUILD | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 63827e0ed..b75269ef1 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146477 2012-01-11 15:22:26Z stephane $ +# $Id: PKGBUILD 148505 2012-02-02 21:11:43Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,8 +21,8 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.9 -_suhosinver=5.3.7-0.9.10 +pkgver=5.3.10 +_suhosinver=5.3.9-0.9.10 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -36,9 +36,9 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "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') -md5sums=('dd3288ed5c08cd61ac5bf619cb357521' - '08582e502fed8221c6577042ca45ddb8' - '5bf4473f658404aa9a97bf026ecef8e9' +md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' + 'c099b3d7eac95018ababd41ded7f3066' + 'c15d18f846be1d69144a5d0056ee6506' 'ffc338e8ce2a990f6f2a486355bbab65' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' @@ -137,7 +137,7 @@ build() { cd ${srcdir}/${pkgbase}-${pkgver} # apply suhosin patch - sed 's/1997-2011/1997-2012/g' ${srcdir}/suhosin-patch-${_suhosinver}.patch | patch -p1 + patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch # adjust paths patch -p0 -i ${srcdir}/php.ini.patch |