diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-07-13 15:43:34 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-07-13 15:50:18 +0300 |
| commit | ea3025c253dbfaf405eecd8f2388eda9be556e22 (patch) | |
| tree | c4d369c46a8b0dcd991ab148ba14399fbb910f55 /main/augeas/0005-Shellvars-guard-against-comments.patch | |
| parent | 2da6699882bdacca2069bef0aa1cc4dd4da7f5b8 (diff) | |
| download | aports-ea3025c253dbfaf405eecd8f2388eda9be556e22.tar.bz2 aports-ea3025c253dbfaf405eecd8f2388eda9be556e22.tar.xz | |
main/augeas: align patch set with upstream
01-08: committed to upstream
09-11: GH #265
12: GH #119
13-14: dependency to 12
15: dependency to 09-12
Diffstat (limited to 'main/augeas/0005-Shellvars-guard-against-comments.patch')
| -rw-r--r-- | main/augeas/0005-Shellvars-guard-against-comments.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/main/augeas/0005-Shellvars-guard-against-comments.patch b/main/augeas/0005-Shellvars-guard-against-comments.patch new file mode 100644 index 0000000000..b2f4114386 --- /dev/null +++ b/main/augeas/0005-Shellvars-guard-against-comments.patch @@ -0,0 +1,25 @@ +From e86155aec47840e7cce29a6dbaac5bd21f8d9e3a 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/15] 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.1.0 + |