From 3147a2273b8658143582d1ce6ed195d7dc4d4d0a Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Jul 24 2017 13:44:17 +0000 Subject: Resolves: #1473845 - fix test-suite failure with perl-5.26.0 --- diff --git a/0007-acl-2.2.52-tests-perl.patch b/0007-acl-2.2.52-tests-perl.patch new file mode 100644 index 0000000..76df204 --- /dev/null +++ b/0007-acl-2.2.52-tests-perl.patch @@ -0,0 +1,31 @@ +From 368f03d8d415854fc2e66ebaf6e014d9c0fada7b Mon Sep 17 00:00:00 2001 +From: Troy Dawson +Date: Fri, 21 Jul 2017 14:05:47 -0700 +Subject: [PATCH] acl: escape left brace in a regex in test/run + +... to fix test-suite failure with perl-5.26.0 + +Bug: https://bugzilla.redhat.com/1473845 + +Upstream-commit: f2feb94748bd3c64ed153461afa51aebbd717821 +Signed-off-by: Kamil Dudka +--- + test/run | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/run b/test/run +index 2cf52e8..0e499e4 100755 +--- a/test/run ++++ b/test/run +@@ -70,7 +70,7 @@ for (;;) { + if (defined $line) { + # Substitute %VAR and %{VAR} with environment variables. + $line =~ s[%(\w+)][$ENV{$1}]eg; +- $line =~ s[%{(\w+)}][$ENV{$1}]eg; ++ $line =~ s[%\{(\w+)}][$ENV{$1}]eg; + } + if (defined $line) { + if ($line =~ s/^\s*< ?//) { +-- +2.9.4 + diff --git a/acl.spec b/acl.spec index 54b7f0b..24b6fcb 100644 --- a/acl.spec +++ b/acl.spec @@ -27,6 +27,9 @@ Patch5: 0005-acl-2.2.52-getfacl-segv.patch # setfacl.1: document the meaning of '-' in perms (#1337039) Patch6: 0006-acl-2.2.52-setfacl-man-page.patch +# fix test-suite failure with perl-5.26.0 (#1473845) +Patch7: 0007-acl-2.2.52-tests-perl.patch + License: GPLv2+ URL: https://savannah.nongnu.org/projects/acl @@ -128,6 +131,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}* %changelog * Mon Jul 24 2017 Kamil Dudka 2.2.52-16 +- fix test-suite failure with perl-5.26.0 (#1473845) - update URL of the upstream source tarball * Thu May 18 2017 Kamil Dudka 2.2.52-15