From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F28B11396D0 for ; Fri, 6 Oct 2017 09:49:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3762DE0BE7; Fri, 6 Oct 2017 09:49:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03CD4E0BE7 for ; Fri, 6 Oct 2017 09:49:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5AC4233C4EE for ; Fri, 6 Oct 2017 09:49:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDF099095 for ; Fri, 6 Oct 2017 09:49:38 +0000 (UTC) From: "Kent Fredric" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kent Fredric" Message-ID: <1507283352.22b2006adc689bd890b2553d333a6dbbbae59ce9.kentnl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/Dist-Zilla/files/, dev-perl/Dist-Zilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-perl/Dist-Zilla/Dist-Zilla-6.10.0-r1.ebuild dev-perl/Dist-Zilla/Dist-Zilla-6.10.0.ebuild dev-perl/Dist-Zilla/files/Dist-Zilla-6.10.0-perl526.patch X-VCS-Directories: dev-perl/Dist-Zilla/files/ dev-perl/Dist-Zilla/ X-VCS-Committer: kentnl X-VCS-Committer-Name: Kent Fredric X-VCS-Revision: 22b2006adc689bd890b2553d333a6dbbbae59ce9 X-VCS-Branch: master Date: Fri, 6 Oct 2017 09:49:38 +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: 01575f2c-8fe2-4a34-888f-ddb937f5edb1 X-Archives-Hash: 150ed1281866735a8f46d680cc58196b commit: 22b2006adc689bd890b2553d333a6dbbbae59ce9 Author: Kent Fredric gentoo org> AuthorDate: Fri Oct 6 09:47:45 2017 +0000 Commit: Kent Fredric gentoo org> CommitDate: Fri Oct 6 09:49:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b2006a dev-perl/Dist-Zilla: Add fix for [=inc::Foo] on 5.26 bug #613586 This unbreaks dists that use the syntax: [=inc::Foo] Which is *far* more widespread than any use of stuff from `@INC` locations **other** than `.` Bug: https://bugs.gentoo.org/613586 Package-Manager: Portage-2.3.8, Repoman-2.3.3 ...a-6.10.0.ebuild => Dist-Zilla-6.10.0-r1.ebuild} | 0 dev-perl/Dist-Zilla/Dist-Zilla-6.10.0.ebuild | 3 ++ .../files/Dist-Zilla-6.10.0-perl526.patch | 58 ++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/dev-perl/Dist-Zilla/Dist-Zilla-6.10.0.ebuild b/dev-perl/Dist-Zilla/Dist-Zilla-6.10.0-r1.ebuild similarity index 100% copy from dev-perl/Dist-Zilla/Dist-Zilla-6.10.0.ebuild copy to dev-perl/Dist-Zilla/Dist-Zilla-6.10.0-r1.ebuild diff --git a/dev-perl/Dist-Zilla/Dist-Zilla-6.10.0.ebuild b/dev-perl/Dist-Zilla/Dist-Zilla-6.10.0.ebuild index 8654659cc4e..606e84c34a7 100644 --- a/dev-perl/Dist-Zilla/Dist-Zilla-6.10.0.ebuild +++ b/dev-perl/Dist-Zilla/Dist-Zilla-6.10.0.ebuild @@ -13,6 +13,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="minimal test" +PATCHES=( + "${FILESDIR}/${P}-perl526.patch" +) ## CPAN->Gentoo resolution map for grepping in case upstream split a dep # breaks: Dist::Zilla::App::Command::stale -> Dist-Zilla-Plugin-PromptIfStale # DZA:Command::xtest -> DZP:CheckExtraTests diff --git a/dev-perl/Dist-Zilla/files/Dist-Zilla-6.10.0-perl526.patch b/dev-perl/Dist-Zilla/files/Dist-Zilla-6.10.0-perl526.patch new file mode 100644 index 00000000000..ad908fa84a0 --- /dev/null +++ b/dev-perl/Dist-Zilla/files/Dist-Zilla-6.10.0-perl526.patch @@ -0,0 +1,58 @@ +From fda708069c3c3bdb2b6d8922b21eb604084d51e2 Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Fri, 6 Oct 2017 22:32:36 +1300 +Subject: Keep dist-root in @INC beyond Perl 5.26 + +The only thing that makes sense is to ensure CWD of some description is +in @INC at some stage before plugins are actually loaded, because +that's the traditional expectation. + +Basically, this option is the only option that works. There's no viable +way to scope @INC changes to anything narrower without breaking the +usage entirely. + +There's no sane way to limit the depth of @INC changes either, even if +we wanted to. + +And if you have vulnerable code in your project source tree that you're +worried about, you're pretty much beyond screwed already, and you're +about to be screwing CPAN when you ship next, and no amount of @INC +magic will save you. + +Bug: https://bugs.gentoo.org/613586 +Bug: https://github.com/rjbs/Dist-Zilla/issues/581 +Bug: https://github.com/rjbs/Dist-Zilla/pull/590 +Bug: https://github.com/rjbs/Dist-Zilla/pull/600 +--- + lib/Dist/Zilla/Dist/Builder.pm | 1 + + lib/Dist/Zilla/Util/AuthorDeps.pm | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/Dist/Zilla/Dist/Builder.pm b/lib/Dist/Zilla/Dist/Builder.pm +index 2148eeb..6b8e301 100644 +--- a/lib/Dist/Zilla/Dist/Builder.pm ++++ b/lib/Dist/Zilla/Dist/Builder.pm +@@ -36,6 +36,7 @@ sub from_config { + $arg ||= {}; + + my $root = path($arg->{dist_root} || '.'); ++ unshift @INC, $root->absolute->stringify; + + my $sequence = $class->_load_config({ + root => $root, +diff --git a/lib/Dist/Zilla/Util/AuthorDeps.pm b/lib/Dist/Zilla/Util/AuthorDeps.pm +index 01a958e..cfcd62f 100644 +--- a/lib/Dist/Zilla/Util/AuthorDeps.pm ++++ b/lib/Dist/Zilla/Util/AuthorDeps.pm +@@ -105,7 +105,7 @@ sub extract_author_deps { + + if ($missing) { + require Module::Runtime; +- ++ unshift @INC, $root->absolute->stringify; + @packages = + grep { + $_ eq 'perl' +-- +2.14.1 +