[arch-commits] Commit in php/trunk (PKGBUILD php-fpm.service)

[Pierre Schmitz]

    Date: Friday, June 7, 2013 @ 05:59:42
  Author: pierre
Revision: 187845

upgpkg: php 5.4.16-1

Modified:
  php/trunk/PKGBUILD
  php/trunk/php-fpm.service

-----------------+
 PKGBUILD        |   11 ++++++-----
 php-fpm.service |    4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-06 23:15:17 UTC (rev 187844)
+++ PKGBUILD	2013-06-07 03:59:42 UTC (rev 187845)
@@ -21,24 +21,24 @@
          '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 @@
 		--with-curl=shared \
 		--with-db4=/usr \
 		--with-enchant=shared,/usr \
+		--with-fpm-systemd \
 		--with-freetype-dir=/usr \
 		--with-gd=shared \
 		--with-gdbm \

Modified: php-fpm.service
===================================================================
--- php-fpm.service	2013-06-06 23:15:17 UTC (rev 187844)
+++ php-fpm.service	2013-06-07 03:59:42 UTC (rev 187845)
@@ -3,10 +3,10 @@
 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]