summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/php70/distinfo4
-rw-r--r--lang/php70/patches/patch-sapi_cli_Makefile.frag3
2 files changed, 4 insertions, 3 deletions
diff --git a/lang/php70/distinfo b/lang/php70/distinfo
index 5825a9e0db3..fe7b62cd34e 100644
--- a/lang/php70/distinfo
+++ b/lang/php70/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2016/05/28 08:02:26 wiz Exp $
+$NetBSD: distinfo,v 1.12 2016/05/28 08:13:15 wiz Exp $
SHA1 (php-7.0.7.tar.bz2) = 7d1d718288e34edce686bd834de5313d199cebd3
RMD160 (php-7.0.7.tar.bz2) = d894c6897095736b5a278ee5a91b9a4cd80b6bac
@@ -21,6 +21,6 @@ SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb
SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65
-SHA1 (patch-sapi_cli_Makefile.frag) = e7ec1463e4ad684c71190c438bbb1bd4c7dd74a7
+SHA1 (patch-sapi_cli_Makefile.frag) = 4ad9e9ad951ac02314b4c262a0a61e9fd275456e
SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150
SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7
diff --git a/lang/php70/patches/patch-sapi_cli_Makefile.frag b/lang/php70/patches/patch-sapi_cli_Makefile.frag
index 704bdaf90f2..749da9021c1 100644
--- a/lang/php70/patches/patch-sapi_cli_Makefile.frag
+++ b/lang/php70/patches/patch-sapi_cli_Makefile.frag
@@ -1,8 +1,9 @@
-$NetBSD: patch-sapi_cli_Makefile.frag,v 1.1 2016/05/28 08:02:26 wiz Exp $
+$NetBSD: patch-sapi_cli_Makefile.frag,v 1.2 2016/05/28 08:13:15 wiz Exp $
Needed on NetBSD with PaX MPROTEXT, otherwise core dump with:
#1 0x00000000004d0d87 in _pcre_jit_exec ()
#2 0x00000000004a53f1 in php_pcre_exec ()
+https://bugs.php.net/bug.php?id=72281
--- sapi/cli/Makefile.frag.orig 2016-04-28 18:12:27.000000000 +0000
+++ sapi/cli/Makefile.frag