main/augeas: align patch set with upstream

01-18: committed to upstream
19: GH #332

20 files changed, 112 insertions, 104 deletions

diff --git a/main/augeas/0001-Shellvars-accept-and-builtins.patch b/main/augeas/0001-Shellvars-accept-and-builtins.patch
index 282b41b123..cc75fd3098 100644
--- a/main/augeas/0001-Shellvars-accept-and-builtins.patch
+++ b/main/augeas/0001-Shellvars-accept-and-builtins.patch
@@ -1,4 +1,4 @@
-From 239ee5f55eaae79362476cecaaf6c5064cb323b8 Mon Sep 17 00:00:00 2001
+From be89b820d5eecce26fbb5a779ce743cedef5c1c9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
 Date: Mon, 13 Jul 2015 10:03:21 +0200
 Subject: [PATCH 01/19] Shellvars: accept [] and [[]] builtins
diff --git a/main/augeas/0002-Shellvars-Add-test-for.patch b/main/augeas/0002-Shellvars-Add-test-for.patch
index 58ce215de3..ba75e6491a 100644
--- a/main/augeas/0002-Shellvars-Add-test-for.patch
+++ b/main/augeas/0002-Shellvars-Add-test-for.patch
@@ -1,4 +1,4 @@
-From 468fbf6dfe9ab48e4861a5dfa799a7170bea5c08 Mon Sep 17 00:00:00 2001
+From a1043543bffb78c8bd95e7ef1709ed4eac9a9a2a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
 Date: Mon, 13 Jul 2015 10:04:38 +0200
 Subject: [PATCH 02/19] Shellvars: Add test for [[]]
diff --git a/main/augeas/0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch b/main/augeas/0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
index 287f4433d2..7b54a81762 100644
--- a/main/augeas/0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
+++ b/main/augeas/0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
@@ -1,4 +1,4 @@
-From ad5777d3bef4dcd74a2dcd09d4679b034ba16180 Mon Sep 17 00:00:00 2001
+From 769146f792da49872431e0776d06ee207dd5f864 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Thu, 4 Dec 2014 14:31:26 +0200
 Subject: [PATCH 03/19] Shellvars: allow partial quoting, mixing multiple
diff --git a/main/augeas/0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch b/main/augeas/0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
index 582e1f14f1..d1da453f43 100644
--- a/main/augeas/0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
+++ b/main/augeas/0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
@@ -1,4 +1,4 @@
-From 1db574636b5bdaecfb3218a0853e3d7c34d724c6 Mon Sep 17 00:00:00 2001
+From 16a2ec331c2f928f41dd5c22455e0713d2975130 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Mon, 8 Dec 2014 13:16:14 +0200
 Subject: [PATCH 04/19] Shellvars: allow wrapping loop condition to multiple
diff --git a/main/augeas/0005-Shellvars-guard-against-comments.patch b/main/augeas/0005-Shellvars-guard-against-comments.patch
index 7feb945da1..4cc52fe5f8 100644
--- a/main/augeas/0005-Shellvars-guard-against-comments.patch
+++ b/main/augeas/0005-Shellvars-guard-against-comments.patch
@@ -1,4 +1,4 @@
-From 23e3316a5539b2a19efe6d497ffcd3906fed1aaf Mon Sep 17 00:00:00 2001
+From 34d33eda74c9171aadf25686307f73fb307c7626 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Mon, 8 Dec 2014 12:43:51 +0200
 Subject: [PATCH 05/19] Shellvars: guard against comments
diff --git a/main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch b/main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
index 624fb7b8f0..14e2a20281 100644
--- a/main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
+++ b/main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
@@ -1,4 +1,4 @@
-From c39d0c16a8cf540816df94b28f428e3ef3ce2579 Mon Sep 17 00:00:00 2001
+From cd7c5cf9a3c3e96c53369ee1dbb25c1748dc0f91 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Thu, 4 Dec 2014 18:25:12 +0200
 Subject: [PATCH 06/19] Shellvars: allow wrapping builtin arguments to multiple
diff --git a/main/augeas/0007-Shellvars-allow-quotes-in-loop-conditions.patch b/main/augeas/0007-Shellvars-allow-quotes-in-loop-conditions.patch
index 9d669e843f..0236806efa 100644
--- a/main/augeas/0007-Shellvars-allow-quotes-in-loop-conditions.patch
+++ b/main/augeas/0007-Shellvars-allow-quotes-in-loop-conditions.patch
@@ -1,4 +1,4 @@
-From 7d655518acb7a4c255a40a025621cd73053acce4 Mon Sep 17 00:00:00 2001
+From faa0993e738e5ec6d59696e9fd3b96ab513e0e8d Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Mon, 8 Dec 2014 14:28:16 +0200
 Subject: [PATCH 07/19] Shellvars: allow quotes in loop conditions
