diff options
| -rw-r--r-- | compat_reports/6.9.8_to_6.9.9/compat_report.html | 479 | ||||
| -rw-r--r-- | create-tarball-from-git.sh | 41 | ||||
| -rw-r--r-- | libonig.xml | 2 | ||||
| -rw-r--r-- | onig-soname.patch | 6 | ||||
| -rw-r--r-- | oniguruma.spec | 43 |
5 files changed, 558 insertions, 13 deletions
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 @@ +<!-- kind:binary;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:0;tool_version:2.3 --> +<!-- kind:source;verdict:compatible;affected:0;added:0;removed:0;type_problems_high:0;type_problems_medium:0;type_problems_low:0;interface_problems_high:0;interface_problems_medium:0;interface_problems_low:0;changed_constants:0;tool_version:2.3 --> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="viewport" content="width=device-width,initial-scale=1" /> +<meta name="keywords" content="libonig, compatibility, API, ABI, report" /> +<meta name="description" content="API/ABI compatibility report for the libonig library between 6.9.8 and 6.9.9 versions" /> +<meta name="robots" content="noindex" /> +<title>libonig: 6.9.8 to 6.9.9 compatibility report</title> +<style type="text/css"> +body { + font-family:Arial, sans-serif; + background-color:White; + color:Black; +} +hr { + color:Black; + background-color:Black; + height:1px; + border:0; +} +h1 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.625em; +} +h2 { + margin-bottom:0px; + padding-bottom:0px; + font-size:1.25em; + white-space:nowrap; +} +span.section { + font-weight:bold; + cursor:pointer; + color:#003E69; + white-space:nowrap; + margin-left:0.3125em; +} +span.new_sign { + font-weight:bold; + margin-left:1.65em; + color:#003E69; +} +span.new_sign_lbl { + margin-left:3em; + font-size:1em; + color:Black; +} +span:hover.section { + color:#336699; +} +span.sect_aff { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:#cc3300; +} +span.sect_info { + cursor:pointer; + padding-left:1.55em; + font-size:0.875em; + color:Black; +} +span.ext { + font-weight:normal; +} +span.h_name { + color:#cc3300; + font-size:0.875em; + font-weight:bold; +} +div.h_list, div.lib_list { + font-size:0.94em; + padding-left:0.4em; +} +span.ns { + color:#408080; + font-size:0.94em; +} +span.lib_name { + color:Green; + font-size:0.875em; + font-weight:bold; +} +span.iname { + font-weight:bold; + color:#003E69; + margin-left:0.3125em; +} +span.iname_b { + font-weight:bold; +} +span.iname_a { + color:#333333; + font-weight:bold; + font-size:0.94em; +} +span.sym_p { + font-weight:normal; + white-space:normal; +} +span.sym_pd { + white-space:normal; +} +span.sym_p span, span.sym_pd span { + white-space:nowrap; +} +div.affect { + padding-left:1em; + padding-bottom:10px; + font-size:0.87em; + font-style:italic; + line-height:0.9em; +} +div.affected { + padding-left:1.9em; + padding-top:10px; +} +table.ptable { + border-collapse:collapse; + border:1px outset black; + margin-left:0.95em; + margin-top:3px; + margin-bottom:3px; + width:56.25em; +} +table.ptable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + text-align:left; + vertical-align:top; + max-width:28em; + word-wrap:break-word; +} +table.ptable th.pn { + width:2%; +} +table.ptable th.chg { + width:47%; +} +table.vtable { + border-collapse:collapse; + border:1px outset black; + margin-left:1.9em; + margin-top:0.7em; +} +table.vtable td { + border:1px solid gray; + padding:3px; + font-size:0.875em; + vertical-align:top; + max-width:450px; + word-wrap:break-word; +} +table.ptable th, table.vtable th { + background-color:#eeeeee; + font-weight:bold; + color:#333333; + font-family:Verdana, Arial; + font-size:0.875em; + border:1px solid gray; + text-align:center; + vertical-align:top; + white-space:nowrap; + padding:3px; +} +table.summary { + border-collapse:collapse; + border:1px outset black; +} +table.summary th { + background-color:#eeeeee; + font-weight:normal; + text-align:left; + font-size:0.94em; + white-space:nowrap; + border:1px inset gray; + padding:3px; +} +table.summary td { + text-align:right; + white-space:nowrap; + border:1px inset gray; + padding:3px 5px 3px 10px; +} +span.mngl { + padding-left:1em; + font-size:0.875em; + cursor:text; + color:#444444; + font-weight:bold; +} +span.pleft { + padding-left:2.5em; +} +span.sym_ver { + color:#333333; + white-space:nowrap; + font-family:"DejaVu Sans Mono", Monospace; +} +span.attr { + color:#333333; + font-weight:normal; +} +span.color_p { + font-style:italic; + color:Brown; +} +span.p { + font-style:italic; +} +span.fp { + font-style:italic; + background-color:#DCDCDC; +} +span.ttype { + font-weight:normal; +} +span.nowrap { + white-space:nowrap; +} +span.value { + font-weight:bold; +} +.passed { + background-color:#CCFFCC; + font-weight:normal; +} +.warning { + background-color:#F4F4AF; + font-weight:normal; +} +.failed { + background-color:#FFCCCC; + font-weight:normal; +} +.new { + background-color:#C6DEFF; + font-weight:normal; +} +.compatible { + background-color:#CCFFCC; + font-weight:normal; +} +.almost_compatible { + background-color:#FFDAA3; + font-weight:normal; +} +.incompatible { + background-color:#FFCCCC; + font-weight:normal; +} +.gray { + background-color:#DCDCDC; + font-weight:normal; +} +.top_ref { + font-size:0.69em; +} +.footer { + font-size:0.75em; +} + +.tabset { + float:left; +} +a.tab { + border:1px solid Black; + float:left; + margin:0px 5px -1px 0px; + padding:3px 5px 3px 5px; + position:relative; + font-size:0.875em; + background-color:#DDD; + text-decoration:none; + color:Black; +} +a.disabled:hover +{ + color:Black; + background:#EEE; +} +a.active:hover +{ + color:Black; + background:White; +} +a.active { + border-bottom-color:White; + background-color:White; +} +div.tab { + border-top:1px solid Black; + padding:0px; + width:100%; + clear:both; +} +</style> +<script type="text/javascript" language="JavaScript"> +<!-- +function showContent(header, id) +{ + e = document.getElementById(id); + if(e.style.display == 'none') + { + e.style.display = 'block'; + e.style.visibility = 'visible'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[−]"); + } + else + { + e.style.display = 'none'; + e.style.visibility = 'hidden'; + header.innerHTML = header.innerHTML.replace(/\[[^0-9 ]\]/gi,"[+]"); + } +} +function initTabs() +{ + var url = window.location.href; + if(url.indexOf('_Source_')!=-1 || url.indexOf('#Source')!=-1) + { + var tab1 = document.getElementById('BinaryID'); + var tab2 = document.getElementById('SourceID'); + tab1.className='tab disabled'; + tab2.className='tab active'; + } + var sets = document.getElementsByTagName('div'); + for (var i = 0; i < sets.length; i++) + { + if (sets[i].className.indexOf('tabset') != -1) + { + var tabs = []; + var links = sets[i].getElementsByTagName('a'); + for (var j = 0; j < links.length; j++) + { + if (links[j].className.indexOf('tab') != -1) + { + tabs.push(links[j]); + links[j].tabs = tabs; + var tab = document.getElementById(links[j].href.substr(links[j].href.indexOf('#') + 1)); + //reset all tabs on start + if (tab) + { + if (links[j].className.indexOf('active')!=-1) { + tab.style.display = 'block'; + } + else { + tab.style.display = 'none'; + } + } + links[j].onclick = function() + { + var tab = document.getElementById(this.href.substr(this.href.indexOf('#') + 1)); + if (tab) + { + //reset all tabs before change + for (var k = 0; k < this.tabs.length; k++) + { + document.getElementById(this.tabs[k].href.substr(this.tabs[k].href.indexOf('#') + 1)).style.display = 'none'; + this.tabs[k].className = this.tabs[k].className.replace('active', 'disabled'); + } + this.className = 'tab active'; + tab.style.display = 'block'; + // window.location.hash = this.id.replace('ID', ''); + return false; + } + } + } + } + } + } + if(url.indexOf('#')!=-1) { + location.href=location.href; + } +} +if (window.addEventListener) window.addEventListener('load', initTabs, false); +else if (window.attachEvent) window.attachEvent('onload', initTabs); +--> +</script> +</head> +<body><a name='Source'></a><a name='Binary'></a><a name='Top'></a><h1>API compatibility report for the <span style='color:Blue;'>libonig</span> library between <span style='color:Red;'>6.9.8</span> and <span style='color:Red;'>6.9.9</span> versions on <span style='color:Blue;'>x86_64</span></h1> + + <br/> + <div class='tabset'> + <a id='BinaryID' href='#BinaryTab' class='tab active'>Binary<br/>Compatibility</a> + <a id='SourceID' href='#SourceTab' style='margin-left:3px' class='tab disabled'>Source<br/>Compatibility</a> + </div><div id='BinaryTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libonig</td></tr> +<tr><th>Version #1</th><td>6.9.8</td></tr> +<tr><th>Version #2</th><td>6.9.9</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>GCC Version</th><td>12</td></tr> +<tr><th>Subject</th><td width='150px'>Binary Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>3</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>213 / 69</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td>0</td></tr> +</table> + +<a name='Headers'></a><h2>Header Files <span class='gray'> 3 </span></h2><hr/> +<div class='h_list'> +oniggnu.h<br/> +onigposix.h<br/> +oniguruma.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libonig.so.105.3.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><div id='SourceTab' class='tab'> +<h2>Test Info</h2><hr/> +<table class='summary'> +<tr><th>Library Name</th><td>libonig</td></tr> +<tr><th>Version #1</th><td>6.9.8</td></tr> +<tr><th>Version #2</th><td>6.9.9</td></tr> +<tr><th>Arch</th><td>x86_64</td></tr> +<tr><th>Subject</th><td width='150px'>Source Compatibility</td></tr> +</table> +<h2>Test Results</h2><hr/> +<table class='summary'><tr><th>Total Header Files</th><td><a href='#Headers' style='color:Blue;'>3</a></td></tr> +<tr><th>Total Libraries</th><td><a href='#Libs' style='color:Blue;'>1</a></td></tr> +<tr><th>Total Symbols / Types</th><td>214 / 69</td></tr> +<tr><th>Compatibility</th> +<td class='compatible'>100%</td> +</tr> +</table> +<h2>Problem Summary</h2><hr/> +<table class='summary'><tr><th></th><th style='text-align:center;'>Severity</th><th style='text-align:center;'>Count</th></tr><tr><th>Added Symbols</th><td>-</td><td>0</td></tr> +<tr><th>Removed Symbols</th><td>High</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Data Types</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th rowspan='3'>Problems with<br/>Symbols</th><td>High</td><td>0</td></tr> +<tr><td>Medium</td><td>0</td></tr> +<tr><td>Low</td><td>0</td></tr> +<tr><th>Problems with<br/>Constants</th><td>Low</td><td>0</td></tr> +</table> + +<a name='Headers'></a><h2>Header Files <span class='gray'> 3 </span></h2><hr/> +<div class='h_list'> +oniggnu.h<br/> +onigposix.h<br/> +oniguruma.h<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<a name='Libs'></a><h2>Libraries <span class='gray'> 1 </span></h2><hr/> +<div class='lib_list'> +libonig.so.105.3.0<br/> +</div> +<br/><a class='top_ref' href='#Top'>to the top</a><br/> +<br/><br/><br/></div><hr/> +<div class='footer' align='right'><i>Generated by <a href='https://github.com/lvc/abi-compliance-checker'>ABI Compliance Checker</a> 2.3  </i> +</div> +<br/> + +</body></html> 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 @@ <version> <!-- Version of the library --> -6.9.8 +6.9.9 </version> <headers> 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 <remi@remirepo.net> -6.9.9-1 +- update to 6.9.9 + * Mon May 2 2022 Remi Collet <remi@remirepo.net> -6.9.8-1 - update to 6.9.8 |