[pkgsrc/trunk]: pkgsrc/lang/php70 Mark php binary with paxctl +m because of J...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f03f8faf5a95
branches:  trunk
changeset: 347721:f03f8faf5a95
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat May 28 08:02:26 2016 +0000

description:
Mark php binary with paxctl +m because of JIT code.

Needed on NetBSD-current with PaX MPROTECT.

diffstat:

 lang/php70/distinfo                             |   3 ++-
 lang/php70/patches/patch-sapi_cli_Makefile.frag |  18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 23fb52d2a7cd -r f03f8faf5a95 lang/php70/distinfo
--- a/lang/php70/distinfo       Sat May 28 06:48:03 2016 +0000
+++ b/lang/php70/distinfo       Sat May 28 08:02:26 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2016/05/27 13:29:58 taca Exp $
+$NetBSD: distinfo,v 1.11 2016/05/28 08:02:26 wiz Exp $
 
 SHA1 (php-7.0.7.tar.bz2) = 7d1d718288e34edce686bd834de5313d199cebd3
 RMD160 (php-7.0.7.tar.bz2) = d894c6897095736b5a278ee5a91b9a4cd80b6bac
@@ -21,5 +21,6 @@
 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_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150
 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7
diff -r 23fb52d2a7cd -r f03f8faf5a95 lang/php70/patches/patch-sapi_cli_Makefile.frag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php70/patches/patch-sapi_cli_Makefile.frag   Sat May 28 08:02:26 2016 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-sapi_cli_Makefile.frag,v 1.1 2016/05/28 08:02:26 wiz Exp $
+
+Needed on NetBSD with PaX MPROTEXT, otherwise core dump with:
+#1  0x00000000004d0d87 in _pcre_jit_exec ()
+#2  0x00000000004a53f1 in php_pcre_exec ()
+
+--- sapi/cli/Makefile.frag.orig        2016-04-28 18:12:27.000000000 +0000
++++ sapi/cli/Makefile.frag
+@@ -2,6 +2,9 @@ cli: $(SAPI_CLI_PATH)
+ 
+ $(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
+       $(BUILD_CLI)
++      @if test -f /usr/sbin/paxctl; then \
++              paxctl +m $(SAPI_CLI_PATH); \
++      fi
+ 
+ install-cli: $(SAPI_CLI_PATH)
+       @echo "Installing PHP CLI binary:        $(INSTALL_ROOT)$(bindir)/"