diff --git a/main/augeas/0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch b/main/augeas/0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
index 2100c10b3c..54559794f7 100644
--- a/main/augeas/0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
+++ b/main/augeas/0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
@@ -1,4 +1,4 @@
-From b293b7f30e46ca75127fab698a6ed86523746db3 Mon Sep 17 00:00:00 2001
+From a0cc3d1f68e23e5e809559d939fcc8717dbbcdcd Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Mon, 8 Dec 2014 15:17:46 +0200
 Subject: [PATCH 08/19] Shellvars: case: support quotes and spaces in pattern
diff --git a/main/augeas/0009-Shellvars-add-eval-builtin-support.patch b/main/augeas/0009-Shellvars-add-eval-builtin-support.patch
index 71f9b73946..bbe8c7eed8 100644
--- a/main/augeas/0009-Shellvars-add-eval-builtin-support.patch
+++ b/main/augeas/0009-Shellvars-add-eval-builtin-support.patch
@@ -1,4 +1,4 @@
-From c0ceda2cbc93add3392e87a488947691a886af78 Mon Sep 17 00:00:00 2001
+From 4a702b2a5bb89015e56df99aca7093748154da6e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
 Date: Thu, 30 Jul 2015 09:16:12 +0200
 Subject: [PATCH 09/19] Shellvars: add eval builtin support
diff --git a/main/augeas/0010-Shellvars-add-alias-builtin-support.patch b/main/augeas/0010-Shellvars-add-alias-builtin-support.patch
index 3813970aef..70b2f8b2ee 100644
--- a/main/augeas/0010-Shellvars-add-alias-builtin-support.patch
+++ b/main/augeas/0010-Shellvars-add-alias-builtin-support.patch
@@ -1,4 +1,4 @@
-From 2717b7ecb107f5c4bfd9b04eb8543a365500421d Mon Sep 17 00:00:00 2001
+From 805f20b339034974ed3f47a4e5fb4a58f5ee58ad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
 Date: Thu, 30 Jul 2015 09:22:22 +0200
 Subject: [PATCH 10/19] Shellvars: add alias builtin support
diff --git a/main/augeas/0011-Shellvars-pattern-nodes-in-case-entries.patch b/main/augeas/0011-Shellvars-pattern-nodes-in-case-entries.patch
index dc11176d87..eb4c4efeb1 100644
--- a/main/augeas/0011-Shellvars-pattern-nodes-in-case-entries.patch
+++ b/main/augeas/0011-Shellvars-pattern-nodes-in-case-entries.patch
@@ -1,4 +1,4 @@
-From 60a542a54819deee9a869815df40f99a4391a8fa Mon Sep 17 00:00:00 2001
+From 906d8b89a99de2c7b27cb1a8db8af118e39f8e19 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Mon, 13 Jul 2015 14:43:09 +0300
 Subject: [PATCH 11/19] Shellvars: pattern nodes in case entries
diff --git a/main/augeas/0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch b/main/augeas/0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
index 6fe3632a33..931c1324a6 100644
--- a/main/augeas/0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
+++ b/main/augeas/0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
@@ -1,4 +1,4 @@
-From c6e1f01214b89bb17315704d08f285401abec0db Mon Sep 17 00:00:00 2001
+From 1eb1db77c4c447ab45d2fff7eece4e87da001909 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Mon, 13 Jul 2015 14:48:18 +0300
 Subject: [PATCH 12/19] Shellvars: use sto_to_semicol in condition lens
diff --git a/main/augeas/0013-Shellvars-allow-and-constructs-after-condition.patch b/main/augeas/0013-Shellvars-allow-and-constructs-after-condition.patch
index d1343ee110..62ba0348c1 100644
--- a/main/augeas/0013-Shellvars-allow-and-constructs-after-condition.patch
+++ b/main/augeas/0013-Shellvars-allow-and-constructs-after-condition.patch
@@ -1,4 +1,4 @@
-From 3db2b565125c3e00914f6def30510aaa71b7d908 Mon Sep 17 00:00:00 2001
+From bbd7baad4e6a1946295117d56f069c8edadba855 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Mon, 13 Jul 2015 14:51:37 +0300
 Subject: [PATCH 13/19] Shellvars: allow && and || constructs after condition
diff --git a/main/augeas/0014-Shellvars-Allow-almost-any-command.patch b/main/augeas/0014-Shellvars-Allow-almost-any-command.patch
index 03c7b1b64d..e5aec91949 100644
--- a/main/augeas/0014-Shellvars-Allow-almost-any-command.patch
+++ b/main/augeas/0014-Shellvars-Allow-almost-any-command.patch
@@ -1,4 +1,4 @@
-From ba95bf402b009f0a572807b62ea2a7addd29dc17 Mon Sep 17 00:00:00 2001
+From 296764fe7baa4d023d58661e6b600116b3b90b21 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphink@gmail.com>
 Date: Thu, 24 Apr 2014 16:10:50 +0200
 Subject: [PATCH 14/19] Shellvars: Allow (almost) any command
