From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 764D91384B4 for ; Mon, 2 Nov 2015 23:37:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEEF1E084D; Mon, 2 Nov 2015 23:37:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82BA3E084D for ; Mon, 2 Nov 2015 23:37:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DC9D3406AD for ; Mon, 2 Nov 2015 23:37:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1C4C1EE0 for ; Mon, 2 Nov 2015 23:37:13 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1446507318.d9454b5d1c5a22855e7c22f30644ba7c8980f923.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch dev-lang/php/php-5.6.15-r1.ebuild dev-lang/php/php-5.6.15.ebuild X-VCS-Directories: dev-lang/php/files/ dev-lang/php/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: d9454b5d1c5a22855e7c22f30644ba7c8980f923 X-VCS-Branch: master Date: Mon, 2 Nov 2015 23:37:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 49ead348-6bd8-4f6d-8b0b-b3a514689b00 X-Archives-Hash: bb241f0aa22854cacc5dffba45e65108 commit: d9454b5d1c5a22855e7c22f30644ba7c8980f923 Author: Michael Orlitzky gentoo org> AuthorDate: Mon Nov 2 23:00:20 2015 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Mon Nov 2 23:35:18 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9454b5d dev-lang/php: revbump php-5.6.15 to fix a segfault. The segfault issue was reported in bug #564690 by Zoltán Halassy. There is an upstream fix that we've added as a patch. The problem/fix have both been confirmed. Since this requires a revbump, the sys-libs/db dependency has been fixed along with it according to bug #521222. It still remains to address that issue for the php-7.x series. Gentoo-Bug: 521222 Gentoo-Bug: 564690 Package-Manager: portage-2.2.20.1 .../php/files/fix-5.6.15-fpm-const-crash.patch | 59 ++++++++++++++++++++++ .../{php-5.6.15.ebuild => php-5.6.15-r1.ebuild} | 23 ++++++++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch new file mode 100644 index 0000000..29876a9 --- /dev/null +++ b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch @@ -0,0 +1,59 @@ +From 37ed0dafe47fb1053aee7822113bacc1f213337a Mon Sep 17 00:00:00 2001 +From: Xinchen Hui +Date: Mon, 2 Nov 2015 10:47:02 +0800 +Subject: [PATCH] Fixed bug #70828 (php-fpm 5.6 with opcache crashes when + referencing a non-existent constant) + +--- + NEWS | 2 ++ + Zend/tests/bug70828.phpt | 24 ++++++++++++++++++++++++ + Zend/zend_compile.c | 2 +- + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 Zend/tests/bug70828.phpt + +diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt +new file mode 100644 +index 0000000..dd285b5 +--- /dev/null ++++ b/Zend/tests/bug70828.phpt +@@ -0,0 +1,24 @@ ++--TEST-- ++Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant) ++--FILE-- ++ ++--EXPECTF-- ++Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in /home/huixinchen/opensource/php-5.6/Zend/tests/bug70828.php on line 8 ++string(11) "nonexistent" +diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c +index 5ff1b04..fca4e2a 100644 +--- a/Zend/zend_compile.c ++++ b/Zend/zend_compile.c +@@ -5804,7 +5804,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con + opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC); + } else { + opline->extended_value = IS_CONSTANT_UNQUALIFIED; +- if (CG(current_namespace)) { ++ if (check_namespace && CG(current_namespace)) { + opline->extended_value |= IS_CONSTANT_IN_NAMESPACE; + opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC); + } else { +-- +2.1.4 + diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15-r1.ebuild similarity index 96% rename from dev-lang/php/php-5.6.15.ebuild rename to dev-lang/php/php-5.6.15-r1.ebuild index c6cc5ca..c64fd9d 100644 --- a/dev-lang/php/php-5.6.15.ebuild +++ b/dev-lang/php/php-5.6.15-r1.ebuild @@ -79,8 +79,23 @@ DEPEND=" >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] -