[arch-commits] Commit in php/trunk (4 files)
Pierre Schmitz
pierre at archlinux.org
Sun Dec 12 16:31:32 UTC 2010
Date: Sunday, December 12, 2010 @ 11:31:31
Author: pierre
Revision: 102873
* Make previous suhosin patch work
* Add logrotate for php-fpm
Added:
php/trunk/logrotate.d.php-fpm
php/trunk/suhosin-patch-5.3.3-0.9.10-5.3.4.patch
Modified:
php/trunk/PKGBUILD
php/trunk/rc.d.php-fpm
----------------------------------------+
PKGBUILD | 23 +++++++++++++++--------
logrotate.d.php-fpm | 6 ++++++
rc.d.php-fpm | 14 +++++++++++++-
suhosin-patch-5.3.3-0.9.10-5.3.4.patch | 22 ++++++++++++++++++++++
4 files changed, 56 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-12 15:52:35 UTC (rev 102872)
+++ PKGBUILD 2010-12-12 16:31:31 UTC (rev 102873)
@@ -25,7 +25,7 @@
'php-xsl')
pkgver=5.3.4
pkgrel=1
-#_suhosinver=${pkgver}-0.9.10
+_suhosinver=5.3.3-0.9.10
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -35,14 +35,18 @@
'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
options=('!makeflags')
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-# "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
- 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch')
+ "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
+ "suhosin-patch-${_suhosinver}-${pkgver}.patch"
+ 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
+ 'logrotate.d.php-fpm')
md5sums=('2c069d8f690933e3bf6a8741ed818150'
-# 'b66b27c43b1332400ef8982944c3b95b'
+ 'b66b27c43b1332400ef8982944c3b95b'
+ '29cd4241937fee7ec42b08f46c24af72'
'd36c4d1b9d33c1025521e23260f1dc29'
'96ca078be6729b665be8a865535a97bf'
- 'ff8346d57f0bd67c7a383c1561dcd7c1'
- 'd50ff349da08110a7cc8c691ce2d0423')
+ 'b136a184dd055c559a03eb8bac562a3c'
+ 'd50ff349da08110a7cc8c691ce2d0423'
+ '07c4e412909ac65a44ec90e7a2c4bade')
build() {
# ldap-sasl does not compile with --as-needed
@@ -139,8 +143,10 @@
cd ${srcdir}/${pkgbase}-${pkgver}
+ # remove a patch that has been merged into upstream PHP
+ patch -p0 -i ${srcdir}/suhosin-patch-${_suhosinver}-${pkgver}.patch -d ${srcdir}
# apply suhosin patch
- #patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
+ patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
# adjust paths
patch -p0 -i ${srcdir}/php.ini.patch
@@ -252,8 +258,9 @@
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 -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
+ 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}/var/run/php-fpm
install -d -m755 ${pkgdir}/etc/php/fpm.d
}
Added: logrotate.d.php-fpm
===================================================================
--- logrotate.d.php-fpm (rev 0)
+++ logrotate.d.php-fpm 2010-12-12 16:31:31 UTC (rev 102873)
@@ -0,0 +1,6 @@
+/var/log/php-fpm.log {
+ missingok
+ postrotate
+ /etc/rc.d/php-fpm logrotate >/dev/null || true
+ endscript
+}
Modified: rc.d.php-fpm
===================================================================
--- rc.d.php-fpm 2010-12-12 15:52:35 UTC (rev 102872)
+++ rc.d.php-fpm 2010-12-12 16:31:31 UTC (rev 102873)
@@ -116,8 +116,20 @@
stat_done
;;
+ logrotate)
+ stat_busy 'Reopen php-fpm log'
+
+ if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
+ stat_fail
+ exit 1
+ fi
+
+ kill -USR1 `cat /var/run/php-fpm/php-fpm.pid`
+ stat_done
+ ;;
+
*)
- echo "usage: $0 {start|stop|force-quit|restart|reload}"
+ echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
exit 1
;;
Added: suhosin-patch-5.3.3-0.9.10-5.3.4.patch
===================================================================
--- suhosin-patch-5.3.3-0.9.10-5.3.4.patch (rev 0)
+++ suhosin-patch-5.3.3-0.9.10-5.3.4.patch 2010-12-12 16:31:31 UTC (rev 102873)
@@ -0,0 +1,22 @@
+--- suhosin-patch-5.3.3-0.9.10.patch 2010-12-11 09:10:02.782828086 +0100
++++ suhosin-patch-5.3.3-0.9.10.patch 2010-12-11 09:13:53.871672637 +0100
+@@ -4538,19 +4538,6 @@
+
+ if test -r "$abs_srcdir/Zend/zend_objects.c"; then
+ PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)
+-diff -Nura php-5.3.3/ext/phar/stream.c suhosin-patch-5.3.3-0.9.10/ext/phar/stream.c
+---- php-5.3.3/ext/phar/stream.c 2010-04-27 19:13:24.000000000 +0200
+-+++ suhosin-patch-5.3.3-0.9.10/ext/phar/stream.c 2010-07-23 16:41:53.000000000 +0200
+-@@ -470,7 +470,8 @@
+- if (stream->mode[0] == 'w' || (stream->mode[0] == 'r' && stream->mode[1] == '+')) {
+- ret = phar_flush(((phar_entry_data *)stream->abstract)->phar, 0, 0, 0, &error TSRMLS_CC);
+- if (error) {
+-- php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS TSRMLS_CC, error);
+-+ /* Fix format string vulnerability here, too because PHP.net did not */
+-+ php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS TSRMLS_CC, "%s", error);
+- efree(error);
+- }
+- return ret;
+ diff -Nura php-5.3.3/ext/standard/dl.c suhosin-patch-5.3.3-0.9.10/ext/standard/dl.c
+ --- php-5.3.3/ext/standard/dl.c 2010-01-03 10:23:27.000000000 +0100
+ +++ suhosin-patch-5.3.3-0.9.10/ext/standard/dl.c 2010-07-23 16:23:51.000000000 +0200
More information about the arch-commits
mailing list