dash: update to 0.5.10.

Closes: #14099 [via git-merge-pr]
This commit is contained in:
maxice8 2018-05-03 14:01:09 -03:00 committed by Toyam Cox
parent 3305c53412
commit ecf821f89d
2 changed files with 4 additions and 41 deletions

View file

@ -1,37 +0,0 @@
From 1ed728ca0ea91cac348e1baf070399df5d575115 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@stack.nl>
Date: Sun, 21 Nov 2010 14:42:22 +0100
Subject: [PARSER] Remove backslash before } in double-quotes in variable
The backslash prevents the closing brace from terminating the
substitution, therefore it should be removed.
FreeBSD sh test expansion/plus-minus2.0 starts working, no other tests
are affected.
Example:
printf "%s\n" ${$+\}} ${$+"\}"} "${$+\}}"
should print } three times, without backslashes.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
src/parser.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/parser.c b/src/parser.c
index 6de27629..4fa8c6d4 100644
--- src/parser.c
+++ src/parser.c
@@ -926,6 +926,9 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs)
c != '$' && (
c != '"' ||
eofmark != NULL
+ ) && (
+ c != '}' ||
+ varnest == 0
)
) {
USTPUTC('\\', out);
--
1.7.6

View file

@ -1,16 +1,16 @@
# Template file for 'dash'
pkgname=dash
version=0.5.9.1
revision=2
version=0.5.10
revision=1
build_style=gnu-configure
hostmakedepends="bison"
register_shell="/bin/sh /bin/dash"
short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="BSD-3-Clause"
homepage="http://gondor.apana.org.au/~herbert/dash/"
license="BSD"
distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
checksum=5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659
checksum=ad70e0cc3116b424931c392912b3ebdb8053b21f3fd968c782f0b19fd8ae31ab
alternatives="
sh:sh:/usr/bin/dash