diff -Nru php5-5.5.9+dfsg/debian/changelog php5-5.5.9+dfsg/debian/changelog --- php5-5.5.9+dfsg/debian/changelog 2015-02-13 17:15:38.000000000 +0100 +++ php5-5.5.9+dfsg/debian/changelog 2015-03-08 14:14:07.000000000 +0100 @@ -1,3 +1,13 @@ +php5 (5.5.9+dfsg-1ubuntu4.7) trusty; urgency=medium + + * Fix php5-fpm logrotate since the upstart job has been introduced. + (LP: #1230917) + - Backport the /usr/lib/php5/php5-fpm-reopenlogs script from utopic. + - Call the script in postrotate instead of invoke-rc.d php5-fpm reopen-logs. + Upstart jobs don't support custom actions. + + -- Felix Geyer Sun, 08 Mar 2015 12:59:56 +0100 + php5 (5.5.9+dfsg-1ubuntu4.6) trusty-security; urgency=medium * SECURITY UPDATE: arbitrary code execution via improper handling of diff -Nru php5-5.5.9+dfsg/debian/php5-fpm.logrotate php5-5.5.9+dfsg/debian/php5-fpm.logrotate --- php5-5.5.9+dfsg/debian/php5-fpm.logrotate 2014-02-17 17:43:24.000000000 +0100 +++ php5-5.5.9+dfsg/debian/php5-fpm.logrotate 2015-03-08 12:59:50.000000000 +0100 @@ -6,6 +6,6 @@ compress delaycompress postrotate - invoke-rc.d php5-fpm reopen-logs > /dev/null + /usr/lib/php5/php5-fpm-reopenlogs endscript } diff -Nru php5-5.5.9+dfsg/debian/php5-fpm-reopenlogs php5-5.5.9+dfsg/debian/php5-fpm-reopenlogs --- php5-5.5.9+dfsg/debian/php5-fpm-reopenlogs 1970-01-01 01:00:00.000000000 +0100 +++ php5-5.5.9+dfsg/debian/php5-fpm-reopenlogs 2015-03-08 12:58:45.000000000 +0100 @@ -0,0 +1,7 @@ +#!/bin/sh +CONFFILE=/etc/php5/fpm/php-fpm.conf +[ -r /etc/default/php5-fpm ] && . /etc/default/php5-fpm +CONF_PIDFILE=$(sed -n 's/^[[:space:]]*pid[[:space:]]*=[[:space:]]*//p' $CONFFILE) +PIDFILE=${CONF_PIDFILE:-/run/php5-fpm.pid} +[ -r "$PIDFILE" ] && kill -USR1 $(cat "$PIDFILE") > /dev/null +exit 0 diff -Nru php5-5.5.9+dfsg/debian/rules php5-5.5.9+dfsg/debian/rules --- php5-5.5.9+dfsg/debian/rules 2014-06-25 17:46:02.000000000 +0200 +++ php5-5.5.9+dfsg/debian/rules 2015-03-08 13:26:40.000000000 +0100 @@ -596,6 +596,7 @@ > debian/php5-fpm/etc/php5/fpm/pool.d/www.conf # install a helper script for checking PHP FPM configuration install -m 755 debian/php5-fpm-checkconf debian/php5-fpm/usr/lib/php5/ + install -m 755 debian/php5-fpm-reopenlogs debian/php5-fpm/usr/lib/php5/ # move and install -dev files dh_movefiles --sourcedir=debian/libphp5-embed