From 6f9d2e00226fe1ba47377593ab0269974f2bb8ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 Nov 2019 15:15:11 +0100 Subject: - update to 6.9.4 (from Fedora) - report build failure on EL-6 https://github.com/kkos/oniguruma/issues/166 --- 15c4228aa2ffa02140a99912dd3177df0b1841c6.patch | 37 -- compat_reports/6.9.3_to_6.9.4/compat_report.html | 477 +++++++++++++++++++++++ d3e402928b6eb3327f8f7d59a9edfa622fec557b.patch | 21 - libonig.xml | 2 +- oniguruma.spec | 18 +- 5 files changed, 489 insertions(+), 66 deletions(-) delete mode 100644 15c4228aa2ffa02140a99912dd3177df0b1841c6.patch create mode 100644 compat_reports/6.9.3_to_6.9.4/compat_report.html delete mode 100644 d3e402928b6eb3327f8f7d59a9edfa622fec557b.patch diff --git a/15c4228aa2ffa02140a99912dd3177df0b1841c6.patch b/15c4228aa2ffa02140a99912dd3177df0b1841c6.patch deleted file mode 100644 index 88dd8e8..0000000 --- a/15c4228aa2ffa02140a99912dd3177df0b1841c6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 15c4228aa2ffa02140a99912dd3177df0b1841c6 Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Fri, 4 Oct 2019 19:54:40 +0900 -Subject: [PATCH] fix #156: Heap buffer overflow in match_at() with - case-insensitive match - ---- - src/regcomp.c | 2 +- - src/regexec.c | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/regcomp.c b/src/regcomp.c -index cd379a2..52f6f01 100644 ---- a/src/regcomp.c -+++ b/src/regcomp.c -@@ -734,8 +734,8 @@ add_compile_string(UChar* s, int mb_len, int str_len, - COP(reg)->exact_n.s = p; - } - else { -+ xmemset(COP(reg)->exact.s, 0, sizeof(COP(reg)->exact.s)); - xmemcpy(COP(reg)->exact.s, s, (size_t )byte_len); -- COP(reg)->exact.s[byte_len] = '\0'; - } - - return 0; -diff --git a/src/regexec.c b/src/regexec.c -index e471491..4bcd8a9 100644 ---- a/src/regexec.c -+++ b/src/regexec.c -@@ -2889,6 +2889,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, - DATA_ENSURE(0); - q = lowbuf; - while (len-- > 0) { -+ if (ps >= endp) goto fail; - if (*ps != *q) goto fail; - ps++; q++; - } diff --git a/compat_reports/6.9.3_to_6.9.4/compat_report.html b/compat_reports/6.9.3_to_6.9.4/compat_report.html new file mode 100644 index 0000000..0664be3 --- /dev/null +++ b/compat_reports/6.9.3_to_6.9.4/compat_report.html @@ -0,0 +1,477 @@ + + + + + + + + + + +libonig: 6.9.3 to 6.9.4 compatibility report + + + +

API compatibility report for the libonig library between 6.9.3 and 6.9.4 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibonig
Version #16.9.3
Version #26.9.4
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types194 / 63
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
+ +

Header Files  2 

+
+oniggnu.h
+oniguruma.h
+
+
to the top
+

Libraries  1 

+
+libonig.so.5.0.0
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibonig
Version #16.9.3
Version #26.9.4
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types195 / 63
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-0
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
+ +

Header Files  2 

+
+oniggnu.h
+oniguruma.h
+
+
to the top
+

Libraries  1 

+
+libonig.so.5.0.0
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/d3e402928b6eb3327f8f7d59a9edfa622fec557b.patch b/d3e402928b6eb3327f8f7d59a9edfa622fec557b.patch deleted file mode 100644 index cb53825..0000000 --- a/d3e402928b6eb3327f8f7d59a9edfa622fec557b.patch +++ /dev/null @@ -1,21 +0,0 @@ -From d3e402928b6eb3327f8f7d59a9edfa622fec557b Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Tue, 13 Aug 2019 13:37:30 +0900 -Subject: [PATCH] fix heap-buffer-overflow - ---- - src/regexec.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/regexec.c b/src/regexec.c -index 0753b07..634ee42 100644 ---- a/src/regexec.c -+++ b/src/regexec.c -@@ -4196,6 +4196,7 @@ str_lower_case_match(OnigEncoding enc, int case_fold_flag, - lowlen = ONIGENC_MBC_CASE_FOLD(enc, case_fold_flag, &p, end, lowbuf); - q = lowbuf; - while (lowlen > 0) { -+ if (t >= tend) return 0; - if (*t++ != *q++) return 0; - lowlen--; - } diff --git a/libonig.xml b/libonig.xml index 5b7f84a..5255c27 100644 --- a/libonig.xml +++ b/libonig.xml @@ -9,7 +9,7 @@ -6.9.3 +6.9.4 diff --git a/oniguruma.spec b/oniguruma.spec index 6cb224a..3a25153 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -23,17 +23,14 @@ Name: %{libname} %else Name: %{libname}%{soname} %endif -Version: 6.9.3 -Release: 3%{?dist} +Version: 6.9.4 +Release: 1%{?dist} Summary: Regular expressions library License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{version}.tar.gz -Patch0: https://github.com/kkos/oniguruma/commit/d3e402928b6eb3327f8f7d59a9edfa622fec557b.patch -Patch1: https://github.com/kkos/oniguruma/commit/15c4228aa2ffa02140a99912dd3177df0b1841c6.patch - BuildRequires: gcc %if "%{name}" == "%{libname}" @@ -69,8 +66,6 @@ developing applications that use %{name}. %prep %setup -q -n onig-%{version} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in -%patch0 -p1 -b .up -%patch1 -p1 -b .up1 %if 0 for f in \ @@ -103,6 +98,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ %check +%if 0%{?rhel} == 6 +sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile +%endif + %{__make} check @@ -146,6 +145,11 @@ find $RPM_BUILD_ROOT -name '*.la' \ %changelog +* Fri Nov 29 2019 Remi Collet -6.9.4-1 +- update to 6.9.4 (from Fedora) +- report build failure on EL-6 + https://github.com/kkos/oniguruma/issues/166 + * Tue Oct 8 2019 Remi Collet -6.9.3-3 - fix heap-buffer-overflow using upstream patch -- cgit