commit 26f9c745c771f05aef8ceee64ccd2dc28c2f5dda
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sun Dec 6 17:25:08 2015 +0100
- rel 3; fix from fc
automake-1.15-perl-escape-curly-bracket.patch | 21 +++++++++++++++++++++
automake.spec | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/automake.spec b/automake.spec
index 9f0ac12..8215135 100644
--- a/automake.spec
+++ b/automake.spec
@@ -15,7 +15,7 @@ Summary(tr.UTF-8): Makefile yapılandırma araçları
Summary(uk.UTF-8): GNU automake - інструменти для автоматичної генерації
Makefile'ів
Name: automake
Version: 1.15
-Release: 2
+Release: 3
Epoch: 1
License: GPL v2+
Group: Development/Building
@@ -25,6 +25,7 @@ Patch0: %{name}-info.patch
Patch1: %{name}-man.patch
Patch2: %{name}-no_versioned_dir.patch
Patch3: %{name}-morearchs.patch
+Patch4: automake-1.15-perl-escape-curly-bracket.patch
URL: http://sources.redhat.com/automake/
BuildRequires: autoconf >= 2.69
%if %{without bootstrap}
@@ -107,6 +108,7 @@ Makefile'ів.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%if %{without bootstrap}
# prepare temporary copy of m4 dir without amversion.m4 (which causes automake
version check)
diff --git a/automake-1.15-perl-escape-curly-bracket.patch
b/automake-1.15-perl-escape-curly-bracket.patch
new file mode 100644
index 0000000..7c22c4e
--- /dev/null
+++ b/automake-1.15-perl-escape-curly-bracket.patch
@@ -0,0 +1,21 @@
+From: Pavel Raiskup <[email protected]>
+Date: Tue, 7 Jul 2015 10:54:24 +0200
+Subject: [PATCH 2/2] bin/automake: escape '{' in regexp pattern
+
+Resolves: rhbz#1239379
+Upstream report:
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
+
+diff --git a/bin/automake.in b/bin/automake.in
+index eedc8bc..a679d16 100644
+--- a/bin/automake.in
++++ b/bin/automake.in
+@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker
+ sub substitute_ac_subst_variables
+ {
+ my ($text) = @_;
+- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
++ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+ return $text;
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/automake.git/commitdiff/26f9c745c771f05aef8ceee64ccd2dc28c2f5dda
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
