From f4ba6879163be41892c1468c4fdeb3cb0f78dbe3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Nov 2020 10:13:35 +0100 Subject: update to 6.9.6 (from Fedora) --- compat_reports/6.9.5_to_6.9.6/compat_report.html | 657 +++++++++++++++++++++++ libonig.xml | 2 +- onig-soname.patch | 12 +- oniguruma.spec | 23 +- 4 files changed, 671 insertions(+), 23 deletions(-) create mode 100644 compat_reports/6.9.5_to_6.9.6/compat_report.html diff --git a/compat_reports/6.9.5_to_6.9.6/compat_report.html b/compat_reports/6.9.5_to_6.9.6/compat_report.html new file mode 100644 index 0000000..6c9c0ea --- /dev/null +++ b/compat_reports/6.9.5_to_6.9.6/compat_report.html @@ -0,0 +1,657 @@ + + + + + + + + + +libonig: 6.9.5 to 6.9.6 compatibility report + + + +

API compatibility report for the libonig library between 6.9.5 and 6.9.6 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibonig
Version #16.9.5
Version #26.9.6
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

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

Problem Summary

+ + + + + + + + + + +
SeverityCount
Added Symbols-2
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  2 

+oniguruma.h, libonig.so.5.1.0
+onig_get_subexp_call_limit_in_search ( )
+onig_set_subexp_call_limit_in_search ( unsigned long n )
+
+to the top
+ +

Other Changes in Constants  1 

+oniguruma.h
+ +[+] ONIGERR_SUBEXP_CALL_LIMIT_IN_SEARCH_OVER +
+ + +
+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.5
Version #26.9.6
Archx86_64
SubjectSource Compatibility
+

Test Results

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

Problem Summary

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

Added Symbols  2 

+oniguruma.h
+onig_get_subexp_call_limit_in_search ( )
+onig_set_subexp_call_limit_in_search ( unsigned long n )
+
+to the top
+ +

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_NOT_BEGIN_POSITION +
+ + + +[+] ONIG_OPTION_NOT_BEGIN_STRING +
+ + + +[+] ONIG_OPTION_NOT_END_STRING +
+ + + +[+] ONIGERR_SUBEXP_CALL_LIMIT_IN_SEARCH_OVER +
+ + +
+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 index 3df5e7b..e95b3f4 100644 --- a/libonig.xml +++ b/libonig.xml @@ -9,7 +9,7 @@ -6.9.5 +6.9.6 diff --git a/onig-soname.patch b/onig-soname.patch index 3349ca6..8250565 100644 --- a/onig-soname.patch +++ b/onig-soname.patch @@ -1,12 +1,12 @@ -diff -up ./configure.old ./configure ---- ./configure.old 2020-05-28 10:06:33.980770743 +0200 -+++ ./configure 2020-05-28 10:06:37.392768282 +0200 -@@ -12214,7 +12214,7 @@ CC=$lt_save_CC +diff -up ./configure.bump ./configure +--- ./configure.bump 2020-11-05 10:04:52.680279189 +0100 ++++ ./configure 2020-11-05 10:05:58.099066485 +0100 +@@ -12245,7 +12245,7 @@ CC=$lt_save_CC # Only expand once: --LTVERSION="5:0:0" -+LTVERSION="105:0:0" +-LTVERSION="6:0:1" ++LTVERSION="106:0:1" diff --git a/oniguruma.spec b/oniguruma.spec index 12f49c7..b07a184 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -19,12 +19,12 @@ # EPEL-7 have 5.9, soname 2 # RHEL-6 have 5.9, soname 2 -%global mainver 6.9.5 -%global postver rev1 +%global mainver 6.9.6 +#global postver rev1 Name: %{libname}%{oldsoname}php Version: %{mainver}%{?postver:+%postver} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Regular expressions library License: BSD @@ -68,19 +68,6 @@ developing applications that use %{name}. %patch0 -p1 -b .bump -%if 0 -for f in \ - README.ja \ - doc/API.ja \ - doc/FAQ.ja \ - doc/RE.ja - do - iconv -f EUC-JP -t UTF-8 $f > $f.tmp && \ - ( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \ - %{__rm} -f $f.tmp -done -%endif - %build # This package fails its testsuite when compiled with LTO, but the real problem @@ -90,6 +77,7 @@ done %configure \ --enable-posix-api \ + --enable-binary-compatible-posix-api \ --disable-silent-rules \ --disable-static \ --with-rubydir=%{_bindir} @@ -152,6 +140,9 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile %changelog +* Thu Nov 5 2020 Remi Collet -6.9.6-1 +- update to 6.9.6 (from Fedora) + * Tue Oct 20 2020 Remi Collet -6.9.5+rev1-4 - From Fedora: Revert fix for CVE-2020-26159, marked as false https://github.com/kkos/oniguruma/issues/221 -- cgit