[56406] trunk/dports/lang/php5-devel

[ryandesign at macports.org]

Revision: 56406
          http://trac.macports.org/changeset/56406
Author:   ryandesign at macports.org
Date:     2009-08-26 22:23:54 -0700 (Wed, 26 Aug 2009)
Log Message:
-----------
php5-devel: merge from php5 r56403: add variant for suhosin patch; see #20681

Revision Links:
--------------
    http://trac.macports.org/changeset/56403

Modified Paths:
--------------
    trunk/dports/lang/php5-devel/Portfile
    trunk/dports/lang/php5-devel/files/patch-bind.diff
    trunk/dports/lang/php5-devel/files/patch-ext-date-php_date.c.diff
    trunk/dports/lang/php5-devel/files/patch-ext-mysqlnd-mysqlnd_portability.h.diff

Property Changed:
----------------
    trunk/dports/lang/php5-devel/


Property changes on: trunk/dports/lang/php5-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/lang/php5:52241-52279,53127,56346,56392
   + /trunk/dports/lang/php5:52241-52279,53127,56346,56392,56403

Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile	2009-08-27 05:20:16 UTC (rev 56405)
+++ trunk/dports/lang/php5-devel/Portfile	2009-08-27 05:23:54 UTC (rev 56406)
@@ -30,9 +30,10 @@
     http://downloads.php.net/johannes/
 
 checksums \
-    md5     40b3cd46223e6aebcb47f121a4ee8d0b \
-    sha1    8872060260dcf9a506c518831cb3ff00fb8a54c3 \
-    rmd160  0dd298a47529b04e55701527410e46434b078b7d
+    [suffix ${distname}] \
+        md5     40b3cd46223e6aebcb47f121a4ee8d0b \
+        sha1    8872060260dcf9a506c518831cb3ff00fb8a54c3 \
+        rmd160  0dd298a47529b04e55701527410e46434b078b7d
 
 depends_build \
     port:pkgconfig \
@@ -48,6 +49,8 @@
     port:readline \
     port:zlib
 
+# Use -p1 to accommodate the Suhosin patch
+patch.pre_args          -p1
 patchfiles \
     patch-ext-date-php_date.c.diff \
     patch-ext-mysqlnd-mysqlnd_portability.h.diff \
@@ -239,6 +242,24 @@
     }
 }
 
+variant suhosin description {Add Suhosin patch} {
+    pre-fetch {
+        if {"darwin" == ${os.platform} && ${os.major} < 9} {
+            ui_error "The suhosin variant requires Mac OS X 10.5 or greater."
+            return -code error "incompatible Mac OS X version"
+        }
+    }
+    set suhosin_patch_version   5.3.0-0.9.8-BETA-1
+    set suhosin_patch           suhosin-patch-${suhosin_patch_version}.patch.gz
+    patch_sites-append          http://download.suhosin.org/
+    patchfiles-append           ${suhosin_patch}
+    checksums-append \
+        ${suhosin_patch} \
+            md5     62dc36545b86bf86e44ada1fccc17d0a \
+            sha1    8bad461c7b16febc1d2f6bcbf4c8e10428569591 \
+            rmd160  d89fd850dbba853aa881454be7995e2d6dff2490
+}
+
 destroot.args \
     INSTALL_ROOT=${destroot}
 

Modified: trunk/dports/lang/php5-devel/files/patch-bind.diff
===================================================================
--- trunk/dports/lang/php5-devel/files/patch-bind.diff	2009-08-27 05:20:16 UTC (rev 56405)
+++ trunk/dports/lang/php5-devel/files/patch-bind.diff	2009-08-27 05:23:54 UTC (rev 56406)
@@ -1,5 +1,5 @@
---- ext/standard/config.m4.orig	2009-01-31 18:05:14.000000000 +0200
-+++ ext/standard/config.m4	2009-01-31 18:06:03.000000000 +0200
+--- a/ext/standard/config.m4.orig	2009-01-31 18:05:14.000000000 +0200
++++ b/ext/standard/config.m4	2009-01-31 18:06:03.000000000 +0200
 @@ -249,10 +249,10 @@
  dnl Detect library functions needed by php dns_xxx functions
  dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS

Modified: trunk/dports/lang/php5-devel/files/patch-ext-date-php_date.c.diff
===================================================================
--- trunk/dports/lang/php5-devel/files/patch-ext-date-php_date.c.diff	2009-08-27 05:20:16 UTC (rev 56405)
+++ trunk/dports/lang/php5-devel/files/patch-ext-date-php_date.c.diff	2009-08-27 05:23:54 UTC (rev 56406)
@@ -1,5 +1,5 @@
---- ext/date/php_date.c	2009-06-17 12:56:17.000000000 -0500
-+++ ext/date/php_date.c	2009-06-29 23:27:55.000000000 -0500
+--- a/ext/date/php_date.c	2009-06-17 12:56:17.000000000 -0500
++++ b/ext/date/php_date.c	2009-06-29 23:27:55.000000000 -0500
 @@ -1050,7 +1050,7 @@
  			/* year */
  			case 'L': length = slprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break;

Modified: trunk/dports/lang/php5-devel/files/patch-ext-mysqlnd-mysqlnd_portability.h.diff
===================================================================
--- trunk/dports/lang/php5-devel/files/patch-ext-mysqlnd-mysqlnd_portability.h.diff	2009-08-27 05:20:16 UTC (rev 56405)
+++ trunk/dports/lang/php5-devel/files/patch-ext-mysqlnd-mysqlnd_portability.h.diff	2009-08-27 05:23:54 UTC (rev 56406)
@@ -1,6 +1,6 @@
 http://trac.macports.org/ticket/20833
---- ext/mysqlnd/mysqlnd_portability.h	2009/08/25 14:14:23	287694
-+++ ext/mysqlnd/mysqlnd_portability.h	2009/08/25 14:25:01	287695
+--- a/ext/mysqlnd/mysqlnd_portability.h	2009/08/25 14:14:23	287694
++++ b/ext/mysqlnd/mysqlnd_portability.h	2009/08/25 14:25:01	287695
 @@ -174,11 +174,16 @@
  #define MYSQLND_LLU_SPEC "%lu"
  #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090826/aa3882d0/attachment-0001.html>