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

Ondřej Surý ondrej at sury.org
Fri Jan 8 15:32:09 UTC 2010


---
 debian/patches/suhosin.patch |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/debian/patches/suhosin.patch b/debian/patches/suhosin.patch
index be1367b..ae0a718 100644
--- a/debian/patches/suhosin.patch
+++ b/debian/patches/suhosin.patch
@@ -6,7 +6,8 @@ this patch was downloaded from:
 
 the following modifications have been made:
 
- * removed changes to ./configure since this file is autogenerated
+ * 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/TSRM/TSRM.h
 +++ b/TSRM/TSRM.h
@@ -1726,18 +1727,6 @@ the following modifications have been made:
  #endif
  
  /*
---- a/main/php_config.h.in
-+++ b/main/php_config.h.in
-@@ -815,6 +815,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





More information about the Pkg-php-commits mailing list