diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-17 22:49:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-17 22:49:47 +0100 |
| commit | 30c53e395853f5bfe805a1e429fcf26666eed8f8 (patch) | |
| tree | a0670eaf9babda7b83503f7d36806a944bb49752 /app-shells/dash | |
| parent | d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (diff) | |
gentoo resync : 17.05.2018
Diffstat (limited to 'app-shells/dash')
| -rw-r--r-- | app-shells/dash/Manifest | 2 | ||||
| -rw-r--r-- | app-shells/dash/files/dash-0.5.10.1-parser.patch | 37 |
2 files changed, 31 insertions, 8 deletions
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index fd6d4fe0bed2..96395c3682f4 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,5 +1,5 @@ AUX dash-0.5.10-dumb-echo.patch 2612 BLAKE2B dd5fef2307ebc988b01f558373a5fb2be6bfa4e4d3abd72b179ce3d06a326769c5843416324971d00f363db92bcc691e6a555f7bac05544f2d9d21ac64026f4a SHA512 7f583e17f5b8df244575c0d08e7be8f213933d647168b85e19cc56378f1bb02f7fb83b8c87337c556b1436aaaca7d7367cb8566edaa43e3e7a4aaa7d87401323 -AUX dash-0.5.10.1-parser.patch 1028 BLAKE2B 69ef8f066752925c6f4fcbe6b7dde09a0547c11b60a3adab6f7e0f7ad27230a9101c79d9334e7a567b18d7b63d37fc882ff8ac53013e1d94a8ac748426ed0f5f SHA512 cddbe04b76acc413bddcb3fbb53538eca243d27ab8dc02b2cdd58a89c0dbebcba6c777482f755b8e97cbb54c352c9e8ea980646c1cd0196a6747d8fbc24d61f8 +AUX dash-0.5.10.1-parser.patch 1963 BLAKE2B 205503ebbe7c805ab0e69b4821a507c01aa650161b3c8ef228e6ad08fbf25d650b3866af5992caa1be352cca1b1f790b698931faa9f918a1d8ef3bce7442741c SHA512 51e8b5edd6295e924f95a01bcba8d65ee667eb6bc274678914a675c207af598f1c02657a239becfc40040ef8dfe49da105f50f941d13ff414451d4bb4f091424 AUX dash-0.5.9.1-dumb-echo.patch 2592 BLAKE2B 95e79281e579d0d40e320f0433fa94185f22e971a2e5c6b8a7686e96479a490c2d7820545875de2bdb81f52f7ce0b7ea0811a207c41601d7e2272c0829f07d14 SHA512 8dcbee6a53b46b78986c17860f84f47c94b3137b84cf46cd521ec9e4f0b5b4f5a2afbc9e7faa8130b591b3a0f9d2c9dc7853803c8b092c4ec1b5c5b7411fecbf AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff90f1a176a99108db02d4ff03395d74c9eb69039604d3921cb26c42aced4411caa27cf20eafced3febbb4b175a7d118b66ca0 SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6 DIST dash-0.5.10.1.tar.gz 225253 BLAKE2B 55dbdca7f01d19656e002d6e210bcae920619e2e88d4d174a3e08cbbc40bf867ece3f24ce9690ec64f95b1f0995ab35cabc08381ac031a33b55282cec0b09e73 SHA512 7ca3bbcf8bac84d359cde710a9ab393f05cf8522e969a2c110d2e71620e53f349387128045e68738dc621afe0b48f43ae3d32851187f2ae02d49b3e2575ffa6b diff --git a/app-shells/dash/files/dash-0.5.10.1-parser.patch b/app-shells/dash/files/dash-0.5.10.1-parser.patch index 485fc7e6772a..0939b7cb7222 100644 --- a/app-shells/dash/files/dash-0.5.10.1-parser.patch +++ b/app-shells/dash/files/dash-0.5.10.1-parser.patch @@ -1,8 +1,28 @@ -https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html +From 469c5fd4f57622b1a6571172898ab29430319d4a Mon Sep 17 00:00:00 2001 +From: Herbert Xu <herbert@gondor.apana.org.au> +Date: Fri, 11 May 2018 23:41:25 +0800 +Subject: parser: Fix incorrect eating of backslash newlines ---- dash-0.5.10.1/src/parser.c -+++ dash-0.5.10.1/src/parser.c -@@ -853,6 +853,11 @@ +With the introduction of synstack->syntax, a number of references +to the syntax variable was missed during the conversion. This +causes backslash newlines to be incorrectly removed in single +quote context. + +This patch also combines these calls into a new helper function +pgetc_top. + +Fixes: ab1cecb40478 ("parser: Add syntax stack for recursive...") +Reported-by: Leah Neukirchen <leah@vuxu.org> +Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +--- + src/parser.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/parser.c b/src/parser.c +index 8e40781..8bd3db4 100644 +--- a/src/parser.c ++++ b/src/parser.c +@@ -853,6 +853,11 @@ static int pgetc_eatbnl(void) return c; } @@ -14,7 +34,7 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html static void synstack_push(struct synstack **stack, struct synstack *next, const char *syntax) { -@@ -915,7 +920,7 @@ +@@ -915,7 +920,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) attyline(); if (synstack->syntax == BASESYNTAX) return readtoken(); @@ -23,7 +43,7 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html goto loop; } #endif -@@ -929,7 +934,7 @@ +@@ -929,7 +934,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) goto endword; /* exit outer loop */ USTPUTC(c, out); nlprompt(); @@ -32,7 +52,7 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html goto loop; /* continue outer loop */ case CWORD: USTPUTC(c, out); -@@ -1056,7 +1061,7 @@ +@@ -1056,7 +1061,7 @@ toggledq: USTPUTC(c, out); } } @@ -41,3 +61,6 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html } } endword: +-- +cgit v1.1 + |