summaryrefslogtreecommitdiff
path: root/lang/php70
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-06-07 19:23:50 +0000
committerjoerg <joerg@pkgsrc.org>2016-06-07 19:23:50 +0000
commitc4a431e803d2e3437863f3f3edc5583778fa18e6 (patch)
tree06c43693e19709c17411fe33031740357027a74c /lang/php70
parent57e2ca384b5199fce2213fef8239fe9da731a07e (diff)
downloadpkgsrc-c4a431e803d2e3437863f3f3edc5583778fa18e6.tar.gz
Unbreak unprivileged build. Actually test for executable.
Diffstat (limited to 'lang/php70')
-rw-r--r--lang/php70/distinfo4
-rw-r--r--lang/php70/patches/patch-sapi_cli_Makefile.frag6
2 files changed, 5 insertions, 5 deletions
diff --git a/lang/php70/distinfo b/lang/php70/distinfo
index fe7b62cd34e..3d124e8702a 100644
--- a/lang/php70/distinfo
+++ b/lang/php70/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2016/05/28 08:13:15 wiz Exp $
+$NetBSD: distinfo,v 1.13 2016/06/07 19:23:50 joerg 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) = 4ad9e9ad951ac02314b4c262a0a61e9fd275456e
+SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
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 749da9021c1..243b1cfad43 100644
--- a/lang/php70/patches/patch-sapi_cli_Makefile.frag
+++ b/lang/php70/patches/patch-sapi_cli_Makefile.frag
@@ -1,4 +1,4 @@
-$NetBSD: patch-sapi_cli_Makefile.frag,v 1.2 2016/05/28 08:13:15 wiz Exp $
+$NetBSD: patch-sapi_cli_Makefile.frag,v 1.3 2016/06/07 19:23:50 joerg Exp $
Needed on NetBSD with PaX MPROTEXT, otherwise core dump with:
#1 0x00000000004d0d87 in _pcre_jit_exec ()
@@ -11,8 +11,8 @@ https://bugs.php.net/bug.php?id=72281
$(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); \
++ @if test -x /usr/sbin/paxctl; then \
++ /usr/sbin/paxctl +m $(SAPI_CLI_PATH); \
+ fi
install-cli: $(SAPI_CLI_PATH)