pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/php70 Unbreak unprivileged build. Actually test f...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ca92656d6e39
branches: trunk
changeset: 348132:ca92656d6e39
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Jun 07 19:23:50 2016 +0000
description:
Unbreak unprivileged build. Actually test for executable.
diffstat:
lang/php70/distinfo | 4 ++--
lang/php70/patches/patch-sapi_cli_Makefile.frag | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diffs (37 lines):
diff -r 71ac078651e0 -r ca92656d6e39 lang/php70/distinfo
--- a/lang/php70/distinfo Tue Jun 07 18:00:20 2016 +0000
+++ b/lang/php70/distinfo Tue Jun 07 19:23:50 2016 +0000
@@ -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-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 -r 71ac078651e0 -r ca92656d6e39 lang/php70/patches/patch-sapi_cli_Makefile.frag
--- a/lang/php70/patches/patch-sapi_cli_Makefile.frag Tue Jun 07 18:00:20 2016 +0000
+++ b/lang/php70/patches/patch-sapi_cli_Makefile.frag Tue Jun 07 19:23:50 2016 +0000
@@ -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 @@
$(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)
Home |
Main Index |
Thread Index |
Old Index