diff --git a/main/augeas/0015-Shellvars-support-pipes-in-commands.patch b/main/augeas/0015-Shellvars-support-pipes-in-commands.patch
index c478264590..ec51ebc0cf 100644
--- a/main/augeas/0015-Shellvars-support-pipes-in-commands.patch
+++ b/main/augeas/0015-Shellvars-support-pipes-in-commands.patch
@@ -1,4 +1,4 @@
-From 9c054205bede2555ab96c7a03a21e8650a465308 Mon Sep 17 00:00:00 2001
+From cb47cc557e19c38f8a6f04ac6f2af2c1a8a1c12a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
 Date: Mon, 3 Aug 2015 14:47:13 +0200
 Subject: [PATCH 15/19] Shellvars: support pipes in commands
diff --git a/main/augeas/0016-Shellvars-allow-in-commands.patch b/main/augeas/0016-Shellvars-allow-in-commands.patch
index e29c4710d3..f88c3cce2a 100644
--- a/main/augeas/0016-Shellvars-allow-in-commands.patch
+++ b/main/augeas/0016-Shellvars-allow-in-commands.patch
@@ -1,4 +1,4 @@
-From 7b01ce17d4caafdfa1f83a1d43b926c8ef2dd9c8 Mon Sep 17 00:00:00 2001
+From 1e02e1f746ade63007fbe9caa03e89511a1da66b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
 Date: Tue, 25 Aug 2015 11:28:41 +0200
 Subject: [PATCH 16/19] Shellvars: allow &&/|| in commands
diff --git a/main/augeas/0019-Shellvars-allow-wrapping-command-sequences.patch b/main/augeas/0017-Shellvars-allow-wrapping-command-sequences.patch
index 5571f1ba0d..1d40cde649 100644
--- a/main/augeas/0019-Shellvars-allow-wrapping-command-sequences.patch
+++ b/main/augeas/0017-Shellvars-allow-wrapping-command-sequences.patch
@@ -1,7 +1,7 @@
-From f17fabf6aff94b632f733896effdb7856a46d948 Mon Sep 17 00:00:00 2001
+From 2d253859c9e8f447449a77187d5dc5a21828b8c7 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Sat, 12 Dec 2015 17:49:51 +0200
-Subject: [PATCH 19/19] Shellvars: allow wrapping command sequences
+Subject: [PATCH 17/19] Shellvars: allow wrapping command sequences
 
 ---
  lenses/shellvars.aug            | 10 +++++-----
@@ -9,7 +9,7 @@ Subject: [PATCH 19/19] Shellvars: allow wrapping command sequences
  2 files changed, 18 insertions(+), 6 deletions(-)
 
 diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index 3d05da5..d62bca0 100644
+index f7f4c47..5a48f11 100644
 --- a/lenses/shellvars.aug
 +++ b/lenses/shellvars.aug
 @@ -34,7 +34,7 @@ module Shellvars =
@@ -48,17 +48,17 @@ index 3d05da5..d62bca0 100644
      . label ("@".lbl) . sto ]
  
    let action_pipe = action "|" "pipe"
-@@ -160,7 +160,7 @@ module Shellvars =
-     in Util.indent . label "@command"
-      . [ key key_re . eq . store anyquot . Sep.space . del /(\\\\\n[ \t]*)?/ "" ]*
-      . store (word - reserved_key)
+@@ -158,7 +158,7 @@ module Shellvars =
+     in let and = action_and entry
+     in let or = action_or entry
+     in Util.indent . label "@command" . store (word - reserved_key)
 -     . [ Sep.space . label "@arg" . sto_to_semicol]?
 +     . [ Sep.cl_or_space . label "@arg" . sto_to_semicol]?
       . ( pipe | and | or )?
  
    let entry_eol = entry_eol_nocommand
 diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 29f9e75..673fc0d 100644
+index 2c810cb..9a1878c 100644
 --- a/lenses/tests/test_shellvars.aug
 +++ b/lenses/tests/test_shellvars.aug
 @@ -168,7 +168,7 @@ unset ONBOOT    #   We do not want this var
@@ -70,9 +70,9 @@ index 29f9e75..673fc0d 100644
  
    (* Test semicolons *)
    test lns get "VAR1=\"this;is;a;test\"\nVAR2=this;\n" =
-@@ -680,6 +680,18 @@ test Shellvars.lns get "abc=def \\\n  ghi=\"jkl mno\" command arg1 arg2\n" =
-     { "@arg" = "arg1 arg2" }
-   }
+@@ -668,6 +668,18 @@ test Shellvars.lns get "cat /etc/issue | grep -q \"Debian\" && echo moo || echo
+                 { "@arg" = "baa" } } } } } } } }
+ 
  
 +(* Wrapped command sequences *)
 +
diff --git a/main/augeas/0017-Shellvars-test-case-for-wrapping-command-arguments.patch b/main/augeas/0018-Shellvars-test-case-for-wrapping-command-arguments.patch
index e4bbf7b177..c3b4a21994 100644
--- a/main/augeas/0017-Shellvars-test-case-for-wrapping-command-arguments.patch
+++ b/main/augeas/0018-Shellvars-test-case-for-wrapping-command-arguments.patch
@@ -1,14 +1,14 @@
-From 051b9da244531c2631a9dca2716ef85c52878089 Mon Sep 17 00:00:00 2001
+From 18993cfd16cdf1c7876c508a5632d7765fa221a3 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Thu, 4 Dec 2014 18:29:58 +0200
-Subject: [PATCH 17/19] Shellvars: test case for wrapping command arguments
+Subject: [PATCH 18/19] Shellvars: test case for wrapping command arguments
 
 ---
  lenses/tests/test_shellvars.aug | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 2c810cb..07c392e 100644
