From 82b2af94de0d1989c19ad9020aa5fe1b5f161e82 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 27 Aug 2019 06:55:41 +0200 Subject: v6.9.3 --- ...9-13225-problem-in-converting-if-then-els.patch | 72 --- ...9-13224-don-t-allow-different-encodings-f.patch | 44 -- ..._deluxe-don-t-free-new-pattern-if-success.patch | 27 - compat_reports/6.8.2_to_6.9.0/compat_report.html | 538 +++++++++++++++++ compat_reports/6.9.0_to_6.9.1/compat_report.html | 477 +++++++++++++++ compat_reports/6.9.1_to_6.9.2/compat_report.html | 664 +++++++++++++++++++++ compat_reports/6.9.2_to_6.9.3/compat_report.html | 579 ++++++++++++++++++ libonig.xml | 63 ++ oniguruma.spec | 19 +- 9 files changed, 2326 insertions(+), 157 deletions(-) delete mode 100644 0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch delete mode 100644 0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch delete mode 100644 0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch create mode 100644 compat_reports/6.8.2_to_6.9.0/compat_report.html create mode 100644 compat_reports/6.9.0_to_6.9.1/compat_report.html create mode 100644 compat_reports/6.9.1_to_6.9.2/compat_report.html create mode 100644 compat_reports/6.9.2_to_6.9.3/compat_report.html create mode 100644 libonig.xml diff --git a/0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch b/0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch deleted file mode 100644 index a4c140d..0000000 --- a/0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c509265c5f6ae7264f7b8a8aae1cfa5fc59d108c Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Thu, 27 Jun 2019 14:11:55 +0900 -Subject: [PATCH 10/32] Fix CVE-2019-13225: problem in converting if-then-else - pattern to bytecode. - ---- - src/regcomp.c | 25 +++++++++++++++++-------- - 1 file changed, 17 insertions(+), 8 deletions(-) - -diff --git a/src/regcomp.c b/src/regcomp.c -index c2c04a4..ff3431f 100644 ---- a/src/regcomp.c -+++ b/src/regcomp.c -@@ -1307,8 +1307,9 @@ compile_length_bag_node(BagNode* node, regex_t* reg) - len += tlen; - } - -+ len += SIZE_OP_JUMP + SIZE_OP_ATOMIC_END; -+ - if (IS_NOT_NULL(Else)) { -- len += SIZE_OP_JUMP; - tlen = compile_length_tree(Else, reg); - if (tlen < 0) return tlen; - len += tlen; -@@ -1455,7 +1456,7 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env) - - case BAG_IF_ELSE: - { -- int cond_len, then_len, jump_len; -+ int cond_len, then_len, else_len, jump_len; - Node* cond = NODE_BAG_BODY(node); - Node* Then = node->te.Then; - Node* Else = node->te.Else; -@@ -1472,8 +1473,7 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env) - else - then_len = 0; - -- jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END; -- if (IS_NOT_NULL(Else)) jump_len += SIZE_OP_JUMP; -+ jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END + SIZE_OP_JUMP; - - r = add_op(reg, OP_PUSH); - if (r != 0) return r; -@@ -1490,11 +1490,20 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env) - } - - if (IS_NOT_NULL(Else)) { -- int else_len = compile_length_tree(Else, reg); -- r = add_op(reg, OP_JUMP); -- if (r != 0) return r; -- COP(reg)->jump.addr = else_len + SIZE_INC_OP; -+ else_len = compile_length_tree(Else, reg); -+ if (else_len < 0) return else_len; -+ } -+ else -+ else_len = 0; - -+ r = add_op(reg, OP_JUMP); -+ if (r != 0) return r; -+ COP(reg)->jump.addr = SIZE_OP_ATOMIC_END + else_len + SIZE_INC_OP; -+ -+ r = add_op(reg, OP_ATOMIC_END); -+ if (r != 0) return r; -+ -+ if (IS_NOT_NULL(Else)) { - r = compile_tree(Else, reg, env); - } - } --- -2.21.0 - diff --git a/0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch b/0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch deleted file mode 100644 index 4a2b994..0000000 --- a/0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0f7f61ed1b7b697e283e37bd2d731d0bd57adb55 Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Thu, 27 Jun 2019 17:25:26 +0900 -Subject: [PATCH 11/32] Fix CVE-2019-13224: don't allow different encodings for - onig_new_deluxe() - ---- - src/regext.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/regext.c b/src/regext.c -index fa4b360..965c793 100644 ---- a/src/regext.c -+++ b/src/regext.c -@@ -29,6 +29,7 @@ - - #include "regint.h" - -+#if 0 - static void - conv_ext0be32(const UChar* s, const UChar* end, UChar* conv) - { -@@ -158,6 +159,7 @@ conv_encoding(OnigEncoding from, OnigEncoding to, const UChar* s, const UChar* e - - return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION; - } -+#endif - - extern int - onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, -@@ -169,9 +171,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, - if (IS_NOT_NULL(einfo)) einfo->par = (UChar* )NULL; - - if (ci->pattern_enc != ci->target_enc) { -- r = conv_encoding(ci->pattern_enc, ci->target_enc, pattern, pattern_end, -- &cpat, &cpat_end); -- if (r != 0) return r; -+ return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION; - } - else { - cpat = (UChar* )pattern; --- -2.21.0 - diff --git a/0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch b/0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch deleted file mode 100644 index 6567d25..0000000 --- a/0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4a8db9d50f8281930678ed6f06692545293f3c9d Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Fri, 12 Jul 2019 15:38:43 +0900 -Subject: [PATCH] onig_new_deluxe: don't free new pattern if success - -On onig_new_deluxe() success (r == 0), new pattern (cpat) is used in -einfo->pattern, so don't free this. ---- - src/regext.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/regext.c b/src/regext.c -index fa4b360..920d183 100644 ---- a/src/regext.c -+++ b/src/regext.c -@@ -196,7 +196,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, - } - - err2: -- if (cpat != pattern) xfree(cpat); -+ if (r && (cpat != pattern)) xfree(cpat); - - return r; - } --- -2.21.0 - diff --git a/compat_reports/6.8.2_to_6.9.0/compat_report.html b/compat_reports/6.8.2_to_6.9.0/compat_report.html new file mode 100644 index 0000000..3a6f25a --- /dev/null +++ b/compat_reports/6.8.2_to_6.9.0/compat_report.html @@ -0,0 +1,538 @@ + + + + + + + + + +libonig: 6.8.2 to 6.9.0 compatibility report + + + +

