Thu Oct 18 01:23:58 PDT 2012

5 files changed, 19 insertions, 19 deletions

diff --git a/testing/iputils/PKGBUILD b/testing/iputils/PKGBUILD
index eaafc8240..995352da8 100644
--- a/testing/iputils/PKGBUILD
+++ b/testing/iputils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167961 2012-10-04 12:11:50Z stephane $
+# $Id: PKGBUILD 169051 2012-10-17 14:09:37Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=iputils
-pkgver=20101006
-pkgrel=7
+pkgver=20121011
+pkgrel=1
 pkgdesc="IP Configuration Utilities (and Ping)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -20,7 +20,7 @@ backup=(etc/xinetd.d/tftp)
 install=${pkgname}.install
 source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd
         iputils-20101006-ping-integer-overflow.patch)
-sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
+sha1sums=('3e85179746fd93000d6267bd55addfe97f321ba7'
           'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
           'ec78574d798b53e4f8bdd37e42514fc17ed71667')
 
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD
index 9de7253da..ed3272ed3 100644
--- a/testing/php/PKGBUILD
+++ b/testing/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161804 2012-06-14 17:07:05Z pierre $
+# $Id: PKGBUILD 169085 2012-10-17 19:12:34Z 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.8
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -33,13 +33,13 @@ 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=('bb8c816a9299be8995255ef70c63b800'
          '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         'aabda9f3f2f8b9d8fdc9558c31c718db'
-         '825e580dd5708d959b50944afa1b12b6'
+         '3cfde0cc4ed09b55f1ce531437a4eb88'
+         '5c1f4c967b66ce3eaf819b46951dcbf5'
          'f56b5bb7e93c802ae8519182fbea3387'
-         '86c73d481f3099e740e602869bacf637'
+         'f8b206cb8fecb05cb1ded8bee45633ff'
          'c60343df74f8e1afb13b084d5c0e47ed')
 
 build() {
diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch
index 0b17182fd..d618fca4e 100644
--- a/testing/php/php-fpm.conf.in.patch
+++ b/testing/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
---- sapi/fpm/php-fpm.conf.in	2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-03-01 19:50:48.549947258 +0100
+--- sapi/fpm/php-fpm.conf.in	2012-08-15 06:26:05.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2012-08-16 14:17:41.809663595 +0200
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
  ;  - the global prefix if it's been set (-p arguement)
@@ -18,7 +18,7 @@
  
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -140,7 +140,8 @@
+@@ -148,7 +148,8 @@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
@@ -28,7 +28,7 @@
  
  ; Set listen(2) backlog.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -151,9 +152,9 @@
+@@ -159,9 +160,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
  ; Default Values: user and group are set as the running user
  ;                 mode is set to 0666
@@ -41,7 +41,7 @@
   
  ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
  ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -442,7 +443,7 @@
+@@ -458,7 +459,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
diff --git a/testing/php/php-fpm.service b/testing/php/php-fpm.service
index e29f7c236..fc5ead6f3 100644
--- a/testing/php/php-fpm.service
+++ b/testing/php/php-fpm.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=FastCGI Process Manager for PHP
+Description=The PHP FastCGI Process Manager
 After=syslog.target network.target
 
 [Service]
 Type=forking
 PIDFile=/run/php-fpm/php-fpm.pid
 PrivateTmp=true
-ExecStart=/usr/sbin/php-fpm
+ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
 ExecReload=/bin/kill -USR2 $MAINPID
 
 [Install]
diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm
index 3b3ec20de..a8cb9eca9 100644
--- a/testing/php/rc.d.php-fpm
+++ b/testing/php/rc.d.php-fpm
@@ -57,7 +57,7 @@ case "$1" in
 		test_config
 		stat_busy 'Starting php-fpm'
 
-		/usr/sbin/php-fpm
+		/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
 
 		if [ "$?" != 0 ] ; then
 			stat_fail
@@ -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