Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/
Date: Sun, 26 Sep 2021 11:41:00
Message-Id: 1632655632.a739541d57df9faaf91286b763339660d1f5838b.conikost@gentoo
1 commit: a739541d57df9faaf91286b763339660d1f5838b
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Sep 26 10:30:40 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 26 11:27:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a739541d
7
8 sys-devel/automake: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/22412
11 Package-Manager: Portage-3.0.23, 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 .../automake-1.15-perl-escape-curly-bracket.patch | 37 ----------------------
16 1 file changed, 37 deletions(-)
17
18 diff --git a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch
19 deleted file mode 100644
20 index 268548d1e9d..00000000000
21 --- a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch
22 +++ /dev/null
23 @@ -1,37 +0,0 @@
24 -http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
25 -
26 -From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001
27 -From: Pavel Raiskup <praiskup@××××××.com>
28 -Date: Tue, 7 Jul 2015 10:54:24 +0200
29 -Subject: [PATCH] bin/automake: escape '{' in regexp pattern
30 -
31 -Based on perlre(1) documentation:
32 -.. in Perl v5.26, literal uses of a curly bracket will be required
33 -to be escaped, say by preceding them with a backslash ("\{" ) or
34 -enclosing them within square brackets ("[{]") ..
35 -
36 -References:
37 -https://bugzilla.redhat.com/1239379
38 -
39 -* bin/automake.in (substitute_ac_subst_variables): Escape the
40 -occurrence of '{' character.
41 ----
42 - bin/automake.in | 2 +-
43 - 1 file changed, 1 insertion(+), 1 deletion(-)
44 -
45 -diff --git a/bin/automake.in b/bin/automake.in
46 -index 0c29184..c294ced 100644
47 ---- a/bin/automake.in
48 -+++ b/bin/automake.in
49 -@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker
50 - sub substitute_ac_subst_variables
51 - {
52 - my ($text) = @_;
53 -- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
54 -+ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
55 - return $text;
56 - }
57 -
58 ---
59 -2.1.0
60 -