+index 9a1878c..544226e 100644
 --- a/lenses/tests/test_shellvars.aug
 +++ b/lenses/tests/test_shellvars.aug
 @@ -614,13 +614,18 @@ esac\n" =
diff --git a/main/augeas/0018-Shellvars-allow-command-specific-environment-variabl.patch b/main/augeas/0019-Shellvars-allow-command-specific-environment-variabl.patch
index d4bb1cc646..cec27064e1 100644
--- a/main/augeas/0018-Shellvars-allow-command-specific-environment-variabl.patch
+++ b/main/augeas/0019-Shellvars-allow-command-specific-environment-variabl.patch
@@ -1,30 +1,38 @@
-From 8ef26da233c2d6db1455f74b572de77944efefe0 Mon Sep 17 00:00:00 2001
+From caaee2d787622fb680ef640b8ebda4678bbebdd3 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Fri, 26 Dec 2014 13:27:13 +0200
-Subject: [PATCH 18/19] Shellvars: allow command-specific environment variables
+Subject: [PATCH 19/19] Shellvars: allow command-specific environment variables
 
 ---
- lenses/shellvars.aug            | 4 +++-
+ lenses/shellvars.aug            | 5 +++--
  lenses/tests/test_shellvars.aug | 7 +++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
+ 2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index f7f4c47..3d05da5 100644
+index 5a48f11..5a6d510 100644
 --- a/lenses/shellvars.aug
 +++ b/lenses/shellvars.aug
-@@ -157,7 +157,9 @@ module Shellvars =
+@@ -149,7 +149,8 @@ module Shellvars =
+ 
+   (* Command *)
+   let rec command =
+-       let reserved_key = /exit|shift|return|ulimit|unset|export|source|\.|if|for|select|while|until|then|else|fi|done|case|eval|alias/
++       let env = [ key key_re . eq . store anyquot . Sep.cl_or_space ]
++    in let reserved_key = /exit|shift|return|ulimit|unset|export|source|\.|if|for|select|while|until|then|else|fi|done|case|eval|alias/
+     in let word = /[A-Za-z0-9_.-\/]+/
+     in let entry_eol = entry_eol_nocommand | entry_eol_item command
+     in let entry_noeol = entry_noeol_nocommand | entry_item command
+@@ -157,7 +158,7 @@ module Shellvars =
      in let pipe = action_pipe (entry_eol_item command | entry_item command)
      in let and = action_and entry
      in let or = action_or entry
 -    in Util.indent . label "@command" . store (word - reserved_key)
-+    in Util.indent . label "@command"
-+     . [ key key_re . eq . store anyquot . Sep.space . del /(\\\\\n[ \t]*)?/ "" ]*
-+     . store (word - reserved_key)
-      . [ Sep.space . label "@arg" . sto_to_semicol]?
++    in Util.indent . label "@command" . env* . store (word - reserved_key)
+      . [ Sep.cl_or_space . label "@arg" . sto_to_semicol]?
       . ( pipe | and | or )?
  
 diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 07c392e..29f9e75 100644
+index 544226e..673fc0d 100644
 --- a/lenses/tests/test_shellvars.aug
 +++ b/lenses/tests/test_shellvars.aug
 @@ -672,6 +672,13 @@ test Shellvars.lns get "cat /etc/issue | grep -q \"Debian\" && echo moo || echo
@@ -39,8 +47,8 @@ index 07c392e..29f9e75 100644
 +    { "@arg" = "arg1 arg2" }
 +  }
  
- (* Local Variables: *)
- (* mode: caml       *)
+ (* Wrapped command sequences *)
+ 
 -- 
 2.5.0
 
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index 0f050a77ab..8597aaac45 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=augeas
 pkgver=1.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A configuration editing tool"
 url="http://augeas.net"
 arch="all"
@@ -28,9 +28,9 @@ source="http://download.augeas.net/augeas-$pkgver.tar.gz
 	0014-Shellvars-Allow-almost-any-command.patch
 	0015-Shellvars-support-pipes-in-commands.patch
 	0016-Shellvars-allow-in-commands.patch
-	0017-Shellvars-test-case-for-wrapping-command-arguments.patch
-	0018-Shellvars-allow-command-specific-environment-variabl.patch
-	0019-Shellvars-allow-wrapping-command-sequences.patch"
+	0017-Shellvars-allow-wrapping-command-sequences.patch
+	0018-Shellvars-test-case-for-wrapping-command-arguments.patch
+	0019-Shellvars-allow-command-specific-environment-variabl.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -80,62 +80,62 @@ libs() {
 }
 
 md5sums="a2536a9c3d744dc09d234228fe4b0c93  augeas-1.4.0.tar.gz
