From d8637e03c9ddbfb6eb72bd335bd41553145a717c Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Tue, 22 Sep 2009 10:36:31 +0000 Subject: Update to 5.2.11 release. (Do not link to thread library when building a thread-safe only lib) Feature safe: yes --- lang/php53/files/patch-TSRM_threads.m4 | 22 +++++++++++----------- lang/php53/files/patch-ext_standard_dns.h | 13 ------------- lang/php53/files/patch-ext_standard_php_dns.h | 13 +++++++++++++ lang/php53/files/patch-main_SAPI.c | 20 -------------------- 4 files changed, 24 insertions(+), 44 deletions(-) delete mode 100644 lang/php53/files/patch-ext_standard_dns.h create mode 100644 lang/php53/files/patch-ext_standard_php_dns.h delete mode 100644 lang/php53/files/patch-main_SAPI.c (limited to 'lang/php53/files') diff --git a/lang/php53/files/patch-TSRM_threads.m4 b/lang/php53/files/patch-TSRM_threads.m4 index 6208eac7f79c..227f6d26c9d5 100644 --- a/lang/php53/files/patch-TSRM_threads.m4 +++ b/lang/php53/files/patch-TSRM_threads.m4 @@ -1,11 +1,11 @@ ---- TSRM/threads.m4.orig Wed Apr 27 15:22:18 2005 -+++ TSRM/threads.m4 Wed May 3 10:02:34 2006 -@@ -164,7 +164,7 @@ - dnl - AC_DEFUN([PTHREADS_ASSIGN_VARS],[ - if test -n "$ac_cv_pthreads_lib"; then -- LIBS="$LIBS -l$ac_cv_pthreads_lib" -+ LIBS="$LIBS $ac_cv_pthreads_lib" - fi - - if test -n "$ac_cv_pthreads_cflags"; then +--- TSRM/threads.m4.orig 2005-04-27 15:22:18.000000000 +0200 ++++ TSRM/threads.m4 2009-09-22 10:01:37.000000000 +0200 +@@ -79,7 +79,7 @@ + pthread_mutexattr_t mattr; + int data = 1; + pthread_mutexattr_init(&mattr); +- return pthread_create(&thd, NULL, thread_routine, &data); ++ return 0; + } ], [ + pthreads_working=yes + ], [ diff --git a/lang/php53/files/patch-ext_standard_dns.h b/lang/php53/files/patch-ext_standard_dns.h deleted file mode 100644 index 1ea8751970c8..000000000000 --- a/lang/php53/files/patch-ext_standard_dns.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ext/standard/dns.h.orig Sun Jun 19 11:57:31 2005 -+++ ext/standard/dns.h Sun Jun 19 12:03:37 2005 -@@ -25,6 +25,10 @@ - - #if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME - #define HAVE_DNS_FUNCS 1 -+#define res_ninit __res_ninit -+#define res_nmkquery __res_nmkquery -+#define res_nsend __res_nsend -+#define res_nclose __res_nclose - #endif - - PHP_FUNCTION(gethostbyaddr); diff --git a/lang/php53/files/patch-ext_standard_php_dns.h b/lang/php53/files/patch-ext_standard_php_dns.h new file mode 100644 index 000000000000..8ab9e9c01d38 --- /dev/null +++ b/lang/php53/files/patch-ext_standard_php_dns.h @@ -0,0 +1,13 @@ +--- ext/standard/php_dns.h.orig Sun Jun 19 11:57:31 2005 ++++ ext/standard/php_dns.h Sun Jun 19 12:03:37 2005 +@@ -25,6 +25,10 @@ + + #if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME + #define HAVE_DNS_FUNCS 1 ++#define res_ninit __res_ninit ++#define res_nmkquery __res_nmkquery ++#define res_nsend __res_nsend ++#define res_nclose __res_nclose + #endif + + PHP_FUNCTION(gethostbyaddr); diff --git a/lang/php53/files/patch-main_SAPI.c b/lang/php53/files/patch-main_SAPI.c deleted file mode 100644 index e257bfeb5bee..000000000000 --- a/lang/php53/files/patch-main_SAPI.c +++ /dev/null @@ -1,20 +0,0 @@ ---- main/SAPI.c.orig 2007-05-25 11:20:01.000000000 +0200 -+++ main/SAPI.c 2008-02-01 23:48:51.000000000 +0100 -@@ -604,7 +606,7 @@ - ptr++; - len--; - } --#if HAVE_ZLIB -+#if 1 - if(!strncmp(ptr, "image/", sizeof("image/")-1)) { - zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); - } -@@ -758,7 +760,7 @@ - return SUCCESS; - } - --#if HAVE_ZLIB -+#if 1 - /* Add output compression headers at this late stage in order to make - it possible to switch it off inside the script. */ - -- cgit v1.2.3