[Pkg-php-commits] [php/debian-experimental] update debian patch suhosin.patch

[Sean Finney]

suhosin hardening patch

this patch was downloaded from:

  http://download.suhosin.org/suhosin-patch-5.2.10-0.9.7.patch.gz

the following modifications have been made:

 * removed changes to ./configure since this file is autogenerated
 * "quilt refresh" has been run to clean up the offsets, etc
---
 debian/patches/suhosin.patch |   48 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/debian/patches/suhosin.patch b/debian/patches/suhosin.patch
index aeb75b8..f936a89 100644
--- a/debian/patches/suhosin.patch
+++ b/debian/patches/suhosin.patch
@@ -1,3 +1,13 @@
+suhosin hardening patch
+
+this patch was downloaded from:
+
+  http://download.suhosin.org/suhosin-patch-5.2.10-0.9.7.patch.gz
+
+the following modifications have been made:
+
+ * removed changes to ./configure since this file is autogenerated
+ * "quilt refresh" has been run to clean up the offsets, etc
 --- php.orig/TSRM/TSRM.h
 +++ php/TSRM/TSRM.h
 @@ -38,6 +38,13 @@ typedef long tsrm_intptr_t;
@@ -252,6 +262,32 @@
  
  libZend_la_LDFLAGS =
  libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
+--- php.orig/Zend/Zend.dsp
++++ php/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
+--- php.orig/Zend/ZendTS.dsp
++++ php/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
 --- php.orig/Zend/zend.c
 +++ php/Zend/zend.c
 @@ -57,7 +57,9 @@ ZEND_API void (*zend_ticks_function)(int
@@ -1690,6 +1726,18 @@
  #endif
  
  /*
+--- php.orig/main/php_config.h.in
++++ php/main/php_config.h.in
+@@ -809,6 +809,9 @@
+ /* Define if the target system has /dev/urandom device */
+ #undef HAVE_DEV_URANDOM
+ 
++/* Suhosin-Patch for PHP */
++#undef SUHOSIN_PATCH
++
+ /* Whether you have AOLserver */
+ #undef HAVE_AOLSERVER
+ 
 --- php.orig/main/php_logos.c
 +++ php/main/php_logos.c
 @@ -50,6 +50,10 @@ PHPAPI int php_unregister_info_logo(char
-- 
1.5.6.5