Revision: 100311 https://trac.macports.org/changeset/100311 Author: ryandesign@macports.org Date: 2012-12-07 18:23:09 -0800 (Fri, 07 Dec 2012) Log Message: ----------- php5: fix patch failure of suhosin variant (#37244) Modified Paths: -------------- trunk/dports/lang/php5/Portfile Added Paths: ----------- trunk/dports/lang/php5/files/patch-suhosin-after.diff trunk/dports/lang/php5/files/patch-suhosin-before.diff Modified: trunk/dports/lang/php5/Portfile =================================================================== --- trunk/dports/lang/php5/Portfile 2012-12-08 01:27:33 UTC (rev 100310) +++ trunk/dports/lang/php5/Portfile 2012-12-08 02:23:09 UTC (rev 100311) @@ -203,7 +203,9 @@ set suhosin_patch_version 5.3.9-0.9.10 set suhosin_patch suhosin-patch-${suhosin_patch_version}.patch.gz patch_sites-append http://download.suhosin.org/ + patchfiles-append patch-suhosin-before.diff patchfiles-append ${suhosin_patch} + patchfiles-append patch-suhosin-after.diff checksums-append ${suhosin_patch} \ rmd160 ce43921fd9b183b154713ecda98294f6c68d5f22 \ sha256 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317 Copied: trunk/dports/lang/php5/files/patch-suhosin-after.diff (from rev 100310, trunk/dports/lang/php/files/patch-php53-suhosin-after.diff) =================================================================== --- trunk/dports/lang/php5/files/patch-suhosin-after.diff (rev 0) +++ trunk/dports/lang/php5/files/patch-suhosin-after.diff 2012-12-08 02:23:09 UTC (rev 100311) @@ -0,0 +1,22 @@ +--- a/sapi/litespeed/lsapi_main.c.orig 2012-11-10 17:04:40.000000000 -0600 ++++ b/sapi/litespeed/lsapi_main.c 2012-11-10 17:05:49.000000000 -0600 +@@ -720,15 +720,15 @@ + if (php_request_startup(TSRMLS_C) != FAILURE) { + #if SUHOSIN_PATCH + #if ZEND_DEBUG +- php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + #else +- php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + #endif + #else + #if ZEND_DEBUG +- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + #else +- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + #endif + #endif + #ifdef PHP_OUTPUT_NEWAPI Copied: trunk/dports/lang/php5/files/patch-suhosin-before.diff (from rev 100310, trunk/dports/lang/php/files/patch-php53-suhosin-before.diff) =================================================================== --- trunk/dports/lang/php5/files/patch-suhosin-before.diff (rev 0) +++ trunk/dports/lang/php5/files/patch-suhosin-before.diff 2012-12-08 02:23:09 UTC (rev 100311) @@ -0,0 +1,14 @@ +--- a/sapi/litespeed/lsapi_main.c.orig 2012-10-17 11:21:41.000000000 -0500 ++++ b/sapi/litespeed/lsapi_main.c 2012-11-10 16:58:30.000000000 -0600 +@@ -719,9 +719,9 @@ + case 'v': + if (php_request_startup(TSRMLS_C) != FAILURE) { + #if ZEND_DEBUG +- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + #else +- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + #endif + #ifdef PHP_OUTPUT_NEWAPI + php_output_end_all(TSRMLS_C);