[Pkg-php-commits] [php/debian-sid] Fix FTBFS on Debian Hurd (Closes: #530281)

[Ondrej Sury]

---
 debian/changelog                       |    3 +-
 debian/patches/116-posixness_fix.patch |   60 ++++++++++++++++++++++++++++++++
 debian/patches/series                  |    1 +
 3 files changed, 63 insertions(+), 1 deletions(-)
 create mode 100644 debian/patches/116-posixness_fix.patch

diff --git a/debian/changelog b/debian/changelog
index 25c690c..aeeac90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ php5 (5.3.0-3) unstable; urgency=low
   * Update suhosin patch to 0.9.8 *BETA* and enable it again
   * Fix FTBFS with current autoconf/automake (Closes: #542906, #542088)
   * Add avr32-linux-gnu to no -gstabs toolchains (Closes: #543278)
+  * Fix FTBFS on Debian Hurd (Closes: #530281)
 
- -- Ondřej Surý <ondrej at debian.org>  Tue, 25 Aug 2009 15:48:07 +0200
+ -- Ondřej Surý <ondrej at debian.org>  Tue, 25 Aug 2009 16:03:09 +0200
 
 php5 (5.3.0-2) experimental; urgency=low
 
diff --git a/debian/patches/116-posixness_fix.patch b/debian/patches/116-posixness_fix.patch
new file mode 100644
index 0000000..ae894b8
--- /dev/null
+++ b/debian/patches/116-posixness_fix.patch
@@ -0,0 +1,60 @@
+Index: php5-5.2.9.dfsg.1/TSRM/tsrm_config_common.h
+===================================================================
+--- php5-5.2.9.dfsg.1.orig/TSRM/tsrm_config_common.h	2009-05-23 09:51:20.000000000 +0200
++++ php5-5.2.9.dfsg.1/TSRM/tsrm_config_common.h	2009-05-23 10:00:07.000000000 +0200
+@@ -1,6 +1,10 @@
+ #ifndef TSRM_CONFIG_COMMON_H
+ #define TSRM_CONFIG_COMMON_H
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #ifndef __CYGWIN__
+ # if WINNT|WIN32
+ #  define TSRM_WIN32
+Index: php5-5.2.9.dfsg.1/ext/date/lib/parse_tz.c
+===================================================================
+--- php5-5.2.9.dfsg.1.orig/ext/date/lib/parse_tz.c	2009-05-23 10:00:02.000000000 +0200
++++ php5-5.2.9.dfsg.1/ext/date/lib/parse_tz.c	2009-05-23 10:00:07.000000000 +0200
+@@ -18,6 +18,10 @@
+ 
+ /* $Id: parse_tz.c,v 1.20.2.6.2.18 2008/12/31 11:17:36 sebastian Exp $ */
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #include "timelib.h"
+ 
+ #ifdef HAVE_SYSTEM_TZDATA
+Index: php5-5.2.9.dfsg.1/ext/standard/proc_open.c
+===================================================================
+--- php5-5.2.9.dfsg.1.orig/ext/standard/proc_open.c	2009-05-23 09:51:19.000000000 +0200
++++ php5-5.2.9.dfsg.1/ext/standard/proc_open.c	2009-05-23 10:00:07.000000000 +0200
+@@ -24,6 +24,10 @@
+ # define __EXTENSIONS__	1	/* Solaris: uint */
+ #endif
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #include "php.h"
+ #include <stdio.h>
+ #include <ctype.h>
+Index: php5-5.2.9.dfsg.1/main/php.h
+===================================================================
+--- php5-5.2.9.dfsg.1.orig/main/php.h	2009-05-23 10:10:40.000000000 +0200
++++ php5-5.2.9.dfsg.1/main/php.h	2009-05-23 10:10:43.000000000 +0200
+@@ -249,6 +249,10 @@
+ /* macros */
+ #define STR_PRINT(str)	((str)?(str):"")
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #ifndef MAXPATHLEN
+ # ifdef PATH_MAX
+ #  define MAXPATHLEN PATH_MAX
diff --git a/debian/patches/series b/debian/patches/series
index 253fe46..a538494 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,6 +24,7 @@ libtool2.2.patch
 113-php.ini_securitynotes.patch
 114-php_gd_segfault.patch
 115-autoconf_ftbfs.patch
+116-posixness_fix.patch
 libdb_is_-ldb
 suhosin.patch
 fix_broken_upstream_tests.patch
-- 
1.6.3.3