From bd71fc0cf23bd4f8246c88160e16ff914ef60851 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 18 Nov 2016 10:43:51 -0800
Subject: sbase: Update to latest scm

---
 ...ix-multiple-ranges-with-different-lengths.patch | 44 ----------------------
 core/sbase/rev                                     |  2 +-
 core/sbase/src                                     |  2 +-
 3 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 core/sbase/patch/0001-tr-Fix-multiple-ranges-with-different-lengths.patch

diff --git a/core/sbase/patch/0001-tr-Fix-multiple-ranges-with-different-lengths.patch b/core/sbase/patch/0001-tr-Fix-multiple-ranges-with-different-lengths.patch
deleted file mode 100644
index 790b38b6..00000000
--- a/core/sbase/patch/0001-tr-Fix-multiple-ranges-with-different-lengths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5ab8305957fcf03a7b0602c926db72ecbc3f1294 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 22 Oct 2016 02:13:12 -0700
-Subject: [sbase] [PATCH] tr: Fix multiple ranges with different lengths
-
-A bug was introduced in bc4c293fe59de042c1ac71793d33bb685c4fb915 causing the
-range length for the next set to be used instead of the first one. This causes
-issues when choosing the replacement rune when the ranges are of different
-lengths.
-
-Current behavior:
-
-$ echo 1234 | tr 'a-f1-4' '1-6a-d'
-56ab
-
-Correct behavior:
-
-$ echo 1234 | tr 'a-f1-4' '1-6a-d'
-abcd
-
-This also fixes range expressions in the form [a-z], which get encoded as four
-ranges '[', 'a'..'z', ']', causing all a-z characters to get mapped to ']'. This
-form is occasionally used in shell scripts, including the syscalltbl.sh script
-used to build linux.
----
- tr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tr.c b/tr.c
-index a633d74..c235215 100644
---- a/tr.c
-+++ b/tr.c
-@@ -213,7 +213,7 @@ read:
- 	}
- 	if (argc == 1 && sflag)
- 		goto write;
--	for (i = 0, off1 = 0; i < set1ranges; i++, off1 += rangelen(set1[i])) {
-+	for (i = 0, off1 = 0; i < set1ranges; off1 += rangelen(set1[i]), i++) {
- 		if (set1[i].start <= r && r <= set1[i].end) {
- 			if (dflag) {
- 				if (cflag)
--- 
-2.10.1
-
diff --git a/core/sbase/rev b/core/sbase/rev
index 1e8b3149..7f8f011e 100644
--- a/core/sbase/rev
+++ b/core/sbase/rev
@@ -1 +1 @@
-6
+7
diff --git a/core/sbase/src b/core/sbase/src
index d24ef864..fb111739 160000
--- a/core/sbase/src
+++ b/core/sbase/src
@@ -1 +1 @@
-Subproject commit d24ef864cbf9be010294418acb51c0d424c7bc99
+Subproject commit fb11173926bc783bc70b8e848368eaa97915e54f
-- 
cgit v1.2.3