[99594] trunk/dports/lang/php

[ryandesign at macports.org]

Revision: 99594
          http://trac.macports.org//changeset/99594
Author:   ryandesign at macports.org
Date:     2012-11-10 15:12:02 -0800 (Sat, 10 Nov 2012)
Log Message:
-----------
php53: fix suhosin patch (#36921)

Modified Paths:
--------------
    trunk/dports/lang/php/Portfile

Added Paths:
-----------
    trunk/dports/lang/php/files/patch-php53-suhosin-after.diff
    trunk/dports/lang/php/files/patch-php53-suhosin-before.diff

Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile	2012-11-10 20:58:45 UTC (rev 99593)
+++ trunk/dports/lang/php/Portfile	2012-11-10 23:12:02 UTC (rev 99594)
@@ -186,7 +186,9 @@
         }
         patch_sites-append          http://download.suhosin.org/
         if {${suhosin_available}} {
+            patchfiles-append       patch-${php}-suhosin-before.diff
             patchfiles-append       ${suhosin_patch}
+            patchfiles-append       patch-${php}-suhosin-after.diff
         }
     }
     

Added: trunk/dports/lang/php/files/patch-php53-suhosin-after.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php53-suhosin-after.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php53-suhosin-after.diff	2012-11-10 23:12:02 UTC (rev 99594)
@@ -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

Added: trunk/dports/lang/php/files/patch-php53-suhosin-before.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php53-suhosin-before.diff	                        (rev 0)
+++ trunk/dports/lang/php/files/patch-php53-suhosin-before.diff	2012-11-10 23:12:02 UTC (rev 99594)
@@ -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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121110/70123d82/attachment.html>