-3392ae3abc40efe5d7c8ce4ce5738df8  0001-Shellvars-accept-and-builtins.patch
-aa2f18bd6b439db9345d7492d260d5a7  0002-Shellvars-Add-test-for.patch
-7ed3fd8d6541716cbb63c11db48de9e0  0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
-1420d337f79a9960ed8c6e0d68587f48  0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
-1a233f9d67f0e0c3063e253e3fd3f62b  0005-Shellvars-guard-against-comments.patch
-0ddc164b5e0558b9a8c1e163c5806109  0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
-afb986370fca48ca5d5c16c7b7ef6a3c  0007-Shellvars-allow-quotes-in-loop-conditions.patch
-4fd047af91ebf6400fe34b7f2bae7667  0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
-94c30b3ef837bbc16e4e8daf498ee0c6  0009-Shellvars-add-eval-builtin-support.patch
-3e99adf29c5e4d228b5f7e1993e35ff4  0010-Shellvars-add-alias-builtin-support.patch
-9d6302c8a13dc8d348768b2b00310197  0011-Shellvars-pattern-nodes-in-case-entries.patch
-ba07705f460888555f7a7b7ff28d2136  0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
-a1321510dec7d5ea3f76598b1e673a10  0013-Shellvars-allow-and-constructs-after-condition.patch
-6481d28202a6ed3774f5275c9c23eb28  0014-Shellvars-Allow-almost-any-command.patch
-6370c721ce09c29f2707f37e1cbe1ac5  0015-Shellvars-support-pipes-in-commands.patch
-3ff071044714c89268935589a43d8315  0016-Shellvars-allow-in-commands.patch
-685947f3c076d51fe268585442cee0d3  0017-Shellvars-test-case-for-wrapping-command-arguments.patch
-c27de94c7097126f0ff0d3c72380563a  0018-Shellvars-allow-command-specific-environment-variabl.patch
-a7709c66872d398a1a2688d0fa87e7ef  0019-Shellvars-allow-wrapping-command-sequences.patch"
+ac6a5348b2fb800c759ee1b9d3f208b2  0001-Shellvars-accept-and-builtins.patch
+1b45428c83fb5236e54961716e8efd09  0002-Shellvars-Add-test-for.patch
+0bd5bbdf3f22fabf94a737e807113bcc  0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
+feba0e8c53a50edce3362f4cfc9d3042  0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
+176c8cedfbe43f31aed65b9186ee6ecf  0005-Shellvars-guard-against-comments.patch
+75a620500429bf1b593d09d316de0e03  0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
+3c17d8dfeef14a6ed8d4595ec901a8f4  0007-Shellvars-allow-quotes-in-loop-conditions.patch
+7f5862b88d906bc7432d88d35dec40c7  0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
+c8c7614f2541ded21261de7386eb1583  0009-Shellvars-add-eval-builtin-support.patch
+70754abccd6e363daff6e1ccf9033de8  0010-Shellvars-add-alias-builtin-support.patch
+2ff6fcd174cc94eea1afecb5132eed25  0011-Shellvars-pattern-nodes-in-case-entries.patch
+739e0802c21c3046d33f057f1ffae4d4  0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
+ce58c1557af98c31868aaa046b125652  0013-Shellvars-allow-and-constructs-after-condition.patch
+d66b1b77d7f39a9d211765364e7cfa0f  0014-Shellvars-Allow-almost-any-command.patch
+9800625964610d417118a893c0e5c754  0015-Shellvars-support-pipes-in-commands.patch
+461ac5da32645468623b2cb1f886acae  0016-Shellvars-allow-in-commands.patch
+c3b968af2e2aa423581a564c8107605c  0017-Shellvars-allow-wrapping-command-sequences.patch
+5e31b0f813afc1d5b43f52d34baa9832  0018-Shellvars-test-case-for-wrapping-command-arguments.patch
+59e19136f59c70d6c36025124deb389b  0019-Shellvars-allow-command-specific-environment-variabl.patch"
 sha256sums="659fae7ac229029e60a869a3b88c616cfd51cf2fba286cdfe3af3a052cb35b30  augeas-1.4.0.tar.gz
