From 2ad073df7900dc7002dde230165a85c2593f3f22 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 9 Jun 2020 07:44:56 +0200 Subject: rename to oniguruna5php and bump soname to 105 --- compat_reports/6.9.4_to_6.9.5/compat_report.html | 663 +++++++++++++++++++++++ libonig.xml | 2 +- onig-soname.patch | 12 + oniguruma.spec | 37 +- 4 files changed, 695 insertions(+), 19 deletions(-) create mode 100644 compat_reports/6.9.4_to_6.9.5/compat_report.html create mode 100644 onig-soname.patch diff --git a/compat_reports/6.9.4_to_6.9.5/compat_report.html b/compat_reports/6.9.4_to_6.9.5/compat_report.html new file mode 100644 index 0000000..7717aae --- /dev/null +++ b/compat_reports/6.9.4_to_6.9.5/compat_report.html @@ -0,0 +1,663 @@ + + + + + + + + + +libonig: 6.9.4 to 6.9.5 compatibility report + + + +

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

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibonig
Version #16.9.4
Version #26.9.5
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

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

Problem Summary

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

Added Symbols  5 

+oniguruma.h, libonig.so.5.0.0
+onig_get_retry_limit_in_search ( )
+onig_get_subexp_call_max_nest_level ( )
+onig_set_retry_limit_in_search ( unsigned long n )
+onig_set_retry_limit_in_search_of_match_param ( OnigMatchParam* param, unsigned long limit )
+onig_set_subexp_call_max_nest_level ( int level )
+
+to the top
+ +

Other Changes in Constants  3 

+oniguruma.h
+ +[+] ONIG_SYN_ISOLATED_OPTION_CONTINUE_BRANCH +
+ + + +[+] ONIG_SYN_VARIABLE_LEN_LOOK_BEHIND +
+ + + +[+] ONIGERR_RETRY_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.4
Version #26.9.5
Archx86_64
SubjectSource Compatibility
+

Test Results

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

Problem Summary

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

Added Symbols  5 

+oniguruma.h
+onig_get_retry_limit_in_search ( )
+onig_get_subexp_call_max_nest_level ( )
+onig_set_retry_limit_in_search ( unsigned long n )
+onig_set_retry_limit_in_search_of_match_param ( OnigMatchParam* param, unsigned long limit )
+onig_set_subexp_call_max_nest_level ( int level )
+
+to the top
+ +

Problems with Constants, Low Severity  2 

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

Other Changes in Constants  3 

+oniguruma.h
+ +[+] ONIG_SYN_ISOLATED_OPTION_CONTINUE_BRANCH +
+ + + +[+] ONIG_SYN_VARIABLE_LEN_LOOK_BEHIND +
+ + + +[+] ONIGERR_RETRY_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 5255c27..3df5e7b 100644 --- a/libonig.xml +++ b/libonig.xml @@ -9,7 +9,7 @@ -6.9.4 +6.9.5 diff --git a/onig-soname.patch b/onig-soname.patch new file mode 100644 index 0000000..3349ca6 --- /dev/null +++ b/onig-soname.patch @@ -0,0 +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 + # Only expand once: + + +-LTVERSION="5:0:0" ++LTVERSION="105:0:0" + + + diff --git a/oniguruma.spec b/oniguruma.spec index a4e7bb0..c33e400 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,4 +1,4 @@ -# remirepo spec file for oniguruma5 +# remirepo spec file for oniguruma5php # renamed for parallel installation, from: # # Fedora spec file for oniguruma @@ -9,7 +9,8 @@ # Please preserve changelog entries # %global libname oniguruma -%global soname 5 +%global oldsoname 5 +%global newsoname 105 %undefine _changelog_trimtime # Fedora 29 have 6.9, soname 5 @@ -21,11 +22,7 @@ %global mainver 6.9.5 %global postver rev1 -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 -Name: %{libname} -%else -Name: %{libname}%{soname} -%endif +Name: %{libname}%{oldsoname}php Version: %{mainver}%{?postver:+%postver} Release: 1%{?dist} Summary: Regular expressions library @@ -34,32 +31,31 @@ License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?postver:_%postver}/onig-%{mainver}%{?postver:-%postver}.tar.gz +# Bump soname from 5 to 105 to allow parallel installation +Patch0: onig-soname.patch + BuildRequires: gcc -%if "%{name}" == "%{libname}" -Obsoletes: %{libname}%{soname} <= %{version} -%endif +# TODO Obsoletes: %{libname}%{oldsoname} <= %{version} + %description Oniguruma is a regular expressions library. The characteristics of this library is that different character encoding for every regular expression object can be specified. (supported APIs: GNU regex, POSIX and Oniguruma native) -%if "%{name}" != "%{libname}" -%{name} is designed to be installed beside %{libname}. -%endif + +%{name} is designed to be installed beside %{libname} +and only used by PHP binaries (mbstring extension). %package devel Summary: Development files for %{name} Requires: %{name}%{?isa} = %{version}-%{release} -%if "%{name}" == "%{libname}" -Obsoletes: %{libname}%{soname}-devel <= %{version} -%else +Obsoletes: %{libname}%{oldsoname}-devel <= %{version} Conflicts: %{libname}-devel < %{version} Provides: %{libname}-devel = %{version}-%{release} -%endif %description devel The %{name}-devel package contains libraries and header files for @@ -70,6 +66,8 @@ developing applications that use %{name}. %setup -q -n onig-%{mainver} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in +%patch0 -p1 -b .bump + %if 0 for f in \ README.ja \ @@ -125,7 +123,7 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile %lang(ja) %doc README_japanese %lang(ja) %doc index_ja.html -%{_libdir}/libonig.so.%{soname}* +%{_libdir}/libonig.so.%{newsoname}* %files devel %doc doc/API @@ -149,6 +147,9 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile %changelog +* Thu May 28 2020 Remi Collet -6.9.5+rev1-1 +- rename to oniguruna5php and bump soname to 105 + * Thu May 14 2020 Remi Collet -6.9.5+rev1-1 - update to 6.9.5-rev1 (from Fedora) -- cgit