diff --git a/srcpkgs/dash/patches/fix-incorrect-eating-of-backslash-newlines.patch b/srcpkgs/dash/patches/fix-incorrect-eating-of-backslash-newlines.patch deleted file mode 100644 index 896c861f689..00000000000 --- a/srcpkgs/dash/patches/fix-incorrect-eating-of-backslash-newlines.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 469c5fd4f57622b1a6571172898ab29430319d4a Mon Sep 17 00:00:00 2001 -From: Herbert Xu -Date: Fri, 11 May 2018 23:41:25 +0800 -Subject: parser: Fix incorrect eating of backslash newlines - -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 -Signed-off-by: Herbert Xu ---- - src/parser.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - ---- src/parser.c -+++ src/parser.c -@@ -853,6 +853,11 @@ static int pgetc_eatbnl(void) - return c; - } - -+static int pgetc_top(struct synstack *stack) -+{ -+ return stack->syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); -+} -+ - static void synstack_push(struct synstack **stack, struct synstack *next, - const char *syntax) - { -@@ -915,7 +920,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) - attyline(); - if (synstack->syntax == BASESYNTAX) - return readtoken(); -- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); -+ c = pgetc_top(synstack); - goto loop; - } - #endif -@@ -929,7 +934,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) - goto endword; /* exit outer loop */ - USTPUTC(c, out); - nlprompt(); -- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); -+ c = pgetc_top(synstack); - goto loop; /* continue outer loop */ - case CWORD: - USTPUTC(c, out); -@@ -1056,7 +1061,7 @@ toggledq: - USTPUTC(c, out); - } - } -- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); -+ c = pgetc_top(synstack); - } - } - endword: --- -cgit v1.1 - - diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template index 1a021cd959d..7ca366e05e0 100644 --- a/srcpkgs/dash/template +++ b/srcpkgs/dash/template @@ -1,6 +1,6 @@ # Template file for 'dash' pkgname=dash -version=0.5.10.1 +version=0.5.10.2 revision=1 build_style=gnu-configure hostmakedepends="bison" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="BSD-3-Clause" homepage="http://gondor.apana.org.au/~herbert/dash/" distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz" -checksum=daac92be392ea5d9b03e8879384e437828e636b9f491a275a607f85d7e5e84ae +checksum=3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071 alternatives=" sh:sh:/usr/bin/dash