[Pkg-php-commits] [php/debian-sid] Removed autogenerated main/php_config.h.in from suhosin.patch (Ubuntu: #493761)

[Ondřej Surý]

---
 debian/patches/suhosin.patch |   53 ++++++++---------------------------------
 1 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/debian/patches/suhosin.patch b/debian/patches/suhosin.patch
index 37d2333..2a8dc2e 100644
--- a/debian/patches/suhosin.patch
+++ b/debian/patches/suhosin.patch
@@ -1,3 +1,14 @@
+suhosin hardening patch
+
+this patch was downloaded from:
+
+  http://download.suhosin.org/suhosin-patch-5.2.11-0.9.7.patch.gz
+
+the following modifications have been made:
+
+ * removed changes to ./configure & ./main/php_config.h.in since those
+   files are autogenerated
+ * "quilt refresh" has been run to clean up the offsets, etc
 --- a/Zend/Makefile.am
 +++ b/Zend/Makefile.am
 @@ -17,7 +17,7 @@ libZend_la_SOURCES=\
@@ -4150,36 +4161,6 @@
  			break;
  		case IS_ARRAY:
  		case IS_CONSTANT_ARRAY:
---- a/configure
-+++ b/configure
-@@ -17856,6 +17856,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:17862: checking for declared timezone" >&5
-@@ -112825,7 +112828,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 getopt.c; do
-+       output.c getopt.c suhosin_patch.c ; do
-   
-       IFS=.
-       set $ac_src
-@@ -113029,7 +113032,7 @@ esac
-     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 zend_gc.c \
--    zend_closures.c zend_float.c; do
-+    zend_closures.c zend_float.c zend_canary.c zend_alloc_canary.c ; do
-   
-       IFS=.
-       set $ac_src
 --- a/configure.in
 +++ b/configure.in
 @@ -304,6 +304,7 @@ sinclude(Zend/Zend.m4)
@@ -4374,18 +4355,6 @@
  #endif
  
  /*
---- a/main/php_config.h.in
-+++ b/main/php_config.h.in
-@@ -833,6 +833,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
- 
 --- a/main/php_logos.c
 +++ b/main/php_logos.c
 @@ -50,6 +50,10 @@ PHPAPI int php_unregister_info_logo(char
-- 
1.6.3.3