-646bfcdd6b30f253d50354ba96070018fb3a9f4f123d7a0cfe25b01ec729b176  0001-Shellvars-accept-and-builtins.patch
-8c59fe6a3d3bf1a52a5d110adb1547634c550ce2d318728755fb5ba33ef8c091  0002-Shellvars-Add-test-for.patch
-c6c774342a77f6766e4ceceafe18aeccd05f695da6cfc8b5438e4939d8b8047a  0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
-b84c69a6bc2b9de448c2f7b09b68dbac52b9b55cf81b7fd25d210bee1ad37ae3  0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
-f2d514899a46902534a9c7a87f1074fda2b07c45deaeb0bac270decc7c7364ed  0005-Shellvars-guard-against-comments.patch
-e735f982619ef9a623badd68e316e820d5e98f53dc3fb031fbef1918487a7073  0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
-b41b2fe13eb9155da6ef2e310961009f6bf978e02a628315b5c0347cc19b54f6  0007-Shellvars-allow-quotes-in-loop-conditions.patch
-63da3848ae0202c258e9ea4a5f8392f2b1fd83a1104e08da120ab0f9e50213d6  0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
-f54a4f8c1b64cf405261c9959b40ab598084ab85dc05e5ab18103f17786d120d  0009-Shellvars-add-eval-builtin-support.patch
-fa64fe69036cacb2d4e94a1ac978e4feb2eea44ed520760814486d1890c06bca  0010-Shellvars-add-alias-builtin-support.patch
-063734ec0dc6eefc8435550372e3fed30695c35e68ae9e7406b32e2b4077a0fb  0011-Shellvars-pattern-nodes-in-case-entries.patch
-6df998175ce3063f0ff027ccb931132a8ff3baca25dba2d518dd93a762727375  0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
-a53617eb365e0721f9a2d56863039354b9a90255f94923280c43642b47eed34a  0013-Shellvars-allow-and-constructs-after-condition.patch
-d3e954b69e29a80f1a08968dafd462fa413bbef1cc3755d9676ba7e95cd343aa  0014-Shellvars-Allow-almost-any-command.patch
-714b8a1291eb0619230bb3563a78391abb66d1cbe6918ef23f373388e6374d1c  0015-Shellvars-support-pipes-in-commands.patch
-266543e2988dd630d858a45885160b938c55839119472dff4afe66f656978863  0016-Shellvars-allow-in-commands.patch
-a23f777e4b525e7de038de2234dccc732fb6704eeb5a01d1b7d2c5ec979c50bd  0017-Shellvars-test-case-for-wrapping-command-arguments.patch
-e0ab2fdbcb48e0109e59d57505206f63684143847309166f82c1dd5b7385eba2  0018-Shellvars-allow-command-specific-environment-variabl.patch
-a56ed7f49b4e562a6374783f984273aa505ccf4a7ca05bcc721904f684ead2bd  0019-Shellvars-allow-wrapping-command-sequences.patch"
+590857f339fc3e758624c6854c8686ba19faa7d28bde58d19ffa4513d63d76ed  0001-Shellvars-accept-and-builtins.patch
+4ac77be95a2d98185dd7966acb2b8b8e9af24589d50ba8650862835a9388db27  0002-Shellvars-Add-test-for.patch
+dfb422c7382e18cf79b564c59281839a21233235ee9b55c50b64495dc04123ba  0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
+52107a259ce09eeccd32d79c3ded96ab1a9446bcec21f94fb8604f5793b2e8fd  0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
+47e2289ec139f4583d1b70b98f09af5284bdd8e9ad42b4c1e484e3abe452ab16  0005-Shellvars-guard-against-comments.patch
+a7930d8233d5a0a3151df89ddcbb71b7301347e280e05a6fa6dcc4cc0e8c0fb4  0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
+bd15c33425ab6beaf8f34d9bdea3f1d1db3874bbaf8504ab706572990b1c18e1  0007-Shellvars-allow-quotes-in-loop-conditions.patch
+68a7841925bd93f063c1e6e5d08ac30487b348be9e91cbd2eaf4e7a9f3420814  0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
+4e64c9ed5911ff1023f0c8ba792417eb82eff41b46bd58e36446ec07dd27816b  0009-Shellvars-add-eval-builtin-support.patch
+aa41d90913833a91396310da8f874bc75066e4d7813677a516671bd93546154f  0010-Shellvars-add-alias-builtin-support.patch
+6e31cea68c0e9ca2dad5d506041eb18d3223c16775b72c88dc64871307239b15  0011-Shellvars-pattern-nodes-in-case-entries.patch
+32590f2b9fa6358ee475d922154328fd25d978db406c9a752341c62f4cc1275d  0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
+254a4b1ead8b1ce3c4650b0077d426d607740e37798d9f5311834466cfdb262c  0013-Shellvars-allow-and-constructs-after-condition.patch
+bb2a9460a367040186a858bad95aff355fdb9162488bc453125c28ced1680204  0014-Shellvars-Allow-almost-any-command.patch
+4c4ebfba20f5ecf9adaa0e88b26b3a1ef8cf274d7a1dd2aec39a1efd39ad493d  0015-Shellvars-support-pipes-in-commands.patch
+5a96fe8d5b513014ef77ecb5c64bb6cf27eba560347d498bcda2bc3cc2e4bc56  0016-Shellvars-allow-in-commands.patch
+4191d31076f2751996cdffa5dcc8d3337c7cc197b4e2711c368d9d5f061c27e6  0017-Shellvars-allow-wrapping-command-sequences.patch
+9bd9ab6b1902202748e0f3dc004297e64a14a68dee025b4a3951330bfe13ac6b  0018-Shellvars-test-case-for-wrapping-command-arguments.patch
+bf25ccc9a0bf4cd45f91bfcfa9c6b8dd89f0903c1117d74c8eaf61685173a088  0019-Shellvars-allow-command-specific-environment-variabl.patch"
 sha512sums="182457698e51be89feadb16879bae2f2413a5761127efb63a9b7ef30806f4059bca614e8c9627b0c7a010b9ec9c03c85161e655bdb2902f7cf43e89b66e312db  augeas-1.4.0.tar.gz
