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

[Steve Langasek]

tags 443637 pending
thanks

Author: vorlon
Date: 2007-10-20 23:47:59 +0000 (Sat, 20 Oct 2007)
New Revision: 907

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/patches/suhosin.patch
   php5/trunk/debian/rules
Log:
Don't patch configure or php_config.h.in in suhosin.patch, as these are
auto-generated and including them in the patch results in a race condition
for the necessary build-time regeneration.  Thanks to Daniel Schepler for
reporting, and to Damyan Ivanov for helping to sort out the fix.
Closes: #443637.

Also remove the modified auto-generated files in the clean target, which
triggers a warning about disappearing files when building the source package
but avoids carrying irrelevant diffs to these files in the Debian diff.



Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2007-10-20 02:18:35 UTC (rev 906)
+++ php5/trunk/debian/changelog	2007-10-20 23:47:59 UTC (rev 907)
@@ -10,8 +10,19 @@
   * Build the interbase extension using firebird2.0-dev (Closes: #433736)
   * Unapply patches with debian/rules clean
 
- -- Raphael Geissert <atomo64 at gmail.com>  Tue, 09 Oct 2007 16:30:20 -0500
+  [ Steve Langasek ]
+  * Don't patch configure or php_config.h.in in suhosin.patch, as these are
+    auto-generated and including them in the patch results in a race
+    condition for the necessary build-time regeneration.  Thanks to Daniel
+    Schepler for reporting, and to Damyan Ivanov for helping to sort out the
+    fix.  Closes: #443637.
+  * Also remove the modified auto-generated files in the clean target,
+    which triggers a warning about disappearing files when building the
+    source package but avoids carrying irrelevant diffs to these files
+    in the Debian diff.
 
+ -- Steve Langasek <vorlon at debian.org>  Sat, 20 Oct 2007 16:35:49 -0700
+
 php5 (5.2.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: php5/trunk/debian/patches/suhosin.patch
===================================================================
--- php5/trunk/debian/patches/suhosin.patch	2007-10-20 02:18:35 UTC (rev 906)
+++ php5/trunk/debian/patches/suhosin.patch	2007-10-20 23:47:59 UTC (rev 907)
@@ -1,35 +1,3 @@
-Index: php5-5.2.4/configure
-===================================================================
---- php5-5.2.4.orig/configure	2007-09-16 14:45:09.000000000 +0200
-+++ php5-5.2.4/configure	2007-09-16 14:45:15.000000000 +0200
-@@ -18496,6 +18496,9 @@
- 
- fi
- 
-+cat >> confdefs.h <<\EOF
-+#define SUHOSIN_PATCH 1
-+EOF
- 
-   echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
- echo "configure:18502: checking for declared timezone" >&5
-@@ -115678,7 +115681,7 @@
-        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 ; do
-+       output.c suhosin_patch.c ; do
-   
-       IFS=.
-       set $ac_src
-@@ -115880,7 +115883,7 @@
-     zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
-     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; do
-+    zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_canary.c; do
-   
-       IFS=.
-       set $ac_src
 Index: php5-5.2.4/configure.in
 ===================================================================
 --- php5-5.2.4.orig/configure.in	2007-09-16 14:45:15.000000000 +0200
@@ -347,20 +315,6 @@
  	core_globals_dtor(&core_globals TSRMLS_CC);
  #else
  	zend_ini_global_shutdown(TSRMLS_C);
-Index: php5-5.2.4/main/php_config.h.in
-===================================================================
---- php5-5.2.4.orig/main/php_config.h.in	2007-09-16 14:45:09.000000000 +0200
-+++ php5-5.2.4/main/php_config.h.in	2007-09-16 14:45:15.000000000 +0200
-@@ -803,6 +803,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
- 
 Index: php5-5.2.4/main/php.h
 ===================================================================
 --- php5-5.2.4.orig/main/php.h	2007-09-16 14:45:09.000000000 +0200

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2007-10-20 02:18:35 UTC (rev 906)
+++ php5/trunk/debian/rules	2007-10-20 23:47:59 UTC (rev 907)
@@ -129,10 +129,7 @@
 unprepared:
 	dh_testdir
 	sed -i -e 's/EXTRA_VERSION="-$(PHP5_DEBIAN_REVISION)"/EXTRA_VERSION=""/' configure.in
-	if [ -f prepared-stamp ]; then \
-		rm -f aclocal.m4 config.sub config.guess ltmain.sh; \
-		./buildconf --force; \
-	fi
+	rm -f configure aclocal.m4 config.sub config.guess ltmain.sh main/php_config.h.in
 	rm -f prepared-stamp
 
 test-results.txt:
@@ -285,6 +282,8 @@
 clean: unprepared unpatch
 	dh_testdir
 	dh_testroot
+
+
 	rm -f configure-apache2-stamp build-apache2-stamp
 	rm -f configure-cgi-stamp build-cgi-stamp
 	rm -f configure-cli-stamp build-cli-stamp