API compatibility report for the libonig library between 6.8.2 and 6.9.0 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibonig
Version #16.8.2
Version #26.9.0
Archx86_64
GCC Version8
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types184 / 59
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.8.2
Version #26.9.0
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types185 / 59
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		Low3
+ + +

Problems with Constants, Low Severity  3 

+oniguruma.h
+ +[+] ONIGURUMA_VERSION_INT +
+ + + +[+] ONIGURUMA_VERSION_MINOR +
+ + + +[+] ONIGURUMA_VERSION_TEENY +
+ + +
+to the top
+

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/compat_reports/6.9.0_to_6.9.1/compat_report.html b/compat_reports/6.9.0_to_6.9.1/compat_report.html new file mode 100644 index 0000000..5cd36a6 --- /dev/null +++ b/compat_reports/6.9.0_to_6.9.1/compat_report.html @@ -0,0 +1,477 @@ + + + + + + + + + + +libonig: 6.9.0 to 6.9.1 compatibility report + + + +

API compatibility report for the libonig library between 6.9.0 and 6.9.1 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibonig
Version #16.9.0
Version #26.9.1
Archx86_64
GCC Version8
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types184 / 59
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.0
Version #26.9.1
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types185 / 59
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/compat_reports/6.9.1_to_6.9.2/compat_report.html b/compat_reports/6.9.1_to_6.9.2/compat_report.html new file mode 100644 index 0000000..91018a3 --- /dev/null +++ b/compat_reports/6.9.1_to_6.9.2/compat_report.html @@ -0,0 +1,664 @@ + + + + + + + + + +libonig: 6.9.1 to 6.9.2 compatibility report + + + +

API compatibility report for the libonig library between 6.9.1 and 6.9.2 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibonig
Version #16.9.1
Version #26.9.2
Archx86_64
GCC Version8
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types184 / 59
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
Other Changes
in Constants		-2
+ + +

Other Changes in Constants  2 

+oniguruma.h
+ +[+] ONIG_SYN_OP2_ESC_X_Y_TEXT_SEGMENT +
+ + + +[+] ONIG_SYN_OP2_OPTION_ONIGURUMA +
+ + +
+to the top
+

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.1
Version #26.9.2
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types185 / 59
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		Low3
Other Changes
in Constants		-4
+ + +

