Accepting request 645115 from shells

3rd times a charm?

OBS-URL: https://build.opensuse.org/request/show/645115
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dash?expand=0&rev=19

dash-0.5.10.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad70e0cc3116b424931c392912b3ebdb8053b21f3fd968c782f0b19fd8ae31ab
+size 225242

dash-0.5.7-do-not-close-stderr.patch

@@ -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 */

dash-0.5.9.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659
-size 225217

dash-remove-backslash-before-in-double-quotes-in-variable.patch

@@ -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
---- 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
-

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
 

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 \