[107870] trunk/dports/php

[ryandesign at macports.org]

Revision: 107870
          https://trac.macports.org/changeset/107870
Author:   ryandesign at macports.org
Date:     2013-07-07 21:19:32 -0700 (Sun, 07 Jul 2013)
Log Message:
-----------
php-suhosin: add upstream patch to fix build with clang

Modified Paths:
--------------
    trunk/dports/php/php-suhosin/Portfile
    trunk/dports/php/php5-suhosin/Portfile

Added Paths:
-----------
    trunk/dports/php/php-suhosin/files/
    trunk/dports/php/php-suhosin/files/patch-execute.c.diff
    trunk/dports/php/php5-suhosin/files/
    trunk/dports/php/php5-suhosin/files/patch-execute.c.diff

Modified: trunk/dports/php/php-suhosin/Portfile
===================================================================
--- trunk/dports/php/php-suhosin/Portfile	2013-07-08 03:25:49 UTC (rev 107869)
+++ trunk/dports/php/php-suhosin/Portfile	2013-07-08 04:19:32 UTC (rev 107870)
@@ -30,9 +30,8 @@
 checksums           rmd160  9c60b695b226ddcbe5562b1576228780123eb372 \
                     sha256  865b1c72bae9a5a710fe0b07a0635556ce6c838653ec364d2a2a6e6f594529c5
 
-if {${configure.compiler} == "clang"} {
-    configure.compiler  llvm-gcc-4.2
-}
+patchfiles          patch-execute.c.diff
+
 test.run            yes
 
 livecheck.type      regex

Added: trunk/dports/php/php-suhosin/files/patch-execute.c.diff
===================================================================
--- trunk/dports/php/php-suhosin/files/patch-execute.c.diff	                        (rev 0)
+++ trunk/dports/php/php-suhosin/files/patch-execute.c.diff	2013-07-08 04:19:32 UTC (rev 107870)
@@ -0,0 +1,21 @@
+https://github.com/stefanesser/suhosin/commit/bbe1aa97401389d6f7136be82275ce45bdf3fb5a
+--- execute.c.orig
++++ execute.c
+@@ -1087,7 +1087,7 @@ static int ih_function_exists(IH_HANDLER_PARAMS)
+ 	zend_str_tolower(lcname, func_name_len);
+ #else
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &lcname, &func_name_len) == FAILURE) {
+-		return;
++		return(0);
+ 	}
+ 
+ 	/* Ignore leading "\" */
+@@ -1501,7 +1501,7 @@ static int ih_getrandmax(IH_HANDLER_PARAMS)
+ {
+ #ifdef PHP_ATLEAST_5_3
+ 	if (zend_parse_parameters_none() == FAILURE) {
+-		return;
++		return(0);
+ 	}
+ #else
+         int argc = ZEND_NUM_ARGS();

Modified: trunk/dports/php/php5-suhosin/Portfile
===================================================================
--- trunk/dports/php/php5-suhosin/Portfile	2013-07-08 03:25:49 UTC (rev 107869)
+++ trunk/dports/php/php5-suhosin/Portfile	2013-07-08 04:19:32 UTC (rev 107870)
@@ -25,9 +25,8 @@
 checksums           rmd160  9c60b695b226ddcbe5562b1576228780123eb372 \
                     sha256  865b1c72bae9a5a710fe0b07a0635556ce6c838653ec364d2a2a6e6f594529c5
 
-if {${configure.compiler} == "clang"} {
-    configure.compiler  llvm-gcc-4.2
-}
+patchfiles          patch-execute.c.diff
+
 test.run            yes
 
 livecheck.type      regex

Added: trunk/dports/php/php5-suhosin/files/patch-execute.c.diff
===================================================================
--- trunk/dports/php/php5-suhosin/files/patch-execute.c.diff	                        (rev 0)
+++ trunk/dports/php/php5-suhosin/files/patch-execute.c.diff	2013-07-08 04:19:32 UTC (rev 107870)
@@ -0,0 +1,21 @@
+https://github.com/stefanesser/suhosin/commit/bbe1aa97401389d6f7136be82275ce45bdf3fb5a
+--- execute.c.orig
++++ execute.c
+@@ -1087,7 +1087,7 @@ static int ih_function_exists(IH_HANDLER_PARAMS)
+ 	zend_str_tolower(lcname, func_name_len);
+ #else
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &lcname, &func_name_len) == FAILURE) {
+-		return;
++		return(0);
+ 	}
+ 
+ 	/* Ignore leading "\" */
+@@ -1501,7 +1501,7 @@ static int ih_getrandmax(IH_HANDLER_PARAMS)
+ {
+ #ifdef PHP_ATLEAST_5_3
+ 	if (zend_parse_parameters_none() == FAILURE) {
+-		return;
++		return(0);
+ 	}
+ #else
+         int argc = ZEND_NUM_ARGS();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130707/3f9bd944/attachment.html>