From d2633ec7d9de208fa53728d5f311ad51c019a3ca Mon Sep 17 00:00:00 2001
From: Martin Gieseking <martin.gieseking@uos.de>
Date: Wed, 2 Dec 2020 09:00:50 +0100
Subject: [PATCH] updated to version 3.16.1; removed redundant patches

---
 .gitignore                    |  1 +
 liblouis-cve-2018-12085.patch | 25 -------------------------
 liblouis-tests.patch          | 31 -------------------------------
 liblouis.spec                 | 10 ++++------
 sources                       |  2 +-
 5 files changed, 6 insertions(+), 63 deletions(-)
 delete mode 100644 liblouis-cve-2018-12085.patch
 delete mode 100644 liblouis-tests.patch

diff --git a/.gitignore b/.gitignore
index e6fccbc..8f825cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /liblouis-3.12.0.tar.gz
 /liblouis-3.15.0.tar.gz
 /liblouis-3.16.0.tar.gz
+/liblouis-3.16.1.tar.gz
diff --git a/liblouis-cve-2018-12085.patch b/liblouis-cve-2018-12085.patch
deleted file mode 100644
index 068a585..0000000
--- a/liblouis-cve-2018-12085.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dbfa58bb128cae86729578ac596056b3385817ef Mon Sep 17 00:00:00 2001
-From: Christian Egli <christian.egli@sbs.ch>
-Date: Wed, 6 Jun 2018 16:41:53 +0200
-Subject: [PATCH] Check index before writing to result->chars
-
-Fixes #595
-
-diff --git a/liblouis/compileTranslationTable.c b/liblouis/compileTranslationTable.c
-index e3ca96075..c02821214 100644
---- a/liblouis/compileTranslationTable.c
-+++ b/liblouis/compileTranslationTable.c
-@@ -1127,11 +1127,11 @@ parseChars(FileInfo *nested, CharsString *result, CharsString *token) {
- 				}
- 				in++;
- 			}
--			result->chars[out++] = (widechar)ch;
- 			if (out >= MAXSTRING) {
- 				result->length = out;
- 				return 1;
- 			}
-+			result->chars[out++] = (widechar)ch;
- 			continue;
- 		}
- 		lastOutSize = out;
-
diff --git a/liblouis-tests.patch b/liblouis-tests.patch
deleted file mode 100644
index 45fb985..0000000
--- a/liblouis-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 87106c3d8df3244dbe3d855b25ac3caf88eb658b Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Tue, 1 Dec 2020 12:49:10 +0100
-Subject: [PATCH] tests: Drop reference to the removed ru-ru-g1 table (#1033)
-
----
- tests/braille-specs/spaces.yaml | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/tests/braille-specs/spaces.yaml b/tests/braille-specs/spaces.yaml
-index 0c090e59f..db6e796c5 100644
---- a/tests/braille-specs/spaces.yaml
-+++ b/tests/braille-specs/spaces.yaml
-@@ -1752,17 +1752,6 @@ tests:
-   - ['\x000a', '\x0020']
-   - ['\x000c', '\x0020']
-   - ['\x000d', '\x0020']
--table: ru-ru-g1.utb
--flags: {testmode: bothDirections}
--tests:
--  - ['\x0020', '\x0020']
--  - ['\x00a0', 'a']
--flags: {testmode: forward}
--tests:
--  - ['\x0009', '\x0020']
--  - ['\x000a', '\x0020']
--  - ['\x000c', '\x0020']
--  - ['\x000d', '\x0020']
- table: sa.tbl
- flags: {testmode: bothDirections}
- tests:
diff --git a/liblouis.spec b/liblouis.spec
index 6cde81b..0cb539d 100644
--- a/liblouis.spec
+++ b/liblouis.spec
@@ -2,7 +2,7 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 
 Name:           liblouis
-Version:        3.16.0
+Version:        3.16.1
 Release:        1%{?dist}
 Summary:        Braille translation and back-translation library
 
@@ -10,10 +10,6 @@ License:        LGPLv3+
 URL:            http://liblouis.org
 Source0:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 
-# remove test for dropped ru-ru-g1 table
-# https://github.com/liblouis/liblouis/commit/87106c3d8df3244dbe3d855b25ac3caf88eb658b
-Patch0:         %{name}-tests.patch
-
 BuildRequires:  chrpath
 BuildRequires:  gcc
 BuildRequires:  help2man
@@ -85,7 +81,6 @@ This package provides the documentation for liblouis.
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -147,6 +142,9 @@ done
 
 
 %changelog
+* Wed Dec 02 2020 Martin Gieseking <martin.gieseking@uos.de> - 3.16.1-1
+- Update to 3.16.1
+
 * Tue Dec 01 2020 Martin Gieseking <martin.gieseking@uos.de> - 3.16.0-1
 - Update to 3.16.0
 
diff --git a/sources b/sources
index ede894d..9b58d65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (liblouis-3.16.0.tar.gz) = b247e8e501b3b07c45e55ff5df79d7ee8174c12dba9cf7e11ae88e0bbb845c08330e6a1be5ebabc21258bcfd7276484f525e9acc56605ba0fd3ec910b7289a1b
+SHA512 (liblouis-3.16.1.tar.gz) = 8ac3723d8240be7c84854bc2b6efeefd5c4fd405c3a368de151c2b7612acc809b91c4227bc15d31040d65b6872dd9b05fbb99ecc4325a87cc6a570972a8ca4a7