php: update to 5.4.33

One patch was a backport and can be dropped, add Upstream-status to the others.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Koen Kooi
2014-10-06 11:55:01 +02:00
committed by Martin Jansa
parent 26043cbe2d
commit 4deb828fff
10 changed files with 93 additions and 106 deletions

View File

@@ -1,8 +1,12 @@
Upstream-status: Unknown
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index fc93d1d..9a8cd65 100755
old mode 100644
new mode 100755
index ed6de9f..9d03198
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -6,19 +6,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
@@ -5,19 +5,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0'
PHP_PHARCMD_EXECUTABLE = ` \
@@ -24,3 +28,6 @@ index fc93d1d..9a8cd65 100755
PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
--
1.9.3