[Pkg-php-commits] r1115 - in php5/trunk/debian: . patches

[Sean Finney]

tags 481737 pending
thanks

Author: seanius
Date: 2008-07-02 19:48:19 +0000 (Wed, 02 Jul 2008)
New Revision: 1115

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/suhosin.patch
Log:
suhosin ftbfs fix

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-07-02 15:29:56 UTC (rev 1114)
+++ php5/trunk/debian/changelog	2008-07-02 19:48:19 UTC (rev 1115)
@@ -24,9 +24,9 @@
   [ Sean Finney ]
   * Fix for CVE-2008-2829: unsafe usage of deprecated imap functions
     Patch: CVE-2008-2829.patch
-  * At the suggestion of Stefan Esser, try replacing two specific references
-    of size_t* with char*, due to possible alignment problems on some
-    architectures.
+  * Modifications to suhosin.patch due to alignment problems on some
+    architectures.  Thanks to Stefan Esser for the initial suggestion.
+    (Closes: #481737).
   * Rename the apache2 filter module to libphp5filter.so, to prevent
     conflicting filenames for symbols in the debug package.
 

Modified: php5/trunk/debian/patches/suhosin.patch
===================================================================
--- php5/trunk/debian/patches/suhosin.patch	2008-07-02 15:29:56 UTC (rev 1114)
+++ php5/trunk/debian/patches/suhosin.patch	2008-07-02 19:48:19 UTC (rev 1115)
@@ -483,7 +483,7 @@
 +#if SUHOSIN_PATCH
 +
 +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) do { \
-+        size_t *p = SUHOSIN_MM_END_CANARY_PTR(block), check; \
++        char *p = SUHOSIN_MM_END_CANARY_PTR(block); size_t check; \
 +		if (((block)->info.canary_1 != heap->canary_1) || ((block)->info.canary_2 != heap->canary_2)) { \
 +			canary_mismatch: \
 +            zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected"); \