Tue Jun 28 18:59:07 2016 UTC ()
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.


(bsiegert)
diff -r1.8.2.2 -r1.8.2.3 pkgsrc/lang/php70/distinfo
diff -r1.2.2.2 -r1.2.2.3 pkgsrc/lang/php70/patches/patch-sapi_cli_Makefile.frag
cvs diff -r1.8.2.2 -r1.8.2.3 pkgsrc/lang/php70/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php70/Attic/distinfo 2016/06/04 19:56:36 1.8.2.2
+++ pkgsrc/lang/php70/Attic/distinfo 2016/06/28 18:59:07 1.8.2.3
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.8.2.2 2016/06/04 19:56:36 bsiegert Exp $ 1$NetBSD: distinfo,v 1.8.2.3 2016/06/28 18:59:07 bsiegert Exp $
2 2
3SHA1 (php-7.0.7.tar.bz2) = 7d1d718288e34edce686bd834de5313d199cebd3 3SHA1 (php-7.0.7.tar.bz2) = 7d1d718288e34edce686bd834de5313d199cebd3
4RMD160 (php-7.0.7.tar.bz2) = d894c6897095736b5a278ee5a91b9a4cd80b6bac 4RMD160 (php-7.0.7.tar.bz2) = d894c6897095736b5a278ee5a91b9a4cd80b6bac
5SHA512 (php-7.0.7.tar.bz2) = e6d5ce0eb665aa9beb13f5a3e6fa074ff92ccdd5112c4f2a7dfb1220f55624f2284a0bcfec45b92572762905ab2ac7890e98803860378fdb06752e22f363dbcf 5SHA512 (php-7.0.7.tar.bz2) = e6d5ce0eb665aa9beb13f5a3e6fa074ff92ccdd5112c4f2a7dfb1220f55624f2284a0bcfec45b92572762905ab2ac7890e98803860378fdb06752e22f363dbcf
6Size (php-7.0.7.tar.bz2) = 14106181 bytes 6Size (php-7.0.7.tar.bz2) = 14106181 bytes
7SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad 7SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
8SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c 8SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
9SHA1 (patch-ext_gd_config.m4) = a7ec1bd0d876657d4b5e597b9aa1e97c2d2801e3 9SHA1 (patch-ext_gd_config.m4) = a7ec1bd0d876657d4b5e597b9aa1e97c2d2801e3
10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92 10SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
11SHA1 (patch-ext_pcre_pcrelib_config.h) = 0cb05c3b3bfafd8119cf43162c0f4db7f5b37ba8 11SHA1 (patch-ext_pcre_pcrelib_config.h) = 0cb05c3b3bfafd8119cf43162c0f4db7f5b37ba8
12SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 12SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8
13SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 13SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244
14SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 14SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
15SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 15SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
16SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 16SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
17SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 17SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56
18SHA1 (patch-ext_standard_php__dns.h) = 3687ceac4dff4605263b53acb761b071f7446ccb 18SHA1 (patch-ext_standard_php__dns.h) = 3687ceac4dff4605263b53acb761b071f7446ccb
19SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5 19SHA1 (patch-makedist) = 2ac0e0391c031c4fcf4993e2269cde4c6bfddfd5
20SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd 20SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
21SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89 21SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
22SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb 22SHA1 (patch-run-tests.php) = 86c4d3f03eb8e31b5a35820f426533c9478571fb
23SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65 23SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65
24SHA1 (patch-sapi_cli_Makefile.frag) = 4ad9e9ad951ac02314b4c262a0a61e9fd275456e 24SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
25SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150 25SHA1 (patch-sapi_fpm_fpm_events_port.c) = 0f10fdb32fb7cab58e2abda49fb1fc658c410150
26SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7 26SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7
cvs diff -r1.2.2.2 -r1.2.2.3 pkgsrc/lang/php70/patches/Attic/patch-sapi_cli_Makefile.frag (expand / switch to unified diff)

--- pkgsrc/lang/php70/patches/Attic/patch-sapi_cli_Makefile.frag 2016/06/04 19:56:36 1.2.2.2
+++ pkgsrc/lang/php70/patches/Attic/patch-sapi_cli_Makefile.frag 2016/06/28 18:59:07 1.2.2.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-sapi_cli_Makefile.frag,v 1.2.2.2 2016/06/04 19:56:36 bsiegert Exp $ 1$NetBSD: patch-sapi_cli_Makefile.frag,v 1.2.2.3 2016/06/28 18:59:07 bsiegert Exp $
2 2
3Needed on NetBSD with PaX MPROTEXT, otherwise core dump with: 3Needed on NetBSD with PaX MPROTEXT, otherwise core dump with:
4#1 0x00000000004d0d87 in _pcre_jit_exec () 4#1 0x00000000004d0d87 in _pcre_jit_exec ()
5#2 0x00000000004a53f1 in php_pcre_exec () 5#2 0x00000000004a53f1 in php_pcre_exec ()
6https://bugs.php.net/bug.php?id=72281 6https://bugs.php.net/bug.php?id=72281
7 7
8--- sapi/cli/Makefile.frag.orig 2016-04-28 18:12:27.000000000 +0000 8--- sapi/cli/Makefile.frag.orig 2016-04-28 18:12:27.000000000 +0000
9+++ sapi/cli/Makefile.frag 9+++ sapi/cli/Makefile.frag
10@@ -2,6 +2,9 @@ cli: $(SAPI_CLI_PATH) 10@@ -2,6 +2,9 @@ cli: $(SAPI_CLI_PATH)
11  11
12 $(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) 12 $(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
13 $(BUILD_CLI) 13 $(BUILD_CLI)
14+ @if test -f /usr/sbin/paxctl; then \ 14+ @if test -x /usr/sbin/paxctl; then \
15+ paxctl +m $(SAPI_CLI_PATH); \ 15+ /usr/sbin/paxctl +m $(SAPI_CLI_PATH); \
16+ fi 16+ fi
17  17
18 install-cli: $(SAPI_CLI_PATH) 18 install-cli: $(SAPI_CLI_PATH)
19 @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/" 19 @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/"