Date: Thursday, December 30, 2010 @ 12:27:46
Author: pierre
Revision: 104183
use upstream version of suhosin patch for PHP 5.3.4 (which is not differet to
our previous patched version)
Modified:
php/trunk/PKGBUILD
Deleted:
php/trunk/suhosin-patch-5.3.3-0.9.10-5.3.4.patch
----------------------------------------+
PKGBUILD | 8 ++------
suhosin-patch-5.3.3-0.9.10-5.3.4.patch | 22 ----------------------
2 files changed, 2 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-12-30 17:20:19 UTC (rev 104182)
+++ PKGBUILD 2010-12-30 17:27:46 UTC (rev 104183)
@@ -25,7 +25,7 @@
'php-xsl')
pkgver=5.3.4
pkgrel=2
-_suhosinver=5.3.3-0.9.10
+_suhosinver=${pkgver}-0.9.10
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -36,12 +36,10 @@
options=('!makeflags')
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2";
"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'
- '29cd4241937fee7ec42b08f46c24af72'
+ '69683b97f1e8d8c7ad01eebcbb8a56fa'
'3238300834d831a13f9479e5384a5f08'
'96ca078be6729b665be8a865535a97bf'
'b136a184dd055c559a03eb8bac562a3c'
@@ -143,8 +141,6 @@
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
Deleted: suhosin-patch-5.3.3-0.9.10-5.3.4.patch
===================================================================
--- suhosin-patch-5.3.3-0.9.10-5.3.4.patch 2010-12-30 17:20:19 UTC (rev
104182)
+++ suhosin-patch-5.3.3-0.9.10-5.3.4.patch 2010-12-30 17:27:46 UTC (rev
104183)
@@ -1,22 +0,0 @@
---- 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
