main/augeas: upgrade to 1.5.0

21 files changed, 5 insertions, 1423 deletions

diff --git a/main/augeas/0001-Shellvars-accept-and-builtins.patch b/main/augeas/0001-Shellvars-accept-and-builtins.patch
deleted file mode 100644
index cc75fd3098..0000000000
--- a/main/augeas/0001-Shellvars-accept-and-builtins.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
-
-Fix GH #188
----
- lenses/shellvars.aug            | 9 +++++++++
- lenses/tests/test_shellvars.aug | 5 +++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index 25bb82b..b988972 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -105,6 +105,13 @@ module Shellvars =
-     . Util.del_str "return"
-     . ( Util.del_ws_spc . store Rx.integer )?
- 
-+  let condition =
-+       let sto_cond = store /[^[#; \t\n][^#;\n]+[^]#; \t\n]|[^[]#; \t\n]+/
-+    in let cond (start:string) (end:string) = [ label "type" . store start ]
-+                                            . Util.del_ws_spc . sto_cond
-+                                            . Util.del_ws_spc . Util.del_str end
-+    in Util.indent . label "@condition" . (cond "[" "]" | cond "[[" "]]")
-+
- 
- (************************************************************************
-  * Group:                 CONDITIONALS AND LOOPS
-@@ -169,6 +176,7 @@ module Shellvars =
-         | entry_eol_item bare_export
-         | entry_eol_item builtin
-         | entry_eol_item return
-+        | entry_eol_item condition
- 
-   let entry_noeol =
-     let entry_item (item:lens) = [ item ] in
-@@ -178,6 +186,7 @@ module Shellvars =
-         | entry_item bare_export
-         | entry_item builtin
-         | entry_item return
-+        | entry_item condition
- 
-   let rec rec_entry =
-     let entry = comment | entry_eol | rec_entry in
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 7a89f11..778a8d2 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -536,6 +536,11 @@ fi\n" =
-   test lns get "var[alpha_beta,gamma]=something\n" =
-     { "var[alpha_beta,gamma]" = "something" }
- 
-+  (* GH #188: support more conditions *)
-+  test Shellvars.lns get "[ -f $FILENAME ]\n" =
-+    { "@condition" = "-f $FILENAME"
-+      { "type" = "[" } }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
diff --git a/main/augeas/0001-add-paths-to-default-filters.patch b/main/augeas/0001-add-paths-to-default-filters.patch
deleted file mode 100644
index 70798f7aa2..0000000000
--- a/main/augeas/0001-add-paths-to-default-filters.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 36a43b066f77cf3ca28fb1c0de5ce0a3f18b3867 Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Sun, 27 Mar 2016 23:16:24 +0300
-Subject: [PATCH] add paths to default filters
-
-additions mostly specific to Alpine Linux directory layout
----
- lenses/cron.aug       | 1 +
- lenses/pg_hba.aug     | 1 +
- lenses/postgresql.aug | 1 +
- lenses/shellvars.aug  | 2 ++
- 4 files changed, 5 insertions(+)
-
-diff --git a/lenses/cron.aug b/lenses/cron.aug
-index 4787814..6dcf4b4 100644
---- a/lenses/cron.aug
-+++ b/lenses/cron.aug
-@@ -145,6 +145,7 @@ let lns = ( empty | comment | shellvar | entry )*
- let filter =
-   incl "/etc/cron.d/*" .
-   incl "/etc/crontab" .
-+  incl "/etc/crontabs/*" .
-   excl "/etc/cron.d/at.allow" .
-   excl "/etc/cron.d/at.deny" .
-   excl "/etc/cron.d/cron.allow" .
-diff --git a/lenses/pg_hba.aug b/lenses/pg_hba.aug
-index f9b7a0e..a9d165d 100644
---- a/lenses/pg_hba.aug
-+++ b/lenses/pg_hba.aug
-@@ -82,6 +82,7 @@ module Pg_Hba =
-         The pg_hba.conf conf file *)
-     let filter = (incl "/var/lib/pgsql/data/pg_hba.conf" .
-                   incl "/var/lib/pgsql/*/data/pg_hba.conf" .
-+                  incl "/var/lib/postgresql/*/data/pg_hba.conf" .
-                   incl "/etc/postgresql/*/*/pg_hba.conf" )
- 
-     (* View: lns
-diff --git a/lenses/postgresql.aug b/lenses/postgresql.aug
-index 5f0470b..4946643 100644
---- a/lenses/postgresql.aug
-+++ b/lenses/postgresql.aug
-@@ -71,6 +71,7 @@ let lns = (Util.empty | Util.comment | entry)*
- (* Variable: filter *)
- let filter = (incl "/var/lib/pgsql/data/postgresql.conf" .
-               incl "/var/lib/pgsql/*/data/postgresql.conf" .
-+              incl "/var/lib/postgresql/*/data/postgresql.conf" .
-               incl "/etc/postgresql/*/*/postgresql.conf" )
- 
- let xfm = transform lns filter
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index 9bc3c9d..03d8fc6 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -289,6 +289,7 @@ module Shellvars =
-                      . excl "/etc/default/rmt"
-                      . excl "/etc/default/whoopsie"
-   let filter_misc    = incl "/etc/arno-iptables-firewall/debconf.cfg"
-+                     . incl "/etc/conf.d/*"
-                      . incl "/etc/cron-apt/config"
-                      . incl "/etc/environment"
-                      . incl "/etc/firewalld/firewalld.conf"
-@@ -298,6 +299,7 @@ module Shellvars =
-                      . incl "/etc/cvs-cron.conf"
-                      . incl "/etc/cvs-pserver.conf"
-                      . incl "/etc/devscripts.conf"
-+                     . incl "/etc/kamailio/kamctlrc"
-                      . incl "/etc/lintianrc"
-                      . incl "/etc/lsb-release"
-                      . incl "/etc/os-release"
--- 
-2.7.4
-
diff --git a/main/augeas/0002-Shellvars-Add-test-for.patch b/main/augeas/0002-Shellvars-Add-test-for.patch
deleted file mode 100644
index ba75e6491a..0000000000
--- a/main/augeas/0002-Shellvars-Add-test-for.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 [[]]
-
----
- lenses/tests/test_shellvars.aug | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 778a8d2..a2d4f28 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -541,6 +541,10 @@ fi\n" =
-     { "@condition" = "-f $FILENAME"
-       { "type" = "[" } }
- 
-+  test Shellvars.lns get "[[ -f $FILENAME ]]\n" =
-+    { "@condition" = "-f $FILENAME"
-+      { "type" = "[[" } }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
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
deleted file mode 100644
index 7b54a81762..0000000000
--- a/main/augeas/0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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
- styles
-
----
- lenses/shellvars.aug            | 8 ++++----
- lenses/tests/test_shellvars.aug | 4 ++++
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index b988972..d25e8ca 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -34,7 +34,7 @@ module Shellvars =
-   let xchgs   = Build.xchgs
-   let semicol = del /;?/ ""
- 
--  let char  = /[^`;() '"\t\n]|\\\\"/
-+  let char  = /[^`;() '"\t\n\\]|\\\\./
-   let dquot =
-        let char = /[^"\\]|\\\\./ | Rx.cl
-     in "\"" . char* . "\""                    (* " Emacs, relax *)
-@@ -45,7 +45,7 @@ module Shellvars =
-   let dollar_assign = /\$\([^\(\)#\n]*\)/
-   let dollar_arithm = /\$\(\([^\)#\n]*\)\)/
- 
--  let anyquot = (dquot|squot)+ | bquot | dbquot | dollar_assign | dollar_arithm
-+  let anyquot = (char|dquot|squot|dollar_assign|dollar_arithm)+ | bquot | dbquot
- 
-   let to_semicol_re = /[^#; \t\n][^#;\n]+[^#; \t\n]|[^#; \t\n]+/
-   let sto_to_semicol = store to_semicol_re
-@@ -60,7 +60,7 @@ module Shellvars =
-   (* arrays here because of typechecking headaches. Instead, they are    *)
-   (* treated as a simple value                                           *)
-   let array =
--    let array_value = store (char+ | anyquot) in
-+    let array_value = store anyquot in
-     del /\([ \t]*/ "(" . counter "values" .
-       [ seq "values" . array_value ] .
-       [ del /[ \t\n]+/ " " . seq "values" . array_value ] *
-@@ -70,7 +70,7 @@ module Shellvars =
-   (* but fairly close.                                                *)
-   let simple_value =
-     let empty_array = /\([ \t]*\)/ in
--      store (char* | anyquot | empty_array)
-+      store (anyquot | empty_array)?
- 
-   let export = [ key "export" . Util.del_ws_spc ]
-   let kv = Util.indent . export? . key key_re
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index a2d4f28..864cb6c 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -399,6 +399,10 @@ esac\n" =
-   test Shellvars.lns get "FOO=``bar``\n" =
-   { "FOO" = "``bar``" }
- 
-+  (* Partial quoting is allowed *)
-+  test Shellvars.lns get "FOO=\"$bar\"/'baz'/$(quux)$((1 + 2))\n" =
-+  { "FOO" = "\"$bar\"/'baz'/$(quux)$((1 + 2))" }
-+
-   (* unset can be used on wildcard variables *)
-   test Shellvars.lns get "unset ${!LC_*}\n" =
-   { "@unset"
--- 
-2.5.0
-
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
deleted file mode 100644
index d1da453f43..0000000000
--- a/main/augeas/0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
- lines
-
----
- lenses/shellvars.aug            | 2 +-
- lenses/tests/test_shellvars.aug | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index d25e8ca..c767067 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -34,7 +34,7 @@ module Shellvars =
-   let xchgs   = Build.xchgs
-   let semicol = del /;?/ ""
- 
--  let char  = /[^`;() '"\t\n\\]|\\\\./
-+  let char  = /[^`;() '"\t\n\\]|\\\\(.|\n)/
-   let dquot =
-        let char = /[^"\\]|\\\\./ | Rx.cl
-     in "\"" . char* . "\""                    (* " Emacs, relax *)
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 864cb6c..065130a 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -549,6 +549,10 @@ fi\n" =
-     { "@condition" = "-f $FILENAME"
-       { "type" = "[[" } }
- 
-+  (* Allow wrapping loop condition to multiple lines *)
-+  test Shellvars.lns get "for x in foo \\\nbar\\\nbaz; do y=$x; done\n" =
-+  { "@for" = "x in foo \\\nbar\\\nbaz" { "y" = "$x" } }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
diff --git a/main/augeas/0005-Shellvars-guard-against-comments.patch b/main/augeas/0005-Shellvars-guard-against-comments.patch
deleted file mode 100644
index 4cc52fe5f8..0000000000
--- a/main/augeas/0005-Shellvars-guard-against-comments.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
----
- lenses/shellvars.aug | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index c767067..78b1d16 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -34,7 +34,7 @@ module Shellvars =
-   let xchgs   = Build.xchgs
-   let semicol = del /;?/ ""
- 
--  let char  = /[^`;() '"\t\n\\]|\\\\(.|\n)/
-+  let char  = /[^`;()'"\n\\# \t]#*|\\\\(.|\n)/
-   let dquot =
-        let char = /[^"\\]|\\\\./ | Rx.cl
-     in "\"" . char* . "\""                    (* " Emacs, relax *)
--- 
-2.5.0
-
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
deleted file mode 100644
index 14e2a20281..0000000000
--- a/main/augeas/0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
- lines
-
----
- lenses/shellvars.aug            | 4 +---
- lenses/tests/test_shellvars.aug | 5 +++++
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index 78b1d16..227e2a3 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -46,9 +46,7 @@ module Shellvars =
-   let dollar_arithm = /\$\(\([^\)#\n]*\)\)/
- 
-   let anyquot = (char|dquot|squot|dollar_assign|dollar_arithm)+ | bquot | dbquot
--
--  let to_semicol_re = /[^#; \t\n][^#;\n]+[^#; \t\n]|[^#; \t\n]+/
--  let sto_to_semicol = store to_semicol_re
-+  let sto_to_semicol = store (anyquot . (Rx.space . anyquot)*)
- 
-   let sto_to_semicol_quot =
-        let no_semicol_re = /[^"'#;\n]/
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 065130a..bf92735 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -165,6 +165,11 @@ unset ONBOOT    #   We do not want this var
-   { "@builtin" = "exit" }
-   { "@builtin" = "exit" { "args" = "2" } }
- 
-+  (* Allow wrapping builtin arguments to multiple lines *)
-+  test Shellvars.lns get "ulimit -c \\\nunlimited\nulimit \\\n -x 123\n" =
-+  { "@builtin" = "ulimit" { "args" = "-c \\\nunlimited" } }
-+  { "@builtin" = "ulimit" { "args" = "\\\n -x 123" } }
-+
-   (* Test semicolons *)
-   test lns get "VAR1=\"this;is;a;test\"\nVAR2=this;\n" =
-   { "VAR1" = "\"this;is;a;test\"" }
--- 
-2.5.0
-
diff --git a/main/augeas/0007-Shellvars-allow-quotes-in-loop-conditions.patch b/main/augeas/0007-Shellvars-allow-quotes-in-loop-conditions.patch
deleted file mode 100644
index 0236806efa..0000000000
--- a/main/augeas/0007-Shellvars-allow-quotes-in-loop-conditions.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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
-
----
- lenses/shellvars.aug            | 8 +-------
- lenses/tests/test_shellvars.aug | 4 ++++
- 2 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index 227e2a3..4dca315 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -48,12 +48,6 @@ module Shellvars =
-   let anyquot = (char|dquot|squot|dollar_assign|dollar_arithm)+ | bquot | dbquot
-   let sto_to_semicol = store (anyquot . (Rx.space . anyquot)*)
- 
--  let sto_to_semicol_quot =
--       let no_semicol_re = /[^"'#;\n]/
--    in let no_semicol_spc_re = /[^"'#; \t\n]/
--    in let multi_chars = no_semicol_spc_re . (no_semicol_re|anyquot)+ . no_semicol_spc_re
--    in store (no_semicol_spc_re | multi_chars)
--
-   (* Array values of the form '(val1 val2 val3)'. We do not handle empty *)
-   (* arrays here because of typechecking headaches. Instead, they are    *)
-   (* treated as a simple value                                           *)
-@@ -118,7 +112,7 @@ module Shellvars =
-   let generic_cond_start (start_kw:string) (lbl:string)
-                          (then_kw:string) (contents:lens) =
-       keyword_label start_kw lbl . Sep.space
--      . sto_to_semicol_quot . semicol_eol
-+      . sto_to_semicol . semicol_eol
-       . keyword then_kw . eol
-       . contents
- 
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index bf92735..6b2210e 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -558,6 +558,10 @@ fi\n" =
-   test Shellvars.lns get "for x in foo \\\nbar\\\nbaz; do y=$x; done\n" =
-   { "@for" = "x in foo \\\nbar\\\nbaz" { "y" = "$x" } }
- 
-+  (* Allow quotes in loop conditions *)
-+  test Shellvars.lns get "for x in \"$@\"; do y=$x; done\n" =
-+  { "@for" = "x in \"$@\"" { "y" = "$x" } }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
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
deleted file mode 100644
index 54559794f7..0000000000
--- a/main/augeas/0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
- lists
-
----
- lenses/shellvars.aug            |  2 +-
- lenses/tests/test_shellvars.aug | 18 ++++++++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index 4dca315..dc6d4f3 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -140,7 +140,7 @@ module Shellvars =
- 
-   let case (entry:lens) (entry_noeol:lens) =
-     let case_entry = [ label "@case_entry"
--                       . Util.indent . store /[^ \t\n\)]+/
-+                       . Util.indent . sto_to_semicol
-                        . Util.del_str ")" . eol
-                        . entry* . entry_noeol?
-                        . Util.indent . Util.del_str ";;" . eol ] in
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 6b2210e..9484754 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -562,6 +562,24 @@ fi\n" =
-   test Shellvars.lns get "for x in \"$@\"; do y=$x; done\n" =
-   { "@for" = "x in \"$@\"" { "y" = "$x" } }
- 
-+  (* case: support quotes and spaces in pattern lists *)
-+  test lns get "case $ARG in
-+        \"foo bar\")
-+           Foo=0
-+           ;;
-+        baz | quux)
-+           Foo=1
-+           ;;
-+esac\n" =
-+    { "@case" = "$ARG"
-+      { "@case_entry" = "\"foo bar\""
-+        { "Foo" = "0" }
-+      }
-+      { "@case_entry" = "baz | quux"
-+        { "Foo" = "1" }
-+      }
-+    }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
diff --git a/main/augeas/0009-Shellvars-add-eval-builtin-support.patch b/main/augeas/0009-Shellvars-add-eval-builtin-support.patch
deleted file mode 100644
index bbe8c7eed8..0000000000
--- a/main/augeas/0009-Shellvars-add-eval-builtin-support.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
-
----
- lenses/shellvars.aug            | 6 ++++++
- lenses/tests/test_shellvars.aug | 4 ++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index dc6d4f3..8735d77 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -83,6 +83,10 @@ module Shellvars =
- 
-   let shell_builtin_cmds = "ulimit" | "shift" | "exit"
- 
-+  let eval =
-+    Util.indent . Util.del_str "eval" . Util.del_ws_spc
-+    . label "@eval" . store anyquot
-+
-   let builtin =
-     Util.indent . label "@builtin"
-     . store shell_builtin_cmds
-@@ -169,6 +173,7 @@ module Shellvars =
-         | entry_eol_item builtin
-         | entry_eol_item return
-         | entry_eol_item condition
-+        | entry_eol_item eval
- 
-   let entry_noeol =
-     let entry_item (item:lens) = [ item ] in
-@@ -179,6 +184,7 @@ module Shellvars =
-         | entry_item builtin
-         | entry_item return
-         | entry_item condition
-+        | entry_item eval
- 
-   let rec rec_entry =
-     let entry = comment | entry_eol | rec_entry in
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 9484754..9d301af 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -580,6 +580,10 @@ esac\n" =
-       }
-     }
- 
-+  (* eval *)
-+  test lns get "eval `dircolors`\n" =
-+    { "@eval" = "`dircolors`" }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
diff --git a/main/augeas/0010-Shellvars-add-alias-builtin-support.patch b/main/augeas/0010-Shellvars-add-alias-builtin-support.patch
deleted file mode 100644
index 70b2f8b2ee..0000000000
--- a/main/augeas/0010-Shellvars-add-alias-builtin-support.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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
-
----
- lenses/shellvars.aug            | 7 +++++++
- lenses/tests/test_shellvars.aug | 4 ++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index 8735d77..f681fcd 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -87,6 +87,11 @@ module Shellvars =
-     Util.indent . Util.del_str "eval" . Util.del_ws_spc
-     . label "@eval" . store anyquot
- 
-+  let alias =
-+    Util.indent . Util.del_str "alias" . Util.del_ws_spc
-+    . label "@alias" . store key_re . eq
-+    . [ label "value" . store anyquot ]
-+
-   let builtin =
-     Util.indent . label "@builtin"
-     . store shell_builtin_cmds
-@@ -174,6 +179,7 @@ module Shellvars =
-         | entry_eol_item return
-         | entry_eol_item condition
-         | entry_eol_item eval
-+        | entry_eol_item alias
- 
-   let entry_noeol =
-     let entry_item (item:lens) = [ item ] in
-@@ -185,6 +191,7 @@ module Shellvars =
-         | entry_item return
-         | entry_item condition
-         | entry_item eval
-+        | entry_item alias
- 
-   let rec rec_entry =
-     let entry = comment | entry_eol | rec_entry in
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 9d301af..26aec25 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -584,6 +584,10 @@ esac\n" =
-   test lns get "eval `dircolors`\n" =
-     { "@eval" = "`dircolors`" }
- 
-+  (* alias *)
-+  test lns get "alias ls='ls $LS_OPTIONS'\n" =
-+    { "@alias" = "ls" { "value" = "'ls $LS_OPTIONS'" } }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
diff --git a/main/augeas/0011-Shellvars-pattern-nodes-in-case-entries.patch b/main/augeas/0011-Shellvars-pattern-nodes-in-case-entries.patch
deleted file mode 100644
index eb4c4efeb1..0000000000
--- a/main/augeas/0011-Shellvars-pattern-nodes-in-case-entries.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-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
-
-Breaking change: case entry values are now in a @pattern subnode.
----
- lenses/shellvars.aug            | 10 +++++----
- lenses/tests/test_shellvars.aug | 48 +++++++++++++++++++++++++++--------------
- 2 files changed, 38 insertions(+), 20 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index f681fcd..ed9cc9c 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -34,12 +34,12 @@ module Shellvars =
-   let xchgs   = Build.xchgs
-   let semicol = del /;?/ ""
- 
--  let char  = /[^`;()'"\n\\# \t]#*|\\\\(.|\n)/
-+  let char  = /[^`;()'"|\n\\# \t]#*|\\\\(.|\n)/
-   let dquot =
-        let char = /[^"\\]|\\\\./ | Rx.cl
-     in "\"" . char* . "\""                    (* " Emacs, relax *)
-   let squot = /'[^']*'/
--  let bquot = /`[^`\n]*`/
-+  let bquot = /`[^`\n]+`/
-   (* dbquot don't take spaces or semi-colons *)
-   let dbquot = /``[^` \t\n;]+``/
-   let dollar_assign = /\$\([^\(\)#\n]*\)/
-@@ -148,8 +148,10 @@ module Shellvars =
-     generic_cond "select" "@select" "do" entry+ "done"
- 
-   let case (entry:lens) (entry_noeol:lens) =
--    let case_entry = [ label "@case_entry"
--                       . Util.indent . sto_to_semicol
-+       let pattern = [ label "@pattern" . sto_to_semicol . Sep.opt_space ]
-+    in let case_entry = [ label "@case_entry"
-+                       . Util.indent . pattern
-+                       . (Util.del_str "|" . Sep.opt_space . pattern)*
-                        . Util.del_str ")" . eol
-                        . entry* . entry_noeol?
-                        . Util.indent . Util.del_str ";;" . eol ] in
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 26aec25..d07918d 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -261,11 +261,14 @@ done\n" =
-     ;;
- esac\n" =
-   { "@case" = "$f"
--    { "@case_entry" = "/tmp/file1"
-+    { "@case_entry"
-+      { "@pattern" = "/tmp/file1" }
-       { ".source" = "/tmp/file1" } }
--    { "@case_entry" = "/tmp/file2"
-+    { "@case_entry"
-+      { "@pattern" = "/tmp/file2" }
-       { ".source" = "/tmp/file2" } }
--    { "@case_entry" = "*"
-+    { "@case_entry"
-+      { "@pattern" = "*" }
-       { "@unset"
-         { "1" = "f" } } } }
- 
-@@ -308,7 +311,8 @@ esac\n" =
- 
-   esac\n" =
-   { "@case" = "$f"
--    { "@case_entry" = "a"
-+    { "@case_entry"
-+      { "@pattern" = "a" }
-       { "B" = "C" } }
-     }
- 
-@@ -325,9 +329,11 @@ esac\n" =
-     ;;
-   esac\n" =
-   { "@case" = "$f"
--    { "@case_entry" = "a"
-+    { "@case_entry"
-+      { "@pattern" = "a" }
-       { "B" = "C" } }
--    { "@case_entry" = "b"
-+    { "@case_entry"
-+      { "@pattern" = "b" }
-       { "A" = "D" } } }
- 
- 
-@@ -348,11 +354,13 @@ unset f
- esac\n" =
-   { "@case" = "${INTERFACE}"
-     { "#comment" = "comment before" }
--    { "@case_entry" = "eth0"
-+    { "@case_entry"
-+      { "@pattern" = "eth0" }
-       { "#comment" = "comment in" }
-       { "OPTIONS" = "()" } }
-     { "#comment" = "comment before 2" }
--    { "@case_entry" = "*"
-+    { "@case_entry"
-+      { "@pattern" = "*" }
-       { "#comment" = "comment in 2" }
-       { "@unset"
-         { "1" = "f" } } }
-@@ -364,7 +372,7 @@ esac\n" =
-   ;;
-   esac\n" =
-   { "@case" = "$a"
--    { "@case_entry" = "*" } }
-+    { "@case_entry" { "@pattern" = "*" } } }
- 
-   (* case variables can be surrounded by double quotes *)
-   test Shellvars.lns get "case \"${options}\" in
-@@ -373,7 +381,8 @@ esac\n" =
-   ;;
- esac\n" =
-   { "@case" = "\"${options}\""
--    { "@case_entry" = "*debug*"
-+    { "@case_entry"
-+      { "@pattern" = "*debug*" }
-       { "@builtin" = "shift" } } }
- 
-   (* Double quoted values can have newlines *)
-@@ -473,9 +482,11 @@ test2\"\n" =
-         1) TestVar=\"test1\" ;;
- esac\n" =
-     { "@case" = "$ARG"
--      { "@case_entry" = "0"
-+      { "@case_entry"
-+        { "@pattern" = "0" }
-         { "TestVar" = "\"test0\"" } }
--      { "@case_entry" = "1"
-+      { "@case_entry"
-+        { "@pattern" = "1" }
-         { "TestVar" = "\"test1\"" } } }
- 
-   (* case: support ;; on the same line with multiple commands *)
-@@ -486,11 +497,13 @@ esac\n" =
- 	   Bar=3; Baz=4;;
- esac\n" =
-     { "@case" = "$ARG"
--      { "@case_entry" = "0"
-+      { "@case_entry"
-+        { "@pattern" = "0" }
-         { "Foo" = "0" }
-         { "Bar" = "1" }
-       }
--      { "@case_entry" = "1"
-+      { "@case_entry"
-+        { "@pattern" = "1" }
-         { "Foo" = "2" }
-         { "Bar" = "3" }
-         { "Baz" = "4" }
-@@ -572,10 +585,13 @@ fi\n" =
-            ;;
- esac\n" =
-     { "@case" = "$ARG"
--      { "@case_entry" = "\"foo bar\""
-+      { "@case_entry"
-+        { "@pattern" = "\"foo bar\"" }
-         { "Foo" = "0" }
-       }
--      { "@case_entry" = "baz | quux"
-+      { "@case_entry"
-+        { "@pattern" = "baz" }
-+        { "@pattern" = "quux" }
-         { "Foo" = "1" }
-       }
-     }
--- 
-2.5.0
-
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
deleted file mode 100644
index 931c1324a6..0000000000
--- a/main/augeas/0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-
----
- lenses/shellvars.aug | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index ed9cc9c..0384a6f 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -107,9 +107,8 @@ module Shellvars =
-     . ( Util.del_ws_spc . store Rx.integer )?
- 
-   let condition =
--       let sto_cond = store /[^[#; \t\n][^#;\n]+[^]#; \t\n]|[^[]#; \t\n]+/
--    in let cond (start:string) (end:string) = [ label "type" . store start ]
--                                            . Util.del_ws_spc . sto_cond
-+       let cond (start:string) (end:string) = [ label "type" . store start ]
-+                                            . Util.del_ws_spc . sto_to_semicol
-                                             . Util.del_ws_spc . Util.del_str end
-     in Util.indent . label "@condition" . (cond "[" "]" | cond "[[" "]]")
- 
--- 
-2.5.0
-
diff --git a/main/augeas/0013-Shellvars-allow-and-constructs-after-condition.patch b/main/augeas/0013-Shellvars-allow-and-constructs-after-condition.patch
deleted file mode 100644
index 62ba0348c1..0000000000
--- a/main/augeas/0013-Shellvars-allow-and-constructs-after-condition.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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
-
----
- lenses/shellvars.aug            | 8 ++++++--
- lenses/tests/test_shellvars.aug | 8 ++++++++
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index 0384a6f..c47f566 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -34,7 +34,7 @@ module Shellvars =
-   let xchgs   = Build.xchgs
-   let semicol = del /;?/ ""
- 
--  let char  = /[^`;()'"|\n\\# \t]#*|\\\\(.|\n)/
-+  let char  = /[^`;()'"&|\n\\# \t]#*|\\\\(.|\n)/
-   let dquot =
-        let char = /[^"\\]|\\\\./ | Rx.cl
-     in "\"" . char* . "\""                    (* " Emacs, relax *)
-@@ -107,9 +107,13 @@ module Shellvars =
-     . ( Util.del_ws_spc . store Rx.integer )?
- 
-   let condition =
--       let cond (start:string) (end:string) = [ label "type" . store start ]
-+       let action (operator:string) (lbl:string) =
-+         [ Sep.opt_space . Util.del_str operator . Sep.opt_space
-+         . label lbl . sto_to_semicol ]
-+    in let cond (start:string) (end:string) = [ label "type" . store start ]
-                                             . Util.del_ws_spc . sto_to_semicol
-                                             . Util.del_ws_spc . Util.del_str end
-+                                            . ( action "&&" "@and" | action "||" "@or" )*
-     in Util.indent . label "@condition" . (cond "[" "]" | cond "[[" "]]")
- 
- 
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index d07918d..0f27a73 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -604,6 +604,14 @@ esac\n" =
-   test lns get "alias ls='ls $LS_OPTIONS'\n" =
-     { "@alias" = "ls" { "value" = "'ls $LS_OPTIONS'" } }
- 
-+  (* Allow && and || constructs after condition *)
-+  test Shellvars.lns get "[ -f $FILENAME ] && do this || or that\n" =
-+  { "@condition" = "-f $FILENAME"
-+    { "type" = "[" }
-+    { "@and" = "do this" }
-+    { "@or" = "or that" }
-+  }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
diff --git a/main/augeas/0014-Shellvars-Allow-almost-any-command.patch b/main/augeas/0014-Shellvars-Allow-almost-any-command.patch
deleted file mode 100644
index e5aec91949..0000000000
--- a/main/augeas/0014-Shellvars-Allow-almost-any-command.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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
-
-    Note: this may have edge effects in recursive sublenses
-          that augparse cannot check.
----
- lenses/shellvars.aug            |  7 +++++++
- lenses/tests/test_shellvars.aug | 12 +++++++++++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index c47f566..f9e03ff 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -116,6 +116,11 @@ module Shellvars =
-                                             . ( action "&&" "@and" | action "||" "@or" )*
-     in Util.indent . label "@condition" . (cond "[" "]" | cond "[[" "]]")
- 
-+  let command =
-+       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 Util.indent . label "@command" . store (word - reserved_key)
-+     . [ Sep.space . label "@arg" . sto_to_semicol]?
- 
- (************************************************************************
-  * Group:                 CONDITIONALS AND LOOPS
-@@ -185,6 +190,7 @@ module Shellvars =
-         | entry_eol_item condition
-         | entry_eol_item eval
-         | entry_eol_item alias
-+        | entry_eol_item command
- 
-   let entry_noeol =
-     let entry_item (item:lens) = [ item ] in
-@@ -197,6 +203,7 @@ module Shellvars =
-         | entry_item condition
-         | entry_item eval
-         | entry_item alias
-+        | entry_item command
- 
-   let rec rec_entry =
-     let entry = comment | entry_eol | rec_entry in
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index 0f27a73..f065ce4 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -609,7 +609,17 @@ esac\n" =
-   { "@condition" = "-f $FILENAME"
-     { "type" = "[" }
-     { "@and" = "do this" }
--    { "@or" = "or that" }
-+    { "@or" = "or that" } }
-+
-+(* Test: Shellvars.lns
-+     Parse (almost) any command *)
-+test Shellvars.lns get "echo foobar 'and this is baz'
-+/usr/local/bin/myscript.sh with args\n" =
-+  { "@command" = "echo"
-+    { "@arg" = "foobar 'and this is baz'" }
-+  }
-+  { "@command" = "/usr/local/bin/myscript.sh"
-+    { "@arg" = "with args" }
-   }
- 
- (* Local Variables: *)
--- 
-2.5.0
-
diff --git a/main/augeas/0015-Shellvars-support-pipes-in-commands.patch b/main/augeas/0015-Shellvars-support-pipes-in-commands.patch
deleted file mode 100644
index ec51ebc0cf..0000000000
--- a/main/augeas/0015-Shellvars-support-pipes-in-commands.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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
-
----
- lenses/shellvars.aug            | 12 ++++++++----
- lenses/tests/test_shellvars.aug |  8 ++++++++
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index f9e03ff..f68f5bb 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -116,11 +116,18 @@ module Shellvars =
-                                             . ( action "&&" "@and" | action "||" "@or" )*
-     in Util.indent . label "@condition" . (cond "[" "]" | cond "[[" "]]")
- 
--  let command =
-+  (* Entry types *)
-+  let entry_eol_item (item:lens) = [ item . comment_or_eol ]
-+  let entry_item (item:lens) = [ item ]
-+
-+  (* 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/
-     in let word = /[A-Za-z0-9_.-\/]+/
-+    in let pipe = del /[ \t]*\|[ \t]*/ " | "
-     in Util.indent . label "@command" . store (word - reserved_key)
-      . [ Sep.space . label "@arg" . sto_to_semicol]?
-+     . (pipe . (entry_eol_item command | entry_item command) )*
- 
- (************************************************************************
-  * Group:                 CONDITIONALS AND LOOPS
-@@ -179,8 +186,6 @@ module Shellvars =
-       . Util.indent . Util.del_str "}" . eol ]
- 
-   let entry_eol =
--    let entry_eol_item (item:lens) =
--      [ item . comment_or_eol ] in
-       entry_eol_item source
-         | entry_eol_item kv
-         | entry_eol_item unset
-@@ -193,7 +198,6 @@ module Shellvars =
-         | entry_eol_item command
- 
-   let entry_noeol =
--    let entry_item (item:lens) = [ item ] in
-       entry_item source
-         | entry_item kv
-         | entry_item unset
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index f065ce4..e0bf7fb 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -622,6 +622,14 @@ test Shellvars.lns get "echo foobar 'and this is baz'
-     { "@arg" = "with args" }
-   }
- 
-+(* Test: Shellvars.lns
-+     Support pipes in commands *)
-+test Shellvars.lns get "echo \"$STRING\" | grep foo\n" =
-+  { "@command" = "echo"
-+    { "@arg" = "\"$STRING\"" }
-+    { "@command" = "grep"
-+      { "@arg" = "foo" } } }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
diff --git a/main/augeas/0016-Shellvars-allow-in-commands.patch b/main/augeas/0016-Shellvars-allow-in-commands.patch
deleted file mode 100644
index f88c3cce2a..0000000000
--- a/main/augeas/0016-Shellvars-allow-in-commands.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-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
-
----
- lenses/shellvars.aug            | 80 ++++++++++++++++++++++++-----------------
- lenses/tests/test_shellvars.aug | 42 ++++++++++++++++++++--
- 2 files changed, 87 insertions(+), 35 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index f68f5bb..f7f4c47 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -106,28 +106,66 @@ module Shellvars =
-     . Util.del_str "return"
-     . ( Util.del_ws_spc . store Rx.integer )?
- 
-+  let action (operator:string) (lbl:string) (sto:lens) =
-+    [ del (Rx.opt_space . operator . Rx.opt_space) (" " . operator . " ")
-+    . label ("@".lbl) . sto ]
-+
-+  let action_pipe = action "|" "pipe"
-+  let action_and = action "&&" "and"
-+  let action_or = action "||" "or"
-+
-   let condition =
--       let action (operator:string) (lbl:string) =
--         [ Sep.opt_space . Util.del_str operator . Sep.opt_space
--         . label lbl . sto_to_semicol ]
--    in let cond (start:string) (end:string) = [ label "type" . store start ]
--                                            . Util.del_ws_spc . sto_to_semicol
--                                            . Util.del_ws_spc . Util.del_str end
--                                            . ( action "&&" "@and" | action "||" "@or" )*
-+    let cond (start:string) (end:string) = [ label "type" . store start ]
-+                                         . Util.del_ws_spc . sto_to_semicol
-+                                         . Util.del_ws_spc . Util.del_str end
-+                                         . ( action_and sto_to_semicol | action_or sto_to_semicol )*
-     in Util.indent . label "@condition" . (cond "[" "]" | cond "[[" "]]")
- 
-   (* Entry types *)
-   let entry_eol_item (item:lens) = [ item . comment_or_eol ]
-   let entry_item (item:lens) = [ item ]
- 
-+  let entry_eol_nocommand =
-+      entry_eol_item source
-+        | entry_eol_item kv
-+        | entry_eol_item unset
-+        | entry_eol_item bare_export
-+        | entry_eol_item builtin
-+        | entry_eol_item return
-+        | entry_eol_item condition
-+        | entry_eol_item eval
-+        | entry_eol_item alias
-+
-+  let entry_noeol_nocommand =
-+      entry_item source
-+        | entry_item kv
-+        | entry_item unset
-+        | entry_item bare_export
-+        | entry_item builtin
-+        | entry_item return
-+        | entry_item condition
-+        | entry_item eval
-+        | entry_item alias
-+
-   (* 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/
-     in let word = /[A-Za-z0-9_.-\/]+/
--    in let pipe = del /[ \t]*\|[ \t]*/ " | "
-+    in let entry_eol = entry_eol_nocommand | entry_eol_item command
-+    in let entry_noeol = entry_noeol_nocommand | entry_item command
-+    in let entry = entry_eol | entry_noeol
-+    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)
-      . [ Sep.space . label "@arg" . sto_to_semicol]?
--     . (pipe . (entry_eol_item command | entry_item command) )*
-+     . ( pipe | and | or )?
-+
-+  let entry_eol = entry_eol_nocommand
-+                | entry_eol_item command
-+
-+  let entry_noeol = entry_noeol_nocommand
-+                  | entry_item command
- 
- (************************************************************************
-  * Group:                 CONDITIONALS AND LOOPS
-@@ -185,30 +223,6 @@ module Shellvars =
-       . entry+
-       . Util.indent . Util.del_str "}" . eol ]
- 
--  let entry_eol =
--      entry_eol_item source
--        | entry_eol_item kv
--        | entry_eol_item unset
--        | entry_eol_item bare_export
--        | entry_eol_item builtin
--        | entry_eol_item return
--        | entry_eol_item condition
--        | entry_eol_item eval
--        | entry_eol_item alias
--        | entry_eol_item command
--
--  let entry_noeol =
--      entry_item source
--        | entry_item kv
--        | entry_item unset
--        | entry_item bare_export
--        | entry_item builtin
--        | entry_item return
--        | entry_item condition
--        | entry_item eval
--        | entry_item alias
--        | entry_item command
--
-   let rec rec_entry =
-     let entry = comment | entry_eol | rec_entry in
-         cond_if entry
-diff --git a/lenses/tests/test_shellvars.aug b/lenses/tests/test_shellvars.aug
-index e0bf7fb..2c810cb 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -627,8 +627,46 @@ test Shellvars.lns get "echo foobar 'and this is baz'
- test Shellvars.lns get "echo \"$STRING\" | grep foo\n" =
-   { "@command" = "echo"
-     { "@arg" = "\"$STRING\"" }
--    { "@command" = "grep"
--      { "@arg" = "foo" } } }
-+    { "@pipe"
-+      { "@command" = "grep"
-+        { "@arg" = "foo" } } } }
-+
-+(* Test: Shellvars.lns
-+     Support && and || after command
-+     GH #215 *)
-+test Shellvars.lns get "grep -q \"Debian\" /etc/issue && echo moo\n" =
-+  { "@command" = "grep"
-+    { "@arg" = "-q \"Debian\" /etc/issue" }
-+    { "@and"
-+      { "@command" = "echo"
-+        { "@arg" = "moo" } } } }
-+
-+test Shellvars.lns get "grep -q \"Debian\" /etc/issue || echo baa\n" =
-+  { "@command" = "grep"
-+    { "@arg" = "-q \"Debian\" /etc/issue" }
-+    { "@or"
-+      { "@command" = "echo"
-+        { "@arg" = "baa" } } } }
-+
-+test Shellvars.lns get "grep -q \"Debian\" /etc/issue && DEBIAN=1\n" =
-+  { "@command" = "grep"
-+    { "@arg" = "-q \"Debian\" /etc/issue" }
-+    { "@and"
-+      { "DEBIAN" = "1" } } }
-+
-+test Shellvars.lns get "cat /etc/issue | grep -q \"Debian\" && echo moo || echo baa\n" =
-+  { "@command" = "cat"
-+    { "@arg" = "/etc/issue" }
-+    { "@pipe"
-+      { "@command" = "grep"
-+        { "@arg" = "-q \"Debian\"" }
-+        { "@and"
-+          { "@command" = "echo"
-+            { "@arg" = "moo" }
-+            { "@or"
-+              { "@command" = "echo"
-+                { "@arg" = "baa" } } } } } } } }
-+
- 
- (* Local Variables: *)
- (* mode: caml       *)
--- 
-2.5.0
-
diff --git a/main/augeas/0017-Shellvars-allow-wrapping-command-sequences.patch b/main/augeas/0017-Shellvars-allow-wrapping-command-sequences.patch
deleted file mode 100644
index 1d40cde649..0000000000
--- a/main/augeas/0017-Shellvars-allow-wrapping-command-sequences.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-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 17/19] Shellvars: allow wrapping command sequences
-
----
- lenses/shellvars.aug            | 10 +++++-----
- lenses/tests/test_shellvars.aug | 14 +++++++++++++-
- 2 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index f7f4c47..5a48f11 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -34,7 +34,7 @@ module Shellvars =
-   let xchgs   = Build.xchgs
-   let semicol = del /;?/ ""
- 
--  let char  = /[^`;()'"&|\n\\# \t]#*|\\\\(.|\n)/
-+  let char  = /[^`;()'"&|\n\\# \t]#*|\\\\./
-   let dquot =
-        let char = /[^"\\]|\\\\./ | Rx.cl
-     in "\"" . char* . "\""                    (* " Emacs, relax *)
-@@ -46,7 +46,7 @@ module Shellvars =
-   let dollar_arithm = /\$\(\([^\)#\n]*\)\)/
- 
-   let anyquot = (char|dquot|squot|dollar_assign|dollar_arithm)+ | bquot | dbquot
--  let sto_to_semicol = store (anyquot . (Rx.space . anyquot)*)
-+  let sto_to_semicol = store (anyquot . (Rx.cl_or_space . anyquot)*)
- 
-   (* Array values of the form '(val1 val2 val3)'. We do not handle empty *)
-   (* arrays here because of typechecking headaches. Instead, they are    *)
-@@ -95,7 +95,7 @@ module Shellvars =
-   let builtin =
-     Util.indent . label "@builtin"
-     . store shell_builtin_cmds
--    . (Util.del_ws_spc
-+    . (Sep.cl_or_space
-     . [ label "args" . sto_to_semicol ])?
- 
-   let keyword (kw:string) = Util.indent . Util.del_str kw
-@@ -107,7 +107,7 @@ module Shellvars =
-     . ( Util.del_ws_spc . store Rx.integer )?
- 
-   let action (operator:string) (lbl:string) (sto:lens) =
--    [ del (Rx.opt_space . operator . Rx.opt_space) (" " . operator . " ")
-+    [ del (Rx.cl_or_opt_space . operator . Rx.cl_or_opt_space) (" " . operator . " ")
-     . label ("@".lbl) . sto ]
- 
-   let action_pipe = action "|" "pipe"
-@@ -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 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
-   (* Allow wrapping builtin arguments to multiple lines *)
-   test Shellvars.lns get "ulimit -c \\\nunlimited\nulimit \\\n -x 123\n" =
-   { "@builtin" = "ulimit" { "args" = "-c \\\nunlimited" } }
--  { "@builtin" = "ulimit" { "args" = "\\\n -x 123" } }
-+  { "@builtin" = "ulimit" { "args" = "-x 123" } }
- 
-   (* Test semicolons *)
-   test lns get "VAR1=\"this;is;a;test\"\nVAR2=this;\n" =
-@@ -668,6 +668,18 @@ test Shellvars.lns get "cat /etc/issue | grep -q \"Debian\" && echo moo || echo
-                 { "@arg" = "baa" } } } } } } } }
- 
- 
-+(* Wrapped command sequences *)
-+
-+test Shellvars.lns get "foo && \\\nbar baz \\\n|| qux \\\n    quux\\\ncorge  grault\n" =
-+  { "@command" = "foo"
-+    { "@and"
-+      { "@command" = "bar"
-+        { "@arg" = "baz" }
-+	{ "@or" { "@command" = "qux" { "@arg" = "quux\\\ncorge  grault" } } }
-+      }
-+    }
-+  }
-+
- (* Local Variables: *)
- (* mode: caml       *)
- (* End:             *)
--- 
-2.5.0
-
diff --git a/main/augeas/0018-Shellvars-test-case-for-wrapping-command-arguments.patch b/main/augeas/0018-Shellvars-test-case-for-wrapping-command-arguments.patch
deleted file mode 100644
index c3b4a21994..0000000000
--- a/main/augeas/0018-Shellvars-test-case-for-wrapping-command-arguments.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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 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 9a1878c..544226e 100644
---- a/lenses/tests/test_shellvars.aug
-+++ b/lenses/tests/test_shellvars.aug
-@@ -614,13 +614,18 @@ esac\n" =
- (* Test: Shellvars.lns
-      Parse (almost) any command *)
- test Shellvars.lns get "echo foobar 'and this is baz'
--/usr/local/bin/myscript.sh with args\n" =
-+/usr/local/bin/myscript.sh with args
-+echo foo \
-+bar\n" =
-   { "@command" = "echo"
-     { "@arg" = "foobar 'and this is baz'" }
-   }
-   { "@command" = "/usr/local/bin/myscript.sh"
-     { "@arg" = "with args" }
-   }
-+  { "@command" = "echo"
-+    { "@arg" = "foo \\\nbar" }
-+  }
- 
- (* Test: Shellvars.lns
-      Support pipes in commands *)
--- 
-2.5.0
-
diff --git a/main/augeas/0019-Shellvars-allow-command-specific-environment-variabl.patch b/main/augeas/0019-Shellvars-allow-command-specific-environment-variabl.patch
deleted file mode 100644
index cec27064e1..0000000000
--- a/main/augeas/0019-Shellvars-allow-command-specific-environment-variabl.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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 19/19] Shellvars: allow command-specific environment variables
-
----
- lenses/shellvars.aug            | 5 +++--
- lenses/tests/test_shellvars.aug | 7 +++++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
-index 5a48f11..5a6d510 100644
---- a/lenses/shellvars.aug
-+++ b/lenses/shellvars.aug
-@@ -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" . 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 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
-               { "@command" = "echo"
-                 { "@arg" = "baa" } } } } } } } }
- 
-+(* Command-specific environment variables *)
-+test Shellvars.lns get "abc=def \\\n  ghi=\"jkl mno\" command arg1 arg2\n" =
-+  { "@command" = "command"
-+    { "abc" = "def" }
-+    { "ghi" = "\"jkl mno\"" }
-+    { "@arg" = "arg1 arg2" }
-+  }
- 
- (* Wrapped command sequences *)
- 
--- 
-2.5.0
-
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index 7207445d5b..e4b58c40d7 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=5
+pkgver=1.5.0
+pkgrel=0
 pkgdesc="A configuration editing tool"
 url="http://augeas.net"
 arch="all"
@@ -12,26 +12,6 @@ makedepends="$depends_dev readline-dev libxml2-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tests $pkgname-libs"
 source="http://download.augeas.net/augeas-$pkgver.tar.gz
-	0001-Shellvars-accept-and-builtins.patch
-	0002-Shellvars-Add-test-for.patch
-	0003-Shellvars-allow-partial-quoting-mixing-multiple-styl.patch
-	0004-Shellvars-allow-wrapping-loop-condition-to-multiple-.patch
-	0005-Shellvars-guard-against-comments.patch
-	0006-Shellvars-allow-wrapping-builtin-arguments-to-multip.patch
-	0007-Shellvars-allow-quotes-in-loop-conditions.patch
-	0008-Shellvars-case-support-quotes-and-spaces-in-pattern-.patch
-	0009-Shellvars-add-eval-builtin-support.patch
-	0010-Shellvars-add-alias-builtin-support.patch
-	0011-Shellvars-pattern-nodes-in-case-entries.patch
-	0012-Shellvars-use-sto_to_semicol-in-condition-lens.patch
-	0013-Shellvars-allow-and-constructs-after-condition.patch
-	0014-Shellvars-Allow-almost-any-command.patch
-	0015-Shellvars-support-pipes-in-commands.patch
-	0016-Shellvars-allow-in-commands.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
-	0001-add-paths-to-default-filters.patch
 	acf.aug"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -82,69 +62,9 @@ libs() {
 		"$subpkgdir"/usr/share/augeas/ || return 1
 }
 
-md5sums="a2536a9c3d744dc09d234228fe4b0c93  augeas-1.4.0.tar.gz
-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
-92a6ba9caecffb39c24c7e66bee1febe  0001-add-paths-to-default-filters.patch
+md5sums="01190e455c513124a2dae29a1182c113  augeas-1.5.0.tar.gz
 b1b8d849f0125e1124af92b9925f735e  acf.aug"
-sha256sums="659fae7ac229029e60a869a3b88c616cfd51cf2fba286cdfe3af3a052cb35b30  augeas-1.4.0.tar.gz
-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
-6cf4ae639cb16aa387781af50249bc707e300eb9d3d3dc6d8212122b3a0c70a4  0001-add-paths-to-default-filters.patch
+sha256sums="223bb6e6fe3e9e92277dafd5d34e623733eb969a72a382998d204feab253f73f  augeas-1.5.0.tar.gz
 e3b4e75119c7939d92c91f3f6c6a553a90923572f9c2e387b2b745470ad6dba4  acf.aug"
-sha512sums="182457698e51be89feadb16879bae2f2413a5761127efb63a9b7ef30806f4059bca614e8c9627b0c7a010b9ec9c03c85161e655bdb2902f7cf43e89b66e312db  augeas-1.4.0.tar.gz
-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
-2c33b2f6661e950220fa8a15c4c45f0c83dfd453919a17cf27fec02577679fab7349c88e242fb65c11fcb159f19d72242aaaf87ea457b9fe674299d05b7dc73d  0001-add-paths-to-default-filters.patch
+sha512sums="4683668c6562e14cd39bda69f2fa7f6db5f5a76386521a9b10c41fa2031c10ff158f682b56066d0525554c4229677c64e92f6453f75d185d367bc7481fc10695  augeas-1.5.0.tar.gz
 74d728abdf4d3eebdeb3823c1d2588c214fd52734c8855fe3ddbfb6465d31c88d093df356e42effdd3dbdff1a62c52894c7aa840bd6ea8df4995c4f3aa53e919  acf.aug"