Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/Dist-Zilla/files/
Date: Sun, 11 Jul 2021 14:43:02
Message-Id: 1626014572.0280699b496126352bbc9ded65e616eac4b35233.conikost@gentoo
1 commit: 0280699b496126352bbc9ded65e616eac4b35233
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Jul 11 11:30:02 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 11 14:42:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0280699b
7
8 dev-perl/Dist-Zilla: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/21596
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../files/Dist-Zilla-6.10.0-perl526.patch | 58 ----------------------
16 1 file changed, 58 deletions(-)
17
18 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
19 deleted file mode 100644
20 index ad908fa84a0..00000000000
21 --- a/dev-perl/Dist-Zilla/files/Dist-Zilla-6.10.0-perl526.patch
22 +++ /dev/null
23 @@ -1,58 +0,0 @@
24 -From fda708069c3c3bdb2b6d8922b21eb604084d51e2 Mon Sep 17 00:00:00 2001
25 -From: Kent Fredric <kentnl@g.o>
26 -Date: Fri, 6 Oct 2017 22:32:36 +1300
27 -Subject: Keep dist-root in @INC beyond Perl 5.26
28 -
29 -The only thing that makes sense is to ensure CWD of some description is
30 -in @INC at some stage before plugins are actually loaded, because
31 -that's the traditional expectation.
32 -
33 -Basically, this option is the only option that works. There's no viable
34 -way to scope @INC changes to anything narrower without breaking the
35 -usage entirely.
36 -
37 -There's no sane way to limit the depth of @INC changes either, even if
38 -we wanted to.
39 -
40 -And if you have vulnerable code in your project source tree that you're
41 -worried about, you're pretty much beyond screwed already, and you're
42 -about to be screwing CPAN when you ship next, and no amount of @INC
43 -magic will save you.
44 -
45 -Bug: https://bugs.gentoo.org/613586
46 -Bug: https://github.com/rjbs/Dist-Zilla/issues/581
47 -Bug: https://github.com/rjbs/Dist-Zilla/pull/590
48 -Bug: https://github.com/rjbs/Dist-Zilla/pull/600
49 ----
50 - lib/Dist/Zilla/Dist/Builder.pm | 1 +
51 - lib/Dist/Zilla/Util/AuthorDeps.pm | 2 +-
52 - 2 files changed, 2 insertions(+), 1 deletion(-)
53 -
54 -diff --git a/lib/Dist/Zilla/Dist/Builder.pm b/lib/Dist/Zilla/Dist/Builder.pm
55 -index 2148eeb..6b8e301 100644
56 ---- a/lib/Dist/Zilla/Dist/Builder.pm
57 -+++ b/lib/Dist/Zilla/Dist/Builder.pm
58 -@@ -36,6 +36,7 @@ sub from_config {
59 - $arg ||= {};
60 -
61 - my $root = path($arg->{dist_root} || '.');
62 -+ unshift @INC, $root->absolute->stringify;
63 -
64 - my $sequence = $class->_load_config({
65 - root => $root,
66 -diff --git a/lib/Dist/Zilla/Util/AuthorDeps.pm b/lib/Dist/Zilla/Util/AuthorDeps.pm
67 -index 01a958e..cfcd62f 100644
68 ---- a/lib/Dist/Zilla/Util/AuthorDeps.pm
69 -+++ b/lib/Dist/Zilla/Util/AuthorDeps.pm
70 -@@ -105,7 +105,7 @@ sub extract_author_deps {
71 -
72 - if ($missing) {
73 - require Module::Runtime;
74 --
75 -+ unshift @INC, $root->absolute->stringify;
76 - @packages =
77 - grep {
78 - $_ eq 'perl'
79 ---
80 -2.14.1
81 -