diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php5/Makefile | 10 | ||||
| -rw-r--r-- | lang/php5/distinfo | 4 | ||||
| -rw-r--r-- | lang/php53/Makefile | 10 | ||||
| -rw-r--r-- | lang/php53/distinfo | 4 |
4 files changed, 6 insertions, 22 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 412016bfd376..9278c9c87ea2 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -59,8 +59,7 @@ MAN1= php-config.1 phpize.1 PATCH_DIST_STRIP= -p1 .if !defined(WITHOUT_SUHOSIN) -#PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin -PATCHFILES+= suhosin-patch-5.3.3-0.9.10.patch.gz:suhosin +PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin PATCH_SITES+= http://download.suhosin.org/:suhosin PLIST_SUB+= SUHOSIN="" .else @@ -158,13 +157,6 @@ CONFIGURE_ARGS+=--enable-zend-multibyte CONFIGURE_ARGS+=--disable-ipv6 .endif -pre-patch: -# To be removed after suhosin update -.if !defined(WITHOUT_SUHOSIN) - @${REINPLACE_CMD} -E 's|REPORT_ERRORS TSRMLS_CC, "%s", error|REPORT_ERRORS TSRMLS_CC, error|' \ - ${WRKSRC}/ext/phar/stream.c -.endif - post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* diff --git a/lang/php5/distinfo b/lang/php5/distinfo index f2bedddcb80e..cd6ba674f6fc 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,6 +1,6 @@ SHA256 (php-5.3.4.tar.bz2) = a832831185b1652d1adf7ff92864b2a65153853ee5999dafcd6c1ee657f4218d SIZE (php-5.3.4.tar.bz2) = 10804376 -SHA256 (suhosin-patch-5.3.3-0.9.10.patch.gz) = f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c -SIZE (suhosin-patch-5.3.3-0.9.10.patch.gz) = 41298 +SHA256 (suhosin-patch-5.3.4-0.9.10.patch.gz) = 6c920803f6a9f43881c7d8a938716cb572c2f43181fe5cd71f7bfb486825fddf +SIZE (suhosin-patch-5.3.4-0.9.10.patch.gz) = 41092 SHA256 (php-5.3.4-mail-header.patch) = b360a9719151d43a34e46ac8e0c7631fef7f24647d22b186ddc89bf050beaa02 SIZE (php-5.3.4-mail-header.patch) = 3350 diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 412016bfd376..9278c9c87ea2 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -59,8 +59,7 @@ MAN1= php-config.1 phpize.1 PATCH_DIST_STRIP= -p1 .if !defined(WITHOUT_SUHOSIN) -#PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin -PATCHFILES+= suhosin-patch-5.3.3-0.9.10.patch.gz:suhosin +PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin PATCH_SITES+= http://download.suhosin.org/:suhosin PLIST_SUB+= SUHOSIN="" .else @@ -158,13 +157,6 @@ CONFIGURE_ARGS+=--enable-zend-multibyte CONFIGURE_ARGS+=--disable-ipv6 .endif -pre-patch: -# To be removed after suhosin update -.if !defined(WITHOUT_SUHOSIN) - @${REINPLACE_CMD} -E 's|REPORT_ERRORS TSRMLS_CC, "%s", error|REPORT_ERRORS TSRMLS_CC, error|' \ - ${WRKSRC}/ext/phar/stream.c -.endif - post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* diff --git a/lang/php53/distinfo b/lang/php53/distinfo index f2bedddcb80e..cd6ba674f6fc 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,6 +1,6 @@ SHA256 (php-5.3.4.tar.bz2) = a832831185b1652d1adf7ff92864b2a65153853ee5999dafcd6c1ee657f4218d SIZE (php-5.3.4.tar.bz2) = 10804376 -SHA256 (suhosin-patch-5.3.3-0.9.10.patch.gz) = f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c -SIZE (suhosin-patch-5.3.3-0.9.10.patch.gz) = 41298 +SHA256 (suhosin-patch-5.3.4-0.9.10.patch.gz) = 6c920803f6a9f43881c7d8a938716cb572c2f43181fe5cd71f7bfb486825fddf +SIZE (suhosin-patch-5.3.4-0.9.10.patch.gz) = 41092 SHA256 (php-5.3.4-mail-header.patch) = b360a9719151d43a34e46ac8e0c7631fef7f24647d22b186ddc89bf050beaa02 SIZE (php-5.3.4-mail-header.patch) = 3350 |