[Pkg-php-commits] r1254 - php5/trunk/debian/patches

[Sean Finney]

Author: seanius
Date: 2009-03-22 10:25:53 +0000 (Sun, 22 Mar 2009)
New Revision: 1254

Modified:
   php5/trunk/debian/patches/suhosin.patch
Log:
update suhosin patch for latest release

note that the patch was actually committed in the previous commit (oops!),
this commit removes the .dsp and configure files from the patch as we
have done in previous patches.


Modified: php5/trunk/debian/patches/suhosin.patch
===================================================================
--- php5/trunk/debian/patches/suhosin.patch	2009-03-22 10:20:47 UTC (rev 1253)
+++ php5/trunk/debian/patches/suhosin.patch	2009-03-22 10:25:53 UTC (rev 1254)
@@ -252,32 +252,6 @@
  
  libZend_la_LDFLAGS =
  libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
---- php5-5.2.9.dfsg.1.orig/Zend/Zend.dsp
-+++ php5-5.2.9.dfsg.1/Zend/Zend.dsp
-@@ -239,6 +239,10 @@ SOURCE=.\zend_strtod.c
- # End Source File
- # Begin Source File
- 
-+SOURCE=.\zend_canary.c
-+# End Source File
-+# Begin Source File
-+
- SOURCE=.\zend_ts_hash.c
- # End Source File
- # Begin Source File
---- php5-5.2.9.dfsg.1.orig/Zend/ZendTS.dsp
-+++ php5-5.2.9.dfsg.1/Zend/ZendTS.dsp
-@@ -273,6 +273,10 @@ SOURCE=.\zend_strtod.c
- # End Source File
- # Begin Source File
- 
-+SOURCE=.\zend_canary.c
-+# End Source File
-+# Begin Source File
-+
- SOURCE=.\zend_ts_hash.c
- # End Source File
- # Begin Source File
 --- php5-5.2.9.dfsg.1.orig/Zend/zend.c
 +++ php5-5.2.9.dfsg.1/Zend/zend.c
 @@ -57,7 +57,9 @@ ZEND_API void (*zend_ticks_function)(int
@@ -1390,36 +1364,6 @@
  	if ((old_tail = l->tail)) {
  		if (old_tail->prev) {
  			old_tail->prev->next = NULL;
---- php5-5.2.9.dfsg.1.orig/configure
-+++ php5-5.2.9.dfsg.1/configure
-@@ -18576,6 +18576,9 @@ EOF
- 
- fi
- 
-+cat >> confdefs.h <<\EOF
-+#define SUHOSIN_PATCH 1
-+EOF
- 
-   echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
- echo "configure:18582: checking for declared timezone" >&5
-@@ -116592,7 +116595,7 @@ EOF
-        php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
-        strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
-        network.c php_open_temporary_file.c php_logos.c \
--       output.c ; do
-+       output.c suhosin_patch.c ; do
-   
-       IFS=.
-       set $ac_src
-@@ -116794,7 +116797,7 @@ esac
-     zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
-     zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
-     zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
--    zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c; do
-+    zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_canary.c; do
-   
-       IFS=.
-       set $ac_src
 --- php5-5.2.9.dfsg.1.orig/configure.in
 +++ php5-5.2.9.dfsg.1/configure.in
 @@ -257,6 +257,7 @@ sinclude(Zend/Zend.m4)