From 11b9813e50b4a6398f81de3a56c80ca31f41177a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Oct 2023 16:39:25 +0200 Subject: v6.9.9 --- compat_reports/6.9.8_to_6.9.9/compat_report.html | 479 +++++++++++++++++++++++ create-tarball-from-git.sh | 41 ++ libonig.xml | 2 +- onig-soname.patch | 6 +- oniguruma.spec | 43 +- 5 files changed, 558 insertions(+), 13 deletions(-) create mode 100644 compat_reports/6.9.8_to_6.9.9/compat_report.html create mode 100644 create-tarball-from-git.sh diff --git a/compat_reports/6.9.8_to_6.9.9/compat_report.html b/compat_reports/6.9.8_to_6.9.9/compat_report.html new file mode 100644 index 0000000..9a98a95 --- /dev/null +++ b/compat_reports/6.9.8_to_6.9.9/compat_report.html @@ -0,0 +1,479 @@ + + + + + + + + + + +libonig: 6.9.8 to 6.9.9 compatibility report + + + +

API compatibility report for the libonig library between 6.9.8 and 6.9.9 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibonig
Version #16.9.8
Version #26.9.9
Archx86_64
GCC Version12
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files3
Total Libraries1
Total Symbols / Types213 / 69
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  3 

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

Libraries  1 

+
+libonig.so.105.3.0
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibonig
Version #16.9.8
Version #26.9.9
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files3
Total Libraries1
Total Symbols / Types214 / 69
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  3 

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

Libraries  1 

+
+libonig.so.105.3.0
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/create-tarball-from-git.sh b/create-tarball-from-git.sh new file mode 100644 index 0000000..e23aadf --- /dev/null +++ b/create-tarball-from-git.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +set -e +set -x + +CURRENTDIR=$(pwd) +PKGNAME=oniguruma +TARNAME=onig + +TMPDIR=$(mktemp -d /var/tmp/$PKGNAME-XXXXXX) +pushd $TMPDIR + +GITSCM=https://github.com/kkos/$PKGNAME.git + +git clone $GITSCM +pushd $PKGNAME + +COMMIT=$(git log | head -n 1 | sed -e 's|^.*[ \t]||') +SHORTCOMMIT=$(echo $COMMIT | cut -c-7) +DATE=$(git show --format=%ci $COMMIT | head -n 1 | sed -e 's|[ \t].*$||') +SHORTDATE=$(echo $DATE | sed -e 's|-||g') +VERSION=$(cat configure.ac | grep AC_INIT | sed -n -e 's|^.*,[ \t]*\([0-9\.][0-9\.]*\).*$|\1|p') + +git log --format=fuller | head -n 12 + +echo "VERSION=$VERSION" +echo "COMMIT=$COMMIT" +echo "DATE=$DATE" + +echo +popd + +TARDIR=${TARNAME}-${VERSION}-${SHORTDATE}git${SHORTCOMMIT} +ln -sf $PKGNAME $TARDIR +tar czf ${TARDIR}.tar.gz ${TARDIR}/./ + +mv ${TARDIR}.tar.gz ${CURRENTDIR}/ +popd + +rm -rf $TMPDIR + diff --git a/libonig.xml b/libonig.xml index eb0207b..a2f9080 100644 --- a/libonig.xml +++ b/libonig.xml @@ -9,7 +9,7 @@ -6.9.8 +6.9.9 diff --git a/onig-soname.patch b/onig-soname.patch index 1dfb5a3..0d53253 100644 --- a/onig-soname.patch +++ b/onig-soname.patch @@ -1,12 +1,12 @@ diff -up ./configure.bump ./configure --- ./configure.bump 2020-11-05 10:04:52.680279189 +0100 +++ ./configure 2020-11-05 10:05:58.099066485 +0100 -@@ -12239,7 +12239,7 @@ CC=$lt_save_CC +@@ -12916,7 +12916,7 @@ CC=$lt_save_CC # Only expand once: --LTVERSION="8:0:3" -+LTVERSION="108:0:3" +-LTVERSION="9:0:4" ++LTVERSION="109:0:4" diff --git a/oniguruma.spec b/oniguruma.spec index a14fab3..5ea3411 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -8,26 +8,44 @@ # # Please preserve changelog entries # + +%if 0%{?rhel} +%bcond_without rename +%else +%bcond_with rename +%endif + %global libname oniguruma %global oldsoname 5 +%if %{with rename} %global newsoname 105 -%undefine _changelog_trimtime +%else +%global newsoname %{oldsoname} +%endif -# Fedora 29 have 6.9, soname 5 -# Fedora 28 have 6.8, soname 5 -# Fedora 27 have 6.6, soname 4 -# EPEL-7 have 5.9, soname 2 -# RHEL-6 have 5.9, soname 2 +# Fedora 38 have 6.9.9, soname 5.4 +# Fedora 35 have 6.9.8, soname 5.3 +# Fedora 34 have 6.9.7, soname 5.1 +# Fedora 34 have 6.9.6, soname 5.1 +# Fedora 35 have 6.9.5, soname 5.0 +# RHEL-9 have 6.9.6, soname 5.1 +# RHEL-8 have 6.8.2, soname 5.0 +# EPEL-7 have 6.8.2, soname 5.0 -%global mainver 6.9.8 +%global mainver 6.9.9 #global postver 1 +%if %{with rename} Name: %{libname}%{oldsoname}php +%else +Name: %{libname} +%endif Version: %{mainver}%{?postver:.%postver} Release: 1%{?dist} Summary: Regular expressions library -License: BSD +# SPDX confirmed +License: BSD-2-Clause URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?postver:.%postver}/onig-%{mainver}%{?postver:.%postver}.tar.gz @@ -45,8 +63,10 @@ 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 %{with rename} %{name} is designed to be installed beside %{libname} and only used by PHP binaries (mbstring extension). +%endif %package devel @@ -67,7 +87,9 @@ developing applications that use %{name}. %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in grep ^LTVERSION= configure -%patch0 -p1 -b .bump +%if %{with rename} +%patch -P0 -p1 -b .bump +%endif %build @@ -141,6 +163,9 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile %changelog +* Tue Oct 17 2023 Remi Collet -6.9.9-1 +- update to 6.9.9 + * Mon May 2 2022 Remi Collet -6.9.8-1 - update to 6.9.8 -- cgit