Problems with Constants, Low Severity  3 

+oniguruma.h
+ +[+] ONIG_OPTION_MAXBIT +
+ + + +[+] ONIGURUMA_VERSION_INT +
+ + + +[+] ONIGURUMA_VERSION_TEENY +
+ + +
+to the top
+ +

Other Changes in Constants  4 

+oniguruma.h
+ +[+] ONIG_OPTION_TEXT_SEGMENT_EXTENDED_GRAPHEME_CLUSTER +
+ + + +[+] ONIG_OPTION_TEXT_SEGMENT_WORD +
+ + + +[+] ONIG_SYN_OP2_ESC_X_Y_TEXT_SEGMENT +
+ + + +[+] ONIG_SYN_OP2_OPTION_ONIGURUMA +
+ + +
+to the top
+

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/compat_reports/6.9.2_to_6.9.3/compat_report.html b/compat_reports/6.9.2_to_6.9.3/compat_report.html new file mode 100644 index 0000000..0bdf9e4 --- /dev/null +++ b/compat_reports/6.9.2_to_6.9.3/compat_report.html @@ -0,0 +1,579 @@ + + + + + + + + + +libonig: 6.9.2 to 6.9.3 compatibility report + + + +

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

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibonig
Version #16.9.2
Version #26.9.3
Archx86_64
GCC Version8
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types184 / 59
Compatibility100%
+

Problem Summary

+ + + + + + + + + + +
SeverityCount
Added Symbols-1
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low0
Other Changes
in Constants		-1
+ +

Added Symbols  1 

+oniguruma.h, libonig.so.5.0.0
+onig_is_error_code_needs_param ( int code )
+
+to the top
+ +

Other Changes in Constants  1 

+oniguruma.h
+ +[+] ONIG_SYN_ALLOW_INVALID_CODE_END_OF_RANGE_IN_CC +
+ + +
+to the top
+

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.2
Version #26.9.3
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files2
Total Libraries1
Total Symbols / Types185 / 59
Compatibility100%
+

Problem Summary

+ + + + + + + + + + +
SeverityCount
Added Symbols-1
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low0
Problems with
Constants		Low2
Other Changes
in Constants		-1
+ +

Added Symbols  1 

+oniguruma.h
+onig_is_error_code_needs_param ( int code )
+
+to the top
+ +

Problems with Constants, Low Severity  2 

+oniguruma.h
+ +[+] ONIGURUMA_VERSION_INT +
+ + + +[+] ONIGURUMA_VERSION_TEENY +
+ + +
+to the top
+ +

Other Changes in Constants  1 

+oniguruma.h
+ +[+] ONIG_SYN_ALLOW_INVALID_CODE_END_OF_RANGE_IN_CC +
+ + +
+to the top
+

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/libonig.xml b/libonig.xml new file mode 100644 index 0000000..5b7f84a --- /dev/null +++ b/libonig.xml @@ -0,0 +1,63 @@ + + + + + + + + + +6.9.3 + + + + +/usr/include/oniguruma.h +/usr/include/oniggnu.h + + + + +/usr/lib64/libonig.so + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/oniguruma.spec b/oniguruma.spec index 03d8dd2..af076c0 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -23,21 +23,13 @@ Name: %{libname} %else Name: %{libname}%{soname} %endif -Version: 6.9.2 -Release: 2%{?dist} +Version: 6.9.3 +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 -# upstream patches -Patch10: 0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch -#Patch11: 0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch -# Not use Patch11 for F-30 and below, this is almost API change (deprecation of API) in -# onig_new_deluxe() and this change should be avoided (if possible) in stable -# branch -# Instead use another fix -Patch101: 0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch BuildRequires: gcc @@ -88,10 +80,6 @@ for f in \ done %endif -%patch10 -p1 -b .CVE-2019-13225 -#%%patch11 -p1 -b .CVE-2019-13224 -%patch101 -p1 -b .CVE-2019-13224 - %build %configure \ @@ -153,6 +141,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %changelog +* Tue Aug 27 2019 Remi Collet -6.9.3-1 +- update to 6.9.3 (from Fedora) + * Mon Jul 15 2019 Remi Collet -6.9.2-2 - add security fixes from Fedora -- cgit