CVS commit: [pkgsrc-2016Q1] pkgsrc/lang/php70

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Jun 28 18:59:07 UTC 2016

Modified Files:
        pkgsrc/lang/php70 [pkgsrc-2016Q1]: distinfo
        pkgsrc/lang/php70/patches [pkgsrc-2016Q1]: patch-sapi_cli_Makefile.frag

Log Message:
Pullup ticket #5042 - requested by joerg
lang/php70: build fix

Revisions pulled up:
- lang/php70/distinfo                                           1.13
- lang/php70/patches/patch-sapi_cli_Makefile.frag               1.3

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Tue Jun  7 19:23:50 UTC 2016

   Modified Files:
        pkgsrc/lang/php70: distinfo
        pkgsrc/lang/php70/patches: patch-sapi_cli_Makefile.frag

   Log Message:
   Unbreak unprivileged build. Actually test for executable.


To generate a diff of this commit:
cvs rdiff -u -r1.8.2.2 -r1.8.2.3 pkgsrc/lang/php70/distinfo
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
    pkgsrc/lang/php70/patches/patch-sapi_cli_Makefile.frag

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php70/distinfo
diff -u pkgsrc/lang/php70/distinfo:1.8.2.2 pkgsrc/lang/php70/distinfo:1.8.2.3
--- pkgsrc/lang/php70/distinfo:1.8.2.2  Sat Jun  4 19:56:36 2016
+++ pkgsrc/lang/php70/distinfo  Tue Jun 28 18:59:07 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8.2.2 2016/06/04 19:56:36 bsiegert Exp $
+$NetBSD: distinfo,v 1.8.2.3 2016/06/28 18:59:07 bsiegert 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) = dd659
 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

Index: pkgsrc/lang/php70/patches/patch-sapi_cli_Makefile.frag
diff -u pkgsrc/lang/php70/patches/patch-sapi_cli_Makefile.frag:1.2.2.2 pkgsrc/lang/php70/patches/patch-sapi_cli_Makefile.frag:1.2.2.3
--- pkgsrc/lang/php70/patches/patch-sapi_cli_Makefile.frag:1.2.2.2      Sat Jun  4 19:56:36 2016
+++ pkgsrc/lang/php70/patches/patch-sapi_cli_Makefile.frag      Tue Jun 28 18:59:07 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-sapi_cli_Makefile.frag,v 1.2.2.2 2016/06/04 19:56:36 bsiegert Exp $
+$NetBSD: patch-sapi_cli_Makefile.frag,v 1.2.2.3 2016/06/28 18:59:07 bsiegert 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)