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

[Sean Finney]

Author: seanius
Date: 2009-03-23 22:30:41 +0000 (Mon, 23 Mar 2009)
New Revision: 1260

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/suhosin.patch
Log:
remove php_config.h.in from suhosin patch, it is autogenerated

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2009-03-23 15:28:22 UTC (rev 1259)
+++ php5/trunk/debian/changelog	2009-03-23 22:30:41 UTC (rev 1260)
@@ -4,7 +4,8 @@
 
   [ Sean Finney ]
   * Refresh all patches.
-  * Update suhosin patch to 5.2.9, remove configure and .dsp from patch.
+  * Update suhosin patch to 5.2.9, remove autotools-generated files (configure,
+    php_config.h.in) and .dsp files from patch.
   * Remove obsoleted patches which have been incorporated upstream:
     - snmp_leaks.patch
     - BG-initializing-fix.patch

Modified: php5/trunk/debian/patches/suhosin.patch
===================================================================
--- php5/trunk/debian/patches/suhosin.patch	2009-03-23 15:28:22 UTC (rev 1259)
+++ php5/trunk/debian/patches/suhosin.patch	2009-03-23 22:30:41 UTC (rev 1260)
@@ -1690,18 +1690,6 @@
  #endif
  
  /*
---- php5-5.2.9.dfsg.1.orig/main/php_config.h.in
-+++ php5-5.2.9.dfsg.1/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
- 
 --- php5-5.2.9.dfsg.1.orig/main/php_logos.c
 +++ php5-5.2.9.dfsg.1/main/php_logos.c
 @@ -50,6 +50,10 @@ PHPAPI int php_unregister_info_logo(char