diff --git a/dash-0.5.10.tar.gz b/dash-0.5.10.tar.gz new file mode 100644 index 0000000..8eebcbb --- /dev/null +++ b/dash-0.5.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad70e0cc3116b424931c392912b3ebdb8053b21f3fd968c782f0b19fd8ae31ab +size 225242 diff --git a/dash-0.5.7-do-not-close-stderr.patch b/dash-0.5.7-do-not-close-stderr.patch deleted file mode 100644 index 76844bb..0000000 --- a/dash-0.5.7-do-not-close-stderr.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNp dash-0.5.7.orig/src/jobs.c dash-0.5.7/src/jobs.c ---- dash-0.5.7.orig/src/jobs.c 2011-03-15 08:45:32.000000000 +0100 -+++ dash-0.5.7/src/jobs.c 2011-10-06 18:57:38.000000000 +0200 -@@ -198,6 +198,9 @@ setjobctl(int on) - while (!isatty(fd)) - if (--fd < 0) - goto out; -+ fd = dup(fd); -+ if (fd < 0) -+ goto out; - } - fd = savefd(fd, ofd); - do { /* while we are in the background */ diff --git a/dash-0.5.9.1.tar.gz b/dash-0.5.9.1.tar.gz deleted file mode 100644 index f805dc9..0000000 --- a/dash-0.5.9.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659 -size 225217 diff --git a/dash-remove-backslash-before-in-double-quotes-in-variable.patch b/dash-remove-backslash-before-in-double-quotes-in-variable.patch deleted file mode 100644 index f453f88..0000000 --- a/dash-remove-backslash-before-in-double-quotes-in-variable.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1ed728ca0ea91cac348e1baf070399df5d575115 Mon Sep 17 00:00:00 2001 -From: Jilles Tjoelker -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 ---- - 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 ---- a/src/parser.c -+++ b/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 - diff --git a/dash.changes b/dash.changes index d76e331..ab79955 100644 --- a/dash.changes +++ b/dash.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 25 06:07:40 UTC 2018 - sean@suspend.net + +- update to version 0.5.10 + * For complete list of changes, see: + https://git.kernel.org/pub/scm/utils/dash/dash.git/log/?qt=range&q=v0.5.9.1..v0.5.10 +- remove upstreamed patches: + * drop dash-0.5.7-do-not-close-stderr.patch + * drop dash-remove-backslash-before-in-double-quotes-in-variable.patch + ------------------------------------------------------------------- Sat Nov 4 23:15:40 UTC 2017 - aavindraa@gmail.com diff --git a/dash.spec b/dash.spec index ff69277..69fca85 100644 --- a/dash.spec +++ b/dash.spec @@ -13,22 +13,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: dash -Version: 0.5.9.1 +Version: 0.5.10 Release: 0 Summary: POSIX-compliant Implementation of /bin/sh License: BSD-3-Clause Group: System/Shells Url: http://gondor.apana.org.au/~herbert/dash/ Source: http://gondor.apana.org.au/~herbert/dash/files/dash-%{version}.tar.gz -# PATCH-FIX-UPSTREAM dash-0.5.7-do-not-close-stderr.patch gber@opensuse.org -- Prevents closing stderr when /dev/tty fails to open (backported from upstream git) -Patch0: dash-0.5.7-do-not-close-stderr.patch -# PATCH-FIX-UPSTREAM dash-remove-backslash-before-in-double-quotes-in-variable.patch gber@opensuse.org -- Remove backslash before } in double-quotes in variable as it prevents the closing brace from terminating the substitution (from FreeBSD/Debian) -Patch1: dash-remove-backslash-before-in-double-quotes-in-variable.patch BuildRequires: libedit-devel %description @@ -37,8 +33,6 @@ possible without sacrificing speed where possible. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure \