Package: php5
Version: 5.2.9.dfsg.1-3
Severity: important
Tags: patch


Coin,

Please consider applying this patch which fixes POSIX incompatibilities responssible for the FTBFS on Hurd, and IPv6 support deactivation (on this arch only), as it is not yet available.

Regards.

--
Marc Dequènes (Duck)
diff -Nur orig/php5-5.2.9.dfsg.1/debian/changelog php5-5.2.9.dfsg.1/debian/changelog
--- orig/php5-5.2.9.dfsg.1/debian/changelog	2009-05-23 19:55:42.000000000 +0200
+++ php5-5.2.9.dfsg.1/debian/changelog	2009-05-23 09:55:53.000000000 +0200
@@ -1,3 +1,11 @@
+php5 (5.2.9.dfsg.1-3+hurdfr1) unreleased; urgency=low
+
+  * Added 'posixness_fix' patch to correct non posix code (fixing FTBFS
+    on hurd-i386).
+  * Disabled IPv6 support on Hurd.
+
+ -- Marc Dequènes (Duck) <[email protected]>  Sat, 23 May 2009 09:55:52 +0200
+
 php5 (5.2.9.dfsg.1-3) unstable; urgency=low
 
   [ Sean Finney ]
diff -Nur orig/php5-5.2.9.dfsg.1/debian/patches/posixness_fix php5-5.2.9.dfsg.1/debian/patches/posixness_fix
--- orig/php5-5.2.9.dfsg.1/debian/patches/posixness_fix	1970-01-01 01:00:00.000000000 +0100
+++ php5-5.2.9.dfsg.1/debian/patches/posixness_fix	2009-05-23 10:10:51.000000000 +0200
@@ -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 -Nur orig/php5-5.2.9.dfsg.1/debian/patches/series php5-5.2.9.dfsg.1/debian/patches/series
--- orig/php5-5.2.9.dfsg.1/debian/patches/series	2009-05-23 19:55:42.000000000 +0200
+++ php5-5.2.9.dfsg.1/debian/patches/series	2009-05-22 23:30:59.000000000 +0200
@@ -47,3 +47,4 @@
 gentoo/015_zend-double-efree-fix.patch
 gentoo/016_ext-curl-open_basedir-bypass.patch
 gentoo/012_ext-xmlrpc-bad-callback-crash.patch
+posixness_fix
diff -Nur orig/php5-5.2.9.dfsg.1/debian/rules php5-5.2.9.dfsg.1/debian/rules
--- orig/php5-5.2.9.dfsg.1/debian/rules	2009-05-23 19:55:42.000000000 +0200
+++ php5-5.2.9.dfsg.1/debian/rules	2009-05-23 09:55:37.000000000 +0200
@@ -118,6 +118,9 @@
 		--with-mime-magic=$(MAGIC_MIME) \
 		--with-exec-dir=/usr/lib/php5/libexec \
 		--with-system-tzdata
+ifeq (gnu, $(DEB_BUILD_GNU_SYSTEM))
+	COMMON_CONFIG += --disable-ipv6
+endif
 
 BUILTIN_EXTENSION_CHECK=$$e=get_loaded_extensions(); natcasesort($$e); \
 			$$s="The following extensions are built in:"; \

Attachment: pgpU5S1OXaWre.pgp
Description: PGP Digital Signature

Reply via email to