summaryrefslogtreecommitdiffstats
path: root/oniguruma.spec
diff options
context:
space:
mode:
Diffstat (limited to 'oniguruma.spec')
-rw-r--r--oniguruma.spec55
1 files changed, 45 insertions, 10 deletions
diff --git a/oniguruma.spec b/oniguruma.spec
index a14fab3..361482f 100644
--- a/oniguruma.spec
+++ b/oniguruma.spec
@@ -8,31 +8,52 @@
#
# 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
-
-# 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
+%else
+%global newsoname %{oldsoname}
+%endif
-%global mainver 6.9.8
+# 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-10 have 6.9.9, soname 5.4
+# 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.10
#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
# Bump soname from 5 to 105 to allow parallel installation
Patch0: onig-soname.patch
+# Fix memleaks
+Patch1: onig-6.9.9-fix-memleaks-initialize-memory.patch
BuildRequires: gcc
@@ -45,8 +66,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 +90,10 @@ 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
+%patch -P1 -p1 -b .leaks
%build
@@ -141,6 +167,15 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile
%changelog
+* Sat Jan 4 2025 Remi Collet <remi@remirepo.net> -6.9.10-1
+- update to 6.9.10
+
+* Fri Nov 15 2024 Remi Collet <remi@remirepo.net> -6.9.9-2
+- fix memory leaks, initialize memory (from EL-10)
+
+* 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