From 48de42bae7f62c830b8d739d9831fb0987bb626defe15f72d9f7bb0eb2595371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 1 Sep 2015 10:28:21 +0000 Subject: [PATCH] Accepting request 328272 from home:dimstar:Factory Fix autoconf-testsuite with perl 5.22 OBS-URL: https://build.opensuse.org/request/show/328272 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=34 --- autoconf-el.changes | 5 +++++ autoconf-perl-5.17-fixes.patch | 28 ++++++++++++++++++++++++++++ autoconf-testsuite.changes | 5 +++++ autoconf-testsuite.spec | 3 +++ autoconf.changes | 5 +++++ autoconf.spec | 3 +++ 6 files changed, 49 insertions(+) create mode 100644 autoconf-perl-5.17-fixes.patch diff --git a/autoconf-el.changes b/autoconf-el.changes index 9b31dee..107dbff 100644 --- a/autoconf-el.changes +++ b/autoconf-el.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 1 08:39:18 UTC 2015 - dimstar@opensuse.org + +- Add autoconf-perl-5.17-fixes.patch: autoscan: port to perl 5.17. + ------------------------------------------------------------------- Fri Mar 13 18:15:12 UTC 2015 - mpluskal@suse.com diff --git a/autoconf-perl-5.17-fixes.patch b/autoconf-perl-5.17-fixes.patch new file mode 100644 index 0000000..f39a861 --- /dev/null +++ b/autoconf-perl-5.17-fixes.patch @@ -0,0 +1,28 @@ +From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 29 Jan 2013 13:46:48 -0800 +Subject: [PATCH] autoscan: port to perl 5.17 + +* bin/autoscan.in (scan_sh_file): Escape '{'. This avoids a +feature that is deprecated in Perl 5.17. Reported by Ray Lauff in +. +--- + bin/autoscan.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/bin/autoscan.in b/bin/autoscan.in +index 993a750..db1df79 100644 +--- a/bin/autoscan.in ++++ b/bin/autoscan.in +@@ -358,7 +358,7 @@ sub scan_sh_file ($) + { + # Strip out comments and variable references. + s/#.*//; +- s/\${[^\}]*}//g; ++ s/\$\{[^\}]*}//g; + s/@[^@]*@//g; + + # Tokens in the code. +-- +1.7.2.5 + diff --git a/autoconf-testsuite.changes b/autoconf-testsuite.changes index 9b31dee..107dbff 100644 --- a/autoconf-testsuite.changes +++ b/autoconf-testsuite.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 1 08:39:18 UTC 2015 - dimstar@opensuse.org + +- Add autoconf-perl-5.17-fixes.patch: autoscan: port to perl 5.17. + ------------------------------------------------------------------- Fri Mar 13 18:15:12 UTC 2015 - mpluskal@suse.com diff --git a/autoconf-testsuite.spec b/autoconf-testsuite.spec index 42658cb..c44669c 100644 --- a/autoconf-testsuite.spec +++ b/autoconf-testsuite.spec @@ -27,6 +27,8 @@ Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz Source1: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz.sig Source2: %{name}.keyring Patch0: autoreconf-ltdl.diff +# PATCH-FIX-UPSTREAM autoconf-perl-5.17-fixes.patch dimstar@opensuse.org -- autoscan: port to perl 5.17 (with perl 5.22, it is now fatal). +Patch1: autoconf-perl-5.17-fixes.patch BuildRequires: help2man Requires: info Requires: m4 >= 1.4.6 @@ -52,6 +54,7 @@ only required for the generation of the scripts, not their use. %prep %setup -q -n autoconf-%{version} %patch0 +%patch1 -p1 %build %configure diff --git a/autoconf.changes b/autoconf.changes index 9b31dee..107dbff 100644 --- a/autoconf.changes +++ b/autoconf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 1 08:39:18 UTC 2015 - dimstar@opensuse.org + +- Add autoconf-perl-5.17-fixes.patch: autoscan: port to perl 5.17. + ------------------------------------------------------------------- Fri Mar 13 18:15:12 UTC 2015 - mpluskal@suse.com diff --git a/autoconf.spec b/autoconf.spec index f77e93e..c6862a1 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -27,6 +27,8 @@ Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz Source1: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz.sig Source2: %{name}.keyring Patch0: autoreconf-ltdl.diff +# PATCH-FIX-UPSTREAM autoconf-perl-5.17-fixes.patch dimstar@opensuse.org -- autoscan: port to perl 5.17 (with perl 5.22, it is now fatal). +Patch1: autoconf-perl-5.17-fixes.patch BuildRequires: help2man Requires: info Requires: m4 >= 1.4.6 @@ -52,6 +54,7 @@ only required for the generation of the scripts, not their use. %prep %setup -q -n autoconf-%{version} %patch0 +%patch1 -p1 %build %configure