Revert the previous change, CVE-2020-26159 is marked as false

https://github.com/kkos/oniguruma/issues/221

oniguruma-XXX-CVE-2020-26159.patch

@@ -1,22 +0,0 @@
-From cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0 Mon Sep 17 00:00:00 2001
-From: "K.Kosako" <kkosako0@gmail.com>
-Date: Mon, 21 Sep 2020 12:58:29 +0900
-Subject: [PATCH] #207: Out-of-bounds write
-
----
- src/regcomp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/regcomp.c b/src/regcomp.c
-index f6494b6d..a0a68561 100644
---- a/src/regcomp.c
-+++ b/src/regcomp.c
-@@ -6257,7 +6257,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc)
- 
-   for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) {
-     len = enclen(enc, p);
--    if (i + len > OPT_EXACT_MAXLEN) break;
-+    if (i + len >= OPT_EXACT_MAXLEN) break;
-     for (j = 0; j < len && p < end; j++)
-       to->s[i++] = *p++;
-   }

oniguruma.spec

@@ -4,7 +4,7 @@
 %global	betaver	rev1
 %undefine	prerelease
 
-%global	fedorarel	3
+%global	fedorarel	4
 
 Name:		oniguruma
 Version:	%{mainver}
@@ -14,9 +14,6 @@ Summary:	Regular expressions library
 License:	BSD
 URL:		https://github.com/kkos/oniguruma/
 Source0:	https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz
-# https://github.com/kkos/oniguruma/commit/cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0
-# https://github.com/kkos/oniguruma/issues/207
-Patch1:	oniguruma-XXX-CVE-2020-26159.patch
 
 BuildRequires:	gcc
 
@@ -39,7 +36,6 @@ developing applications that use %{name}.
 %prep
 %setup -q -n onig-%{mainver}
 %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in
-%patch1 -p1 -b .CVE-2020-26159
 
 %if 0
 for f in \
@@ -115,6 +111,10 @@ find $RPM_BUILD_ROOT -name '*.la' \
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Oct 20 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.5-4.rev1
+- Revert the previous change, CVE-2020-26159 is marked as false
+  https://github.com/kkos/oniguruma/issues/221
+
 * Thu Oct  1 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.5-3.rev1
 - Apply upstream fix for CVE-2020-26159