-b178c3b36a87d6eb07fed9016385fd8f179564984fb30f6fed7ba7a55ad50fbd100b27f704aa2fb7b95bd4f6d2f66509c8cb7fe57e45ba0a825a2b00992b4a6b  0001-Shellvars-accept-and-builtins.patch
-0ef979edb7e4a7d7a889f8820c63a969bae7a589a2a5bea579ff7f6ed9804e91f542eada786c8c665f8f5a72b343e600dc79e63103d381e7a8e85126c564b871  0002-Shellvars-Add-test-for.patch
-6fd8ccc3a3673f35864ad2187cd80524d02901ff76d8bdfc4e3dfa2fc9d1a56877c0e774945642a42c5fd1b9b756242e1261d1421521dde4f92ee26d1d00c6e9  0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
-65eb4159e67ccfd2dc4afd9ed213061d4edfb286e7325aaf6f898c72b552cb6793c315c03ced32e5ffcba21ce2e40b810c04bdbce9f2fc21ecd184e3885a2e6f  0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
-ae56a3d5eb9ba39b503abbbaf0d4d704afa22014b0f95c0fa1c2410706e975fd2a03c7790314a09667c9fbdba979bc47e0dbf1f8b62afb35666d0ce743dd73c7  0005-Shellvars-guard-against-comments.patch
-c2b635fc45aaf6a585ecdd34408fa231428d812f9d79b2d5e3fe6366fa6a9d4a774731245c6f426f547c767594f4b825e393a669b79b2dffea44a3db6dbfc380  0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
-150b79f481ead8e1c38ecc42af747dfa3906b283fc481f0e81ec08b2569aac2872800128ed1fbed3f9d1d98b7406620298c1f975f0cf29cac545020259f75f0a  0007-Shellvars-allow-quotes-in-loop-conditions.patch
-1c8aceb221767c7f3de26d405764a1122058993ca6e6119508037720ef74a66a9c3637bb1b9e665cada26c782b59083f3f80219f06b0cc38177694b7798e7599  0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
-06b7bd2c5d326dd816b49932af8d5a1ca0d1361188a958ec874b2130f195768a4fad43acc01c2768cfb803fef2199df12e2bc03c34f3263e4678416e41b234ab  0009-Shellvars-add-eval-builtin-support.patch
-3bd5aeae956be4902046e51e4bf5200812c6c09b32e550cc186ed5fdeca4be13ffc515849383fb4d16d074459fce0b7a6accecd6bf86624d9b9f3d982b357197  0010-Shellvars-add-alias-builtin-support.patch
-c3f8e2a42979125bea55b7759eccfd2173f57c9fe91fafe2cac6c6309b15fd6eaebc842550577f0b75665381b39ed10e644b995759ee4f9d8d261a48c1dc7b91  0011-Shellvars-pattern-nodes-in-case-entries.patch
-52655bd119b9813e6b90c27975e30190ee8c1273ff929ae392e522ddc382830dd1e230f10bedaeb535fdf0d89aaafa2cb7d8fbbf8c31923105a19b76e1e8a095  0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
-842d227eabe4ba9571f8d58ec5f936b7ffe6861bada9501f43458627dfe450691eb9589f1d483b83065ba20c5c5e1c571b9081f67f148c4a65474433f32439f8  0013-Shellvars-allow-and-constructs-after-condition.patch
-ba80bbd54e08d0e2ba836334f1b2fddd5b375d4a5cdf2579dbc116297066187220c20d372fcfb4abe3c469c7720a20d877f226fb9215f079ce068c33c53526e5  0014-Shellvars-Allow-almost-any-command.patch
-48aea6e755769969544c6627a0b1993db065dd98e3de07f9d30c8d6caec7aec9fff057c62403bab46dc0551f207879096e58fa4de68683d46685bcb4d96f25a7  0015-Shellvars-support-pipes-in-commands.patch
-43d93a08719f616cb7b4656f9990384be29ca043a2b04cb7e8e6350d0a586402fe7a13d032b32c8e4ca7f04cd48ff15a95b58275ed276fad57e44bd5817dca8f  0016-Shellvars-allow-in-commands.patch
-e46caf1b759e9a402cb27aa4bfa134896fd6816ba2614fa49f407ad8e9fe81b05e4e4fd1e128c8215cf0133aa3dbab000a7c5492c109e85dc23d76b686aa6413  0017-Shellvars-test-case-for-wrapping-command-arguments.patch
-f852015ed1a4bbbca7241f291c6fa6f4bd6fb69ac1c3d62113c2f5bff7e07c4fbc82469ea69f8ac3d5cb905dd95e34e9ed05682d6568173eab1fe933737f5de5  0018-Shellvars-allow-command-specific-environment-variabl.patch
-0b1ef0b3bbd22da7c35140ddb8b6855c33d93fb0f0004804a5acf2be55828434d5a719f6b94e256d4e6585bf0e4857b57f659a8ae557d5ad819fbc5d8b0e4264  0019-Shellvars-allow-wrapping-command-sequences.patch"
+8844c34c2cbf68d605214d0738e2106d5712ddb2e745910bfb99856fb34a2475e9522d68df6e596e2d81423136b1a6a23db9f5f7a0c4dcc43b618017fa493742  0001-Shellvars-accept-and-builtins.patch
+d9178f6f90556b14a4c1295fa9ec0649e0d1ef72bc4431e194ba03b42ef20363d8ea057a209f6a2a278a8b072b56241caa7e5fc574d2c3a01bc4f642f05b8eb4  0002-Shellvars-Add-test-for.patch
+35453cfc3335be2862f83eabcec47b6858977fbead22ec32c920510575af52a1bd73d9c8629ae1d4e3907fddef134c76a5d413252b7252aa227efa3e103473fa  0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
+3ff2da5feba485546e60b31173612b1775fbcc79252c08d4f75dcc7822d7a080a13ab50c01af7a0f0f019a6ce80fe6d2f122dc21b944f9fe908e67e3984c24fd  0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
+461f40d72932191e9b32d2b1e03356768bda84e754a33a57ffc8ca2ee807a93b9290cf6166738d7074c2b8a5b0f7016b105e8f82f51e52afc0ae94df1d632fdc  0005-Shellvars-guard-against-comments.patch
+494639e2049b2dd559e4f1ef174b2ee021df7aa86dd24183da637486475d10d9e7a4ce885da0066c488fc25097871057d506c7de487fd5a67d76cc470de91fa0  0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
+0675b2e8a23866e28c813c80b52d13b7f8fc90020dd63455f74b8739c4019243ecf2e27b5e71fffdee37c1784f4bc611ed15c53c59d02669147767b41ff18259  0007-Shellvars-allow-quotes-in-loop-conditions.patch
+c268d6a45bb3978737431ca97b4b1670db8ca765607fe4c632919e2481258702779205532ee5eba4d14bf9a6b92c4741595d405b42903c8e3e05f937fbf856fe  0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
+8b1a26e6cfd6b8367755657ce66332fa0e9bbb49e00a5e368fd946d4f91507cdb9f371cf1ad7519aeb58728feb87fb91cc6c54be253576483aa6b424fb6d5675  0009-Shellvars-add-eval-builtin-support.patch
+7b3fddde9677ad2c04374bbbc9da660ec07da3a9f7c212d30b20f8850d48f16a5c31faa13500ac3c5823cea56b0a6f73f54b217d2b95f55674ed2c9bc8919532  0010-Shellvars-add-alias-builtin-support.patch
+32b6b65481aa669934f47031e269743d3e4c1dfb5b03d2d8ecffc9b11344b73fed79cddcf3a564dda2645595315714859110b822a0ab4f8a58dcc8d7a72d60b6  0011-Shellvars-pattern-nodes-in-case-entries.patch
+0bc6d17ed05147c3846010cc563c983ddcbdc52b5428896afcde9216cc3c4cd4405d564f5847ff9a27e13a584b40b4c239509adbefcb4ed9d65f43ef6e44a103  0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
+4ac2c7c25a7b61cf4a40f50d1e57e6184ca307b20e06f04c3111ff893e54977ca122206bc0c5d1d7377b322c4ebc7cf81e1de7f70d9a9f9dd6e968832ac7d2dc  0013-Shellvars-allow-and-constructs-after-condition.patch
+8f636ac0c6058309f6eda50e29a91b1ad3efe17eb62f74d2eb2f79ab8a6ebc1d049b078694bb2ee2b4c121d3b05d79661150a9fef84a7002d3d821d11d3af616  0014-Shellvars-Allow-almost-any-command.patch
+2fc5fa8865066c3bece6704c06a257ccbf32e116d780cfb53989e93628de1f486ae236f70a9d447640211b5a7dd1250b1227b0801c6d7966aa9b0bcf540604d4  0015-Shellvars-support-pipes-in-commands.patch
+211339389eea3dce5aaed66db416fade2231c8353ccf4dbb1f9e766a8ac54b5857ca0016783da094daa32e32cd25ffd89b12b6cb3920a1dcaf758913978c088d  0016-Shellvars-allow-in-commands.patch
+48b3172aec95b52b1473fda28a99e43a085844497027adba8b8cd8830da4a7d5bf0a6f6eb3dbbab24d8023a3a24ab0d19f355f5242488821ed8bceb34a0b5bf8  0017-Shellvars-allow-wrapping-command-sequences.patch
+18d986609523ad968b0e006081ad7073a799f40902c880c4a3e4f2478b2792b5568d68e9fa48fed3314c136dac985ae8ea0a4c8d7152c24cbda1b9fb1e097683  0018-Shellvars-test-case-for-wrapping-command-arguments.patch
+8371f154457b3dbb8a95f73cd39cd9bc6bfde03418174561eb09fd04f76bd6ce7215890c68d45d4b9ac5fef4433c2ef79c01910dc3a3818cfb46a3aa1d8b0082  0019-Shellvars-allow-command-specific-environment-variabl.patch"