diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-11-09 19:47:47 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-11-09 19:49:06 +0200 |
| commit | 0f1adf454d5fa96291b94dbdbd34640b8c581116 (patch) | |
| tree | bcb4065e2d91d46b1d1c1ada4a9c086958833d66 | |
| parent | a864d563025f7408204af8540f8611a56bd3c939 (diff) | |
| download | patches-0f1adf454d5fa96291b94dbdbd34640b8c581116.tar patches-0f1adf454d5fa96291b94dbdbd34640b8c581116.tar.gz | |
gnu: acl: Fix test regression with perl-5.26.
* gnu/packages/acl.scm (acl)[source]: Add patch.
* gnu/packages/patches/acl-fix-perl-regex.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/acl.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/acl-fix-perl-regex.patch | 22 |
3 files changed, 26 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d8f0fde223..d8b8b14de9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -520,6 +520,7 @@ dist_patch_DATA = \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \ + %D%/packages/patches/acl-fix-perl-regex.patch \ %D%/packages/patches/acl-hurd-path-max.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \ diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index c74b68c309..66e4c33fcc 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> +;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,7 +42,8 @@ (sha256 (base32 "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p")) - (patches (search-patches "acl-hurd-path-max.patch")))) + (patches (search-patches "acl-fix-perl-regex.patch" + "acl-hurd-path-max.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "tests" diff --git a/gnu/packages/patches/acl-fix-perl-regex.patch b/gnu/packages/patches/acl-fix-perl-regex.patch new file mode 100644 index 0000000000..f682abc058 --- /dev/null +++ b/gnu/packages/patches/acl-fix-perl-regex.patch @@ -0,0 +1,22 @@ +This can be removed with the next acl release + +--- + test/run | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/run b/test/run +index 2cf52e8..4627cd2 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.15.0 + |