diff options
Diffstat (limited to 'extra/php')
-rw-r--r-- | extra/php/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/php/php-fpm.service | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 9c1355b33..7bd593a6f 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184818 2013-05-09 07:44:41Z pierre $ +# $Id: PKGBUILD 185573 2013-05-15 08:05:33Z bpiotrowski $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.15 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -38,24 +38,21 @@ md5sums=('145ea5e845e910443ff1eddb3dbcf56a' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' 'e036c721e5ad927cd1613c7475a58b3a' - 'f8b206cb8fecb05cb1ded8bee45633ff' + '4af4d94f3db58437eef8db87d16a5fab' 'c60343df74f8e1afb13b084d5c0e47ed') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - # adjust paths patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # workaround for pkg-config 0.28 - sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure } build() { local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \ --config-cache \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/php \ --localstatedir=/var \ --with-layout=GNU \ @@ -243,7 +240,7 @@ package_php-fpm() { backup=('etc/php/php-fpm.conf') install='php-fpm.install' - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/bin/php-fpm install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service index fc5ead6f3..1ae62051f 100644 --- a/extra/php/php-fpm.service +++ b/extra/php/php-fpm.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=forking PIDFile=/run/php-fpm/php-fpm.pid PrivateTmp=true -ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid +ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid ExecReload=/bin/kill -USR2 $MAINPID [Install] |