summaryrefslogtreecommitdiff
path: root/extra/php
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-06-08 00:07:33 -0700
committerroot <root@rshg054.dnsready.net>2013-06-08 00:07:33 -0700
commite90166c70f3a2bd27d8c914491f7e0510855fd3f (patch)
treec0ec802e40354cae1e19532f4dc5e16713d869df /extra/php
parent0312a836fd7650702bd6667fee9e949b585126d8 (diff)
Sat Jun 8 00:07:33 PDT 2013
Diffstat (limited to 'extra/php')
-rw-r--r--extra/php/PKGBUILD13
-rw-r--r--extra/php/php-fpm.service4
2 files changed, 9 insertions, 8 deletions
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 7bd593a6f..f5d0e1581 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185573 2013-05-15 08:05:33Z bpiotrowski $
+# $Id: PKGBUILD 187846 2013-06-07 04:00:16Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -21,24 +21,24 @@ pkgname=('php'
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.4.15
-pkgrel=3
+pkgver=5.4.16
+pkgrel=1
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
- 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
+ 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd')
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('145ea5e845e910443ff1eddb3dbcf56a'
+md5sums=('3d2c694d28861d707b2622c3cc941cff'
'44c1bb1df346b3b9d3e092c7df9a37d0'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'5c1f4c967b66ce3eaf819b46951dcbf5'
'e036c721e5ad927cd1613c7475a58b3a'
- '4af4d94f3db58437eef8db87d16a5fab'
+ 'cc2940f5312ba42e7aa1ddfab74b84c4'
'c60343df74f8e1afb13b084d5c0e47ed')
prepare() {
@@ -84,6 +84,7 @@ build() {
--with-curl=shared \
--with-db4=/usr \
--with-enchant=shared,/usr \
+ --with-fpm-systemd \
--with-freetype-dir=/usr \
--with-gd=shared \
--with-gdbm \
diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service
index 1ae62051f..6e2faafd8 100644
--- a/extra/php/php-fpm.service
+++ b/extra/php/php-fpm.service
@@ -3,10 +3,10 @@ Description=The PHP FastCGI Process Manager
After=syslog.target network.target
[Service]
-Type=forking
+Type=notify
PIDFile=/run/php-fpm/php-fpm.pid
PrivateTmp=true
-ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
+ExecStart=/usr/bin/php-fpm --nodaemonize --pid /run/php-fpm/php-fpm.pid
ExecReload=/bin/kill -USR2 $MAINPID
[Install]