Date: Thursday, January 17, 2013 @ 14:55:19
Author: pierre
Revision: 175516
upstream update; drop initscripts support
Modified:
php/trunk/PKGBUILD
php/trunk/logrotate.d.php-fpm
Deleted:
php/trunk/rc.d.php-fpm
---------------------+
PKGBUILD | 10 +--
logrotate.d.php-fpm | 2
rc.d.php-fpm | 144 --------------------------------------------------
3 files changed, 5 insertions(+), 151 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-01-17 19:54:39 UTC (rev 175515)
+++ PKGBUILD 2013-01-17 19:55:19 UTC (rev 175516)
@@ -21,7 +21,7 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.4.10
+pkgver=5.4.11
pkgrel=1
arch=('i686' 'x86_64')
license=('PHP')
@@ -31,14 +31,13 @@
'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2";
- 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
+ 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('cb716b657a30570b9b468b9e7bc551a1'
+md5sums=('9975e68c22b86b013b934743ad2d2276'
'0b0bc7a917fc592bdf11dcd3c5c255e9'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
- '3cfde0cc4ed09b55f1ce531437a4eb88'
'5c1f4c967b66ce3eaf819b46951dcbf5'
- 'f56b5bb7e93c802ae8519182fbea3387'
+ 'e036c721e5ad927cd1613c7475a58b3a'
'f8b206cb8fecb05cb1ded8bee45633ff'
'c60343df74f8e1afb13b084d5c0e47ed')
@@ -240,7 +239,6 @@
install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm
${pkgdir}/usr/sbin/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 -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
install -D -m644 ${srcdir}/logrotate.d.php-fpm
${pkgdir}/etc/logrotate.d/php-fpm
install -d -m755 ${pkgdir}/etc/php/fpm.d
install -D -m644 ${srcdir}/php-fpm.tmpfiles
${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf
Modified: logrotate.d.php-fpm
===================================================================
--- logrotate.d.php-fpm 2013-01-17 19:54:39 UTC (rev 175515)
+++ logrotate.d.php-fpm 2013-01-17 19:55:19 UTC (rev 175516)
@@ -3,6 +3,6 @@
notifempty
delaycompress
postrotate
- kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null`
2>/dev/null || true
+ systemctl reload php-fpm.service || true
endscript
}
Deleted: rc.d.php-fpm
===================================================================
--- rc.d.php-fpm 2013-01-17 19:54:39 UTC (rev 175515)
+++ rc.d.php-fpm 2013-01-17 19:55:19 UTC (rev 175516)
@@ -1,144 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-wait_for_pid () {
- try=0
- while test $try -lt 35 ; do
- case "$1" in
- 'created')
- if [ -f "$2" ] ; then
- try=''
- break
- fi
- ;;
- 'removed')
- if [ ! -f "$2" ] ; then
- try=''
- break
- fi
- ;;
- esac
-
- stat_append '.'
- try=`expr $try + 1`
- sleep 1
- done
-}
-
-test_config() {
- stat_busy 'Checking configuration'
- if [ $(id -u) -ne 0 ]; then
- stat_append '(This script must be run as root)'
- stat_die
- fi
-
- if [ ! -r /etc/php/php-fpm.conf ]; then
- stat_append '(/etc/php/php-fpm.conf not found)'
- stat_die
- fi
-
- local test=$(/usr/sbin/php-fpm -t 2>&1)
- if [ $? -gt 0 ]; then
- stat_append '(error in /etc/php/php-fpm.conf)'
- stat_die
- elif echo $test | grep -qi 'error'; then
- stat_append '(error in /etc/php/php.ini)'
- stat_die
- fi
-
- stat_done
-}
-
-case "$1" in
- start)
- test_config
- stat_busy 'Starting php-fpm'
-
- /usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
-
- if [ "$?" != 0 ] ; then
- stat_fail
- exit 1
- fi
-
- wait_for_pid created /run/php-fpm/php-fpm.pid
-
- if [ -n "$try" ] ; then
- stat_fail
- exit 1
- else
- add_daemon php-fpm
- stat_done
- fi
- ;;
-
- stop)
- test_config
- stat_busy 'Gracefully shutting down php-fpm'
-
- if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -QUIT `cat /run/php-fpm/php-fpm.pid`
-
- wait_for_pid removed /run/php-fpm/php-fpm.pid
-
- if [ -n "$try" ] ; then
- stat_fail
- exit 1
- else
- rm_daemon php-fpm
- stat_done
- fi
- ;;
-
- force-quit)
- stat_busy 'Terminating php-fpm'
-
- if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -TERM `cat /run/php-fpm/php-fpm.pid`
-
- wait_for_pid removed /run/php-fpm/php-fpm.pid
-
- if [ -n "$try" ] ; then
- stat_fail
- exit 1
- else
- rm_daemon php-fpm
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- $0 start
- ;;
-
- reload)
- test_config
- stat_busy 'Reload service php-fpm'
-
- if [ ! -r /run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -USR2 `cat /run/php-fpm/php-fpm.pid`
- stat_done
- ;;
-
- *)
- echo "usage: $0
{start|stop|force-quit|restart|reload|logrotate}"
- exit 1
- ;;
-
-esac
