diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
commit | cc565b7309a5708f2375b5f6926d173fd122119d (patch) | |
tree | c1d4adcda7f0b767537620aea02633158e17218a /extra/php | |
parent | c25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff) | |
parent | a65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/mongodb/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xmoto/PKGBUILD
core/kbd/PKGBUILD
extra/elfutils/PKGBUILD
extra/gtk2/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/php-apc/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt/PKGBUILD
extra/quota-tools/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
kde-unstable/soprano/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/pacman/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/bash/PKGBUILD
testing/bison/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/readline/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/php')
-rw-r--r-- | extra/php/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/php/rc.d.php-fpm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 6ae1fe83c..5ceae2e78 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161823 2012-06-15 06:04:39Z pierre $ +# $Id: PKGBUILD 163752 2012-07-19 05:20:23Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.4 +pkgver=5.4.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -33,10 +33,10 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('1fd98dc3f6f3805cd67bff12a26ed77f' +md5sums=('ffcc7f4dcf2b79d667fe0c110e6cb724' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - 'aabda9f3f2f8b9d8fdc9558c31c718db' + '6d46667e00d65933ec0c958279c0a803' '825e580dd5708d959b50944afa1b12b6' 'f56b5bb7e93c802ae8519182fbea3387' '86c73d481f3099e740e602869bacf637' diff --git a/extra/php/rc.d.php-fpm b/extra/php/rc.d.php-fpm index 3b3ec20de..47f0886ac 100644 --- a/extra/php/rc.d.php-fpm +++ b/extra/php/rc.d.php-fpm @@ -86,7 +86,7 @@ case "$1" in kill -QUIT `cat /run/php-fpm/php-fpm.pid` - wait_for_pid removed /run/php-fpm.pid + wait_for_pid removed /run/php-fpm/php-fpm.pid if [ -n "$try" ] ; then stat_fail |