From 9d54a2d91ebe66cd274df76153dd71032cbeae02 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 02:18:53 +0000 Subject: [PATCH 01/31] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- oniguruma.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index 3f86a39..3a5596e 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -8,7 +8,7 @@ Name: oniguruma Version: %{mainver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist} +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 Summary: Regular expressions library License: BSD @@ -61,7 +61,7 @@ done --disable-silent-rules \ --disable-static \ --with-rubydir=%{_bindir} -%{__make} %{?_smp_mflags} +%make_build %install @@ -111,6 +111,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Jul 14 2020 Tom Stellard - 6.9.5-2.rev1.1 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Wed Jul 1 2020 Jeff Law - 6.9.5-2.rev1 - Disable LTO From 725ebe385188d2f059192b08ba6013e72739fa43 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 12 Oct 2020 15:36:39 +0900 Subject: [PATCH 02/31] 6.9.2 rc2 Apply upstream patch to keep binary compatibility with 6.9.5 --- .gitignore | 1 + ...ncompatibilty-between-6.9.5_rev1-6.9.patch | 29 +++++++++++++++++ oniguruma-XXX-CVE-2020-26159.patch | 22 ------------- oniguruma.spec | 32 +++++++------------ sources | 2 +- 5 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch delete mode 100644 oniguruma-XXX-CVE-2020-26159.patch diff --git a/.gitignore b/.gitignore index c706dfb..b115ad2 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ onig-5.9.2.tar.gz /onig-6.9.4-rc3.tar.gz /onig-6.9.4.tar.gz /onig-6.9.5-rev1.tar.gz +/onig-6.9.6-rc2.tar.gz diff --git a/0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch b/0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch new file mode 100644 index 0000000..cade98f --- /dev/null +++ b/0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch @@ -0,0 +1,29 @@ +From 43ec867797b765804d9c2ede8860bc871d1c5a58 Mon Sep 17 00:00:00 2001 +From: "K.Kosako" +Date: Mon, 12 Oct 2020 14:45:01 +0900 +Subject: [PATCH] fix #219: Binary incompatibilty between 6.9.5_rev1 -> + 6.9.2_rc2: reg_number_of_names + +--- + src/regposix.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/regposix.c b/src/regposix.c +index 87b2819..497ba02 100644 +--- a/src/regposix.c ++++ b/src/regposix.c +@@ -376,4 +376,10 @@ reg_foreach_name(onig_posix_regex_t* reg, + return onig_posix_reg_foreach_name(reg, func, arg); + } + +-#endif ++extern int ++reg_number_of_names(onig_posix_regex_t* reg) ++{ ++ return onig_posix_reg_number_of_names(reg); ++} ++ ++#endif /* USE_BINARY_COMPATIBLE_POSIX_API */ +-- +2.28.0 + diff --git a/oniguruma-XXX-CVE-2020-26159.patch b/oniguruma-XXX-CVE-2020-26159.patch deleted file mode 100644 index 71a8ada..0000000 --- a/oniguruma-XXX-CVE-2020-26159.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0 Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Mon, 21 Sep 2020 12:58:29 +0900 -Subject: [PATCH] #207: Out-of-bounds write - ---- - src/regcomp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/regcomp.c b/src/regcomp.c -index f6494b6d..a0a68561 100644 ---- a/src/regcomp.c -+++ b/src/regcomp.c -@@ -6257,7 +6257,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc) - - for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) { - len = enclen(enc, p); -- if (i + len > OPT_EXACT_MAXLEN) break; -+ if (i + len >= OPT_EXACT_MAXLEN) break; - for (j = 0; j < len && p < end; j++) - to->s[i++] = *p++; - } diff --git a/oniguruma.spec b/oniguruma.spec index 475e85d..0ac626a 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,10 +1,10 @@ %undefine _changelog_trimtime -%global mainver 6.9.5 -%global betaver rev1 -%undefine prerelease +%global mainver 6.9.6 +%global betaver rc2 +%define prerelease 1 -%global fedorarel 3 +%global fedorarel 1 Name: oniguruma Version: %{mainver} @@ -14,9 +14,8 @@ Summary: Regular expressions library License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz -# https://github.com/kkos/oniguruma/commit/cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0 -# https://github.com/kkos/oniguruma/issues/207 -Patch1: oniguruma-XXX-CVE-2020-26159.patch +# Upstream patches +Patch1: 0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch BuildRequires: gcc @@ -38,21 +37,9 @@ developing applications that use %{name}. %prep %setup -q -n onig-%{mainver} +%patch1 -p1 -b .compati %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in -%patch1 -p1 -b .CVE-2020-26159 -%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 @@ -62,6 +49,7 @@ done %configure \ --enable-posix-api \ + --enable-binary-compatible-posix-api \ --disable-silent-rules \ --disable-static \ --with-rubydir=%{_bindir} @@ -115,6 +103,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Oct 12 2020 Mamoru TASAKA - 6.9.6-0.1.rc2 +- 6.9.2 rc2 +- Apply upstream patch to keep binary compatibility with 6.9.5 + * Thu Oct 1 2020 Mamoru TASAKA - 6.9.5-3.rev1 - Apply upstream fix for CVE-2020-26159 diff --git a/sources b/sources index 61da54f..f7f33d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.5-rev1.tar.gz) = d45208f0fc48aab7104601282d68e6d074c0fd74d5791adc35d5b89c7d5a5d34548bff831a606f302e20ae8d5928802bd0965e587f60b162b7cb2b45a66e9c1f +SHA512 (onig-6.9.6-rc2.tar.gz) = 943c4cd3ddab5a41320b61541a5d83b172781871e9478a2c40ed4422877943e2f7c70cb7ef52e31b1836026b35a431b423fa464edde7796b520637c182741fd7 From ada21b9ab9443368d26fa3ac62305ccfc808ef74 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 17 Oct 2020 11:21:44 +0900 Subject: [PATCH 03/31] 6.9.2 rc3 --- .gitignore | 1 + ...ncompatibilty-between-6.9.5_rev1-6.9.patch | 29 ------------------- oniguruma.spec | 10 +++---- sources | 2 +- 4 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch diff --git a/.gitignore b/.gitignore index b115ad2..e6292b0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ onig-5.9.2.tar.gz /onig-6.9.4.tar.gz /onig-6.9.5-rev1.tar.gz /onig-6.9.6-rc2.tar.gz +/onig-6.9.6-rc3.tar.gz diff --git a/0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch b/0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch deleted file mode 100644 index cade98f..0000000 --- a/0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 43ec867797b765804d9c2ede8860bc871d1c5a58 Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Mon, 12 Oct 2020 14:45:01 +0900 -Subject: [PATCH] fix #219: Binary incompatibilty between 6.9.5_rev1 -> - 6.9.2_rc2: reg_number_of_names - ---- - src/regposix.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/regposix.c b/src/regposix.c -index 87b2819..497ba02 100644 ---- a/src/regposix.c -+++ b/src/regposix.c -@@ -376,4 +376,10 @@ reg_foreach_name(onig_posix_regex_t* reg, - return onig_posix_reg_foreach_name(reg, func, arg); - } - --#endif -+extern int -+reg_number_of_names(onig_posix_regex_t* reg) -+{ -+ return onig_posix_reg_number_of_names(reg); -+} -+ -+#endif /* USE_BINARY_COMPATIBLE_POSIX_API */ --- -2.28.0 - diff --git a/oniguruma.spec b/oniguruma.spec index 0ac626a..568fffc 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,10 +1,10 @@ %undefine _changelog_trimtime %global mainver 6.9.6 -%global betaver rc2 +%global betaver rc3 %define prerelease 1 -%global fedorarel 1 +%global fedorarel 2 Name: oniguruma Version: %{mainver} @@ -14,8 +14,6 @@ Summary: Regular expressions library License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz -# Upstream patches -Patch1: 0001-fix-219-Binary-incompatibilty-between-6.9.5_rev1-6.9.patch BuildRequires: gcc @@ -37,7 +35,6 @@ developing applications that use %{name}. %prep %setup -q -n onig-%{mainver} -%patch1 -p1 -b .compati %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in @@ -103,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Oct 17 2020 Mamoru TASAKA - 6.9.6-0.2.rc3 +- 6.9.2 rc3 + * Mon Oct 12 2020 Mamoru TASAKA - 6.9.6-0.1.rc2 - 6.9.2 rc2 - Apply upstream patch to keep binary compatibility with 6.9.5 diff --git a/sources b/sources index f7f33d2..11498ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.6-rc2.tar.gz) = 943c4cd3ddab5a41320b61541a5d83b172781871e9478a2c40ed4422877943e2f7c70cb7ef52e31b1836026b35a431b423fa464edde7796b520637c182741fd7 +SHA512 (onig-6.9.6-rc3.tar.gz) = 8788f6751040c7303a12147adb6f7d1d0c814eee48b58640f7ba3bfa8e68bbaf663c855cec49e957b2e97a4a023996c054dc4f9248cd316024d80c49e46d7bbe From be9c06363d50608a529e790527b861b1ba92f0b1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 20 Oct 2020 16:23:53 +0900 Subject: [PATCH 04/31] Apply upstream patch for upstream bug 221 Revert change for false CVE-2020-26159 issue --- oniguruma-6.9.6-upstream-bug221.patch | 32 +++++++++++++++++++++++++++ oniguruma.spec | 10 ++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 oniguruma-6.9.6-upstream-bug221.patch diff --git a/oniguruma-6.9.6-upstream-bug221.patch b/oniguruma-6.9.6-upstream-bug221.patch new file mode 100644 index 0000000..7b4a487 --- /dev/null +++ b/oniguruma-6.9.6-upstream-bug221.patch @@ -0,0 +1,32 @@ +From 3603d78f0a3dc80e4d450509120c26a5ffcd293b Mon Sep 17 00:00:00 2001 +From: "K.Kosako" +Date: Tue, 20 Oct 2020 11:52:27 +0900 +Subject: [PATCH] #221: revert cbe9f8b and 8155473: Out-of-bounds write in #207 + (Issues found with Coverity) is fake + +--- + src/regcomp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/regcomp.c b/src/regcomp.c +index 30b982bb..7aee715f 100644 +--- a/src/regcomp.c ++++ b/src/regcomp.c +@@ -6238,7 +6238,7 @@ concat_opt_exact(OptStr* to, OptStr* add, OnigEncoding enc) + end = p + add->len; + for (i = to->len; p < end; ) { + len = enclen(enc, p); +- if (i + len >= OPT_EXACT_MAXLEN) { ++ if (i + len > OPT_EXACT_MAXLEN) { + r = 1; /* 1:full */ + break; + } +@@ -6264,7 +6264,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc) + + for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) { + len = enclen(enc, p); +- if (i + len >= OPT_EXACT_MAXLEN) break; ++ if (i + len > OPT_EXACT_MAXLEN) break; + for (j = 0; j < len && p < end; j++) + to->s[i++] = *p++; + } diff --git a/oniguruma.spec b/oniguruma.spec index 568fffc..bcb7835 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -4,7 +4,7 @@ %global betaver rc3 %define prerelease 1 -%global fedorarel 2 +%global fedorarel 3 Name: oniguruma Version: %{mainver} @@ -14,6 +14,9 @@ Summary: Regular expressions library License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz +# https://github.com/kkos/oniguruma/issues/221 +# https://github.com/kkos/oniguruma/commit/3603d78f0a3dc80e4d450509120c26a5ffcd293b +Patch0: oniguruma-6.9.6-upstream-bug221.patch BuildRequires: gcc @@ -35,6 +38,7 @@ developing applications that use %{name}. %prep %setup -q -n onig-%{mainver} +%patch0 -p1 -b .up221 %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in @@ -100,6 +104,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Oct 20 2020 Mamoru TASAKA - 6.9.6-0.3.rc3 +- Apply upstream patch for upstream bug 221 + - Revert change for false CVE-2020-26159 issue + * Sat Oct 17 2020 Mamoru TASAKA - 6.9.6-0.2.rc3 - 6.9.2 rc3 From 26779ee860690989a9e28acd2be1b0c6a318ac40 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 20 Oct 2020 22:14:12 +0900 Subject: [PATCH 05/31] add URL reference --- oniguruma.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/oniguruma.spec b/oniguruma.spec index bcb7835..a9a45f0 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -107,6 +107,7 @@ find $RPM_BUILD_ROOT -name '*.la' \ * Tue Oct 20 2020 Mamoru TASAKA - 6.9.6-0.3.rc3 - Apply upstream patch for upstream bug 221 - Revert change for false CVE-2020-26159 issue + https://github.com/kkos/oniguruma/issues/221 * Sat Oct 17 2020 Mamoru TASAKA - 6.9.6-0.2.rc3 - 6.9.2 rc3 From 35fac660e05dd74f6cc7e29f5ee46ae00053f5d3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 21 Oct 2020 23:31:01 +0900 Subject: [PATCH 06/31] 6.9.2 rc4 --- .gitignore | 1 + oniguruma-6.9.6-upstream-bug221.patch | 32 --------------------------- oniguruma.spec | 11 +++++---- sources | 2 +- 4 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 oniguruma-6.9.6-upstream-bug221.patch diff --git a/.gitignore b/.gitignore index e6292b0..b1385bb 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ onig-5.9.2.tar.gz /onig-6.9.5-rev1.tar.gz /onig-6.9.6-rc2.tar.gz /onig-6.9.6-rc3.tar.gz +/onig-6.9.6-rc4.tar.gz diff --git a/oniguruma-6.9.6-upstream-bug221.patch b/oniguruma-6.9.6-upstream-bug221.patch deleted file mode 100644 index 7b4a487..0000000 --- a/oniguruma-6.9.6-upstream-bug221.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3603d78f0a3dc80e4d450509120c26a5ffcd293b Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Tue, 20 Oct 2020 11:52:27 +0900 -Subject: [PATCH] #221: revert cbe9f8b and 8155473: Out-of-bounds write in #207 - (Issues found with Coverity) is fake - ---- - src/regcomp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/regcomp.c b/src/regcomp.c -index 30b982bb..7aee715f 100644 ---- a/src/regcomp.c -+++ b/src/regcomp.c -@@ -6238,7 +6238,7 @@ concat_opt_exact(OptStr* to, OptStr* add, OnigEncoding enc) - end = p + add->len; - for (i = to->len; p < end; ) { - len = enclen(enc, p); -- if (i + len >= OPT_EXACT_MAXLEN) { -+ if (i + len > OPT_EXACT_MAXLEN) { - r = 1; /* 1:full */ - break; - } -@@ -6264,7 +6264,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc) - - for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) { - len = enclen(enc, p); -- if (i + len >= OPT_EXACT_MAXLEN) break; -+ if (i + len > OPT_EXACT_MAXLEN) break; - for (j = 0; j < len && p < end; j++) - to->s[i++] = *p++; - } diff --git a/oniguruma.spec b/oniguruma.spec index a9a45f0..eb77af8 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,10 +1,10 @@ %undefine _changelog_trimtime %global mainver 6.9.6 -%global betaver rc3 +%global betaver rc4 %define prerelease 1 -%global fedorarel 3 +%global fedorarel 4 Name: oniguruma Version: %{mainver} @@ -14,9 +14,6 @@ Summary: Regular expressions library License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz -# https://github.com/kkos/oniguruma/issues/221 -# https://github.com/kkos/oniguruma/commit/3603d78f0a3dc80e4d450509120c26a5ffcd293b -Patch0: oniguruma-6.9.6-upstream-bug221.patch BuildRequires: gcc @@ -38,7 +35,6 @@ developing applications that use %{name}. %prep %setup -q -n onig-%{mainver} -%patch0 -p1 -b .up221 %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in @@ -104,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Oct 21 2020 Mamoru TASAKA - 6.9.6-0.4.rc4 +- 6.9.2 rc4 + * Tue Oct 20 2020 Mamoru TASAKA - 6.9.6-0.3.rc3 - Apply upstream patch for upstream bug 221 - Revert change for false CVE-2020-26159 issue diff --git a/sources b/sources index 11498ef..15d2dc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.6-rc3.tar.gz) = 8788f6751040c7303a12147adb6f7d1d0c814eee48b58640f7ba3bfa8e68bbaf663c855cec49e957b2e97a4a023996c054dc4f9248cd316024d80c49e46d7bbe +SHA512 (onig-6.9.6-rc4.tar.gz) = 3fdee2986c1e2049d72372692ca8d0d3afa0c4a853b2e30bf7f26409179fcbca92ee5a3b66ec8c8eb4b7084207b9584fbbd07955ddd5b085da1a299f9b602ebf From 71df75abe3be8b907050d98f33ddd54fd5e33307 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 Nov 2020 15:50:08 +0900 Subject: [PATCH 07/31] 6.9.2 rc4 --- oniguruma.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index eb77af8..7997ed9 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,10 +1,10 @@ %undefine _changelog_trimtime %global mainver 6.9.6 -%global betaver rc4 -%define prerelease 1 +#%%global betaver rc4 +#%%define prerelease 1 -%global fedorarel 4 +%global fedorarel 1 Name: oniguruma Version: %{mainver} @@ -100,8 +100,11 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Nov 5 2020 Mamoru TASAKA - 6.9.6-1 +- 6.9.6 + * Wed Oct 21 2020 Mamoru TASAKA - 6.9.6-0.4.rc4 -- 6.9.2 rc4 +- 6.9.6 rc4 * Tue Oct 20 2020 Mamoru TASAKA - 6.9.6-0.3.rc3 - Apply upstream patch for upstream bug 221 @@ -109,10 +112,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ https://github.com/kkos/oniguruma/issues/221 * Sat Oct 17 2020 Mamoru TASAKA - 6.9.6-0.2.rc3 -- 6.9.2 rc3 +- 6.9.6 rc3 * Mon Oct 12 2020 Mamoru TASAKA - 6.9.6-0.1.rc2 -- 6.9.2 rc2 +- 6.9.6 rc2 - Apply upstream patch to keep binary compatibility with 6.9.5 * Thu Oct 1 2020 Mamoru TASAKA - 6.9.5-3.rev1 From bf259564dc7514540bf540a2460d0baf163ea4bc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 5 Nov 2020 15:50:45 +0900 Subject: [PATCH 08/31] 6.9.6 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b1385bb..c92d174 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ onig-5.9.2.tar.gz /onig-6.9.6-rc2.tar.gz /onig-6.9.6-rc3.tar.gz /onig-6.9.6-rc4.tar.gz +/onig-6.9.6.tar.gz diff --git a/sources b/sources index 15d2dc0..fe38b65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.6-rc4.tar.gz) = 3fdee2986c1e2049d72372692ca8d0d3afa0c4a853b2e30bf7f26409179fcbca92ee5a3b66ec8c8eb4b7084207b9584fbbd07955ddd5b085da1a299f9b602ebf +SHA512 (onig-6.9.6.tar.gz) = eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc From ae2cc750164fe0644ee3f5609e7187c4d94f70a7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:26:08 +0000 Subject: [PATCH 09/31] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- oniguruma.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/oniguruma.spec b/oniguruma.spec index 7997ed9..1b35e8b 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -15,6 +15,7 @@ License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz +BuildRequires: make BuildRequires: gcc %description From 19705e368ac03cfdd8e48ad509fd658804d468b3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 23 Jan 2021 15:34:43 +0900 Subject: [PATCH 10/31] indentation --- oniguruma.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 1b35e8b..1cd0fde 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -15,7 +15,7 @@ License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz -BuildRequires: make +BuildRequires: make BuildRequires: gcc %description From bacfbd47192c735a35c121f7fa79e2d5c098460b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 22:23:04 +0000 Subject: [PATCH 11/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index c9b18a4..7bfb90c 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -8,7 +8,7 @@ Name: oniguruma Version: %{mainver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.2 Summary: Regular expressions library License: BSD @@ -101,6 +101,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 6.9.6-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Nov 5 2020 Mamoru TASAKA - 6.9.6-1 - 6.9.6 From e3b7a985dec92484392a3ef6aa27996c22d87173 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 1 May 2021 22:29:04 +0900 Subject: [PATCH 12/31] 6.9.7.1 --- .gitignore | 1 + oniguruma.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c92d174..775af5b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ onig-5.9.2.tar.gz /onig-6.9.6-rc3.tar.gz /onig-6.9.6-rc4.tar.gz /onig-6.9.6.tar.gz +/onig-6.9.7.1.tar.gz diff --git a/oniguruma.spec b/oniguruma.spec index 7bfb90c..b96d221 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,19 +1,20 @@ %undefine _changelog_trimtime -%global mainver 6.9.6 +%global mainver 6.9.7 +%global postver 1 #%%global betaver rc4 #%%define prerelease 1 %global fedorarel 1 Name: oniguruma -Version: %{mainver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.2 +Version: %{mainver}%{?postver:.%postver} +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist} Summary: Regular expressions library License: BSD URL: https://github.com/kkos/oniguruma/ -Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz +Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}.tar.gz BuildRequires: make BuildRequires: gcc @@ -101,6 +102,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat May 1 2021 Mamoru TASAKA - 6.9.7.1-1 +- 6.9.7.1 + * Tue Jan 26 2021 Fedora Release Engineering - 6.9.6-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index fe38b65..4a8c336 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.6.tar.gz) = eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc +SHA512 (onig-6.9.7.1.tar.gz) = 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486 From 632725d0559e11127435ae67ab2e62ac3f632304 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 17:05:49 +0000 Subject: [PATCH 13/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index b96d221..cbd6527 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -9,7 +9,7 @@ Name: oniguruma Version: %{mainver}%{?postver:.%postver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist} +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 Summary: Regular expressions library License: BSD @@ -102,6 +102,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 6.9.7.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat May 1 2021 Mamoru TASAKA - 6.9.7.1-1 - 6.9.7.1 From 19e0f94287cd9505fde14f43ecb8df95234047f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 22:13:40 +0000 Subject: [PATCH 14/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index cbd6527..73129b1 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -9,7 +9,7 @@ Name: oniguruma Version: %{mainver}%{?postver:.%postver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.2 Summary: Regular expressions library License: BSD @@ -102,6 +102,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 6.9.7.1-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 6.9.7.1-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b8614c1610c968f2fca5d5f4f24456973725bcc8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 30 Apr 2022 11:55:18 +0900 Subject: [PATCH 15/31] 6.9.8 --- .gitignore | 33 +-------------------------------- oniguruma.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 775af5b..64f18ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1 @@ -onig-5.9.2.tar.gz -/onig-5.9.3.tar.gz -/onig-5.9.4.tar.gz -/onig-5.9.5.tar.gz -/onig-5.9.6.tar.gz -/onig-6.0.0.tar.gz -/onig-6.1.1.tar.gz -/onig-6.1.2.tar.gz -/onig-6.1.3.tar.gz -/onig-6.2.0.tar.gz -/onig-6.3.0.tar.gz -/onig-6.4.0.tar.gz -/onig-6.5.0.tar.gz -/onig-6.6.1.tar.gz -/onig-6.7.0.tar.gz -/onig-6.7.1.tar.gz -/onig-6.8.1.tar.gz -/onig-6.8.2.tar.gz -/onig-6.9.0.tar.gz -/onig-6.9.1.tar.gz -/onig-6.9.2-rc3.tar.gz -/onig-6.9.2.tar.gz -/onig-6.9.3.tar.gz -/onig-6.9.4-rc1.tar.gz -/onig-6.9.4-rc3.tar.gz -/onig-6.9.4.tar.gz -/onig-6.9.5-rev1.tar.gz -/onig-6.9.6-rc2.tar.gz -/onig-6.9.6-rc3.tar.gz -/onig-6.9.6-rc4.tar.gz -/onig-6.9.6.tar.gz -/onig-6.9.7.1.tar.gz +/onig-*.tar.gz diff --git a/oniguruma.spec b/oniguruma.spec index 73129b1..25d5b36 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,7 +1,7 @@ %undefine _changelog_trimtime -%global mainver 6.9.7 -%global postver 1 +%global mainver 6.9.8 +#%%global postver 1 #%%global betaver rc4 #%%define prerelease 1 @@ -9,7 +9,7 @@ Name: oniguruma Version: %{mainver}%{?postver:.%postver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.2 +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist} Summary: Regular expressions library License: BSD @@ -102,6 +102,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Apr 30 2022 Mamoru TASAKA - 6.9.8-1 +- 6.9.8 + * Thu Jan 20 2022 Fedora Release Engineering - 6.9.7.1-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 4a8c336..29fe7ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.7.1.tar.gz) = 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486 +SHA512 (onig-6.9.8.tar.gz) = 5a3d220961c22cda981bbae06dc383401771362cdf67e4f0b5d2fa8951a03907362edae498f63226287e70715c0abe4acdd22ec3ceb74bbb226234a52c36a4d7 From 857f74a2208d0d512e0678c24cbd0d5f52ba6ecd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:54:31 +0000 Subject: [PATCH 16/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 25d5b36..cf210af 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -9,7 +9,7 @@ Name: oniguruma Version: %{mainver}%{?postver:.%postver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist} +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 Summary: Regular expressions library License: BSD @@ -102,6 +102,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 6.9.8-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Apr 30 2022 Mamoru TASAKA - 6.9.8-1 - 6.9.8 From b79285c02e5a4e320458b89d8ffed17779210f38 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 23 Sep 2022 15:14:05 +0900 Subject: [PATCH 17/31] Update to the latest git, expecially: Update to Unicode 15.0 (upstream #272) [[:punct:]] behavoir change (upsteam #268) --- create-tarball-from-git.sh | 41 ++++++++++++++++++++++++++++++++++++++ oniguruma.spec | 38 +++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 create-tarball-from-git.sh diff --git a/create-tarball-from-git.sh b/create-tarball-from-git.sh new file mode 100644 index 0000000..a4a5e0a --- /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}-D${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/oniguruma.spec b/oniguruma.spec index cf210af..889e203 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,23 +1,44 @@ %undefine _changelog_trimtime +%global git_snapshot 1 + +%if 0%{?git_snapshot} +%define apply_git_patch git am +%else +%define apply_git_patch patch -p1 +%endif + +%if 0%{?git_snapshot} +%global gitdate 20220919 +%global gitcommit b041f6dd9967531cf396a684194d67dc2e7480f7 +%global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) + +%global gitversion D%{gitdate}git%{shortcommit} +%endif + %global mainver 6.9.8 #%%global postver 1 #%%global betaver rc4 #%%define prerelease 1 -%global fedorarel 1 +%global fedorarel 2 Name: oniguruma Version: %{mainver}%{?postver:.%postver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?gitversion:.%{?gitversion}}%{?dist} Summary: Regular expressions library License: BSD URL: https://github.com/kkos/oniguruma/ -Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}.tar.gz +Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}%{?gitversion:-%{?gitversion}}.tar.gz +Source1: create-tarball-from-git.sh BuildRequires: make BuildRequires: gcc +%if 0%{?git_snapshot} +BuildRequires: automake +BuildRequires: libtool +%endif %description Oniguruma is a regular expressions library. @@ -36,7 +57,7 @@ developing applications that use %{name}. %prep -%setup -q -n onig-%{mainver} +%setup -q -n onig-%{mainver}%{?gitversion:-%{?gitversion}} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in @@ -46,6 +67,10 @@ developing applications that use %{name}. # Disable LTO %define _lto_cflags %{nil} +%if 0%{?git_snapshot} +autoreconf -fi +%endif + %configure \ --enable-posix-api \ --enable-binary-compatible-posix-api \ @@ -102,6 +127,11 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Sep 23 2022 Mamoru TASAKA - 6.9.8-2.D20220919gitb041f6d +- Update to the latest git, expecially: + - Update to Unicode 15.0 (upstream #272) + - [[:punct:]] behavoir change (upsteam #268) + * Fri Jul 22 2022 Fedora Release Engineering - 6.9.8-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 29fe7ad..f3c3ae2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.8.tar.gz) = 5a3d220961c22cda981bbae06dc383401771362cdf67e4f0b5d2fa8951a03907362edae498f63226287e70715c0abe4acdd22ec3ceb74bbb226234a52c36a4d7 +SHA512 (onig-6.9.8-D20220919gitb041f6d.tar.gz) = 8319e0c034e3e10ebcb4eeac09a2e6edd473128b85d0c26c24228a934d6bfd87a35e9bf89561d55b8210bae58130cf356a94fc532ed3abfbb3eb0e4360d0ab0d From 142b067fb41bc310d39dcd09cebaa25efc43fe3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:40:21 +0000 Subject: [PATCH 18/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 889e203..3147295 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -25,7 +25,7 @@ Name: oniguruma Version: %{mainver}%{?postver:.%postver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?gitversion:.%{?gitversion}}%{?dist} +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?gitversion:.%{?gitversion}}%{?dist}.1 Summary: Regular expressions library License: BSD @@ -127,6 +127,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 6.9.8-2.D20220919gitb041f6d.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Sep 23 2022 Mamoru TASAKA - 6.9.8-2.D20220919gitb041f6d - Update to the latest git, expecially: - Update to Unicode 15.0 (upstream #272) From b65ded101c39c173e345e13527877a205a827e7f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:20:10 +0900 Subject: [PATCH 19/31] rename release macro to make rpmdev-bumprelease work --- oniguruma.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index 3147295..50bcba1 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,11 +21,11 @@ #%%global betaver rc4 #%%define prerelease 1 -%global fedorarel 2 +%global baserelease 2 Name: oniguruma Version: %{mainver}%{?postver:.%postver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?gitversion:.%{?gitversion}}%{?dist}.1 +Release: %{?prerelease:0.}%{baserelease}%{?betaver:.%betaver}%{?gitversion:.%{?gitversion}}%{?dist}.1 Summary: Regular expressions library License: BSD From b0e60f2d10a4d31dcd9ce31b65de723f9c36e385 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 21 Mar 2023 14:51:19 +0900 Subject: [PATCH 20/31] SPDX confirmed --- oniguruma.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 50bcba1..a5c01a7 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -28,7 +28,8 @@ Version: %{mainver}%{?postver:.%postver} Release: %{?prerelease:0.}%{baserelease}%{?betaver:.%betaver}%{?gitversion:.%{?gitversion}}%{?dist}.1 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}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}%{?gitversion:-%{?gitversion}}.tar.gz Source1: create-tarball-from-git.sh From 23331d4a51fe91499c696d71b601d08448d56748 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 6 May 2023 21:31:54 +0900 Subject: [PATCH 21/31] Update to the latest git --- create-tarball-from-git.sh | 2 +- oniguruma.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/create-tarball-from-git.sh b/create-tarball-from-git.sh index a4a5e0a..e23aadf 100644 --- a/create-tarball-from-git.sh +++ b/create-tarball-from-git.sh @@ -30,7 +30,7 @@ echo "DATE=$DATE" echo popd -TARDIR=${TARNAME}-${VERSION}-D${SHORTDATE}git${SHORTCOMMIT} +TARDIR=${TARNAME}-${VERSION}-${SHORTDATE}git${SHORTCOMMIT} ln -sf $PKGNAME $TARDIR tar czf ${TARDIR}.tar.gz ${TARDIR}/./ diff --git a/oniguruma.spec b/oniguruma.spec index a5c01a7..bfe961b 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -9,11 +9,11 @@ %endif %if 0%{?git_snapshot} -%global gitdate 20220919 -%global gitcommit b041f6dd9967531cf396a684194d67dc2e7480f7 +%global gitdate 20230501 +%global gitcommit 41a3b802af2155eef6d648aa3608e39605110642 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global gitversion D%{gitdate}git%{shortcommit} +%global gitversion %{gitdate}git%{shortcommit} %endif %global mainver 6.9.8 @@ -21,11 +21,11 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 2 +%global baserelease 1 Name: oniguruma -Version: %{mainver}%{?postver:.%postver} -Release: %{?prerelease:0.}%{baserelease}%{?betaver:.%betaver}%{?gitversion:.%{?gitversion}}%{?dist}.1 +Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} +Release: %{?prerelease:0.}%{baserelease}%{?dist} Summary: Regular expressions library # SPDX confirmed @@ -80,7 +80,6 @@ autoreconf -fi --with-rubydir=%{_bindir} %make_build - %install %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ @@ -128,6 +127,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat May 6 2023 Mamoru TASAKA - 6.9.8^20230501git41a3b80-1 +- Update to the latest git + * Thu Jan 19 2023 Fedora Release Engineering - 6.9.8-2.D20220919gitb041f6d.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index f3c3ae2..a855772 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.8-D20220919gitb041f6d.tar.gz) = 8319e0c034e3e10ebcb4eeac09a2e6edd473128b85d0c26c24228a934d6bfd87a35e9bf89561d55b8210bae58130cf356a94fc532ed3abfbb3eb0e4360d0ab0d +SHA512 (onig-6.9.8-20230501git41a3b80.tar.gz) = ea31fe43bb1803d34956e21ac022d8b2f90257f6e74819c78e679c85865d451725fdb8089c268dc988c125457d5f40a2c10b4e355a2c8197839b4ea32f0fa0a5 From fcb7e3ffee8e899ef5f77f6ed43753ccc175b681 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:53:35 +0000 Subject: [PATCH 22/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index bfe961b..bffa31b 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 1 +%global baserelease 2 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -127,6 +127,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 6.9.8^20230501git41a3b80-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat May 6 2023 Mamoru TASAKA - 6.9.8^20230501git41a3b80-1 - Update to the latest git From 001e04fef4d168e35e23bf3eded3afbc8c513d12 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 17 Oct 2023 15:36:16 +0900 Subject: [PATCH 23/31] 6.9.9 --- oniguruma.spec | 18 +++++++++--------- sources | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index bffa31b..21b41e3 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ %undefine _changelog_trimtime -%global git_snapshot 1 +%global git_snapshot 0 %if 0%{?git_snapshot} %define apply_git_patch git am @@ -16,12 +16,12 @@ %global gitversion %{gitdate}git%{shortcommit} %endif -%global mainver 6.9.8 +%global mainver 6.9.9 #%%global postver 1 #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 2 +%global baserelease 1 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -77,15 +77,12 @@ autoreconf -fi --enable-binary-compatible-posix-api \ --disable-silent-rules \ --disable-static \ - --with-rubydir=%{_bindir} + --with-rubydir=%{_bindir} \ + %{nil} %make_build %install -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - INSTALL="%{__install} -c -p" -find $RPM_BUILD_ROOT -name '*.la' \ - -exec %{__rm} -f {} ';' +%make_install %check %{__make} check @@ -127,6 +124,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Oct 17 2023 Mamoru TASAKA - 6.9.9-1 +- 6.9.9 + * Thu Jul 20 2023 Fedora Release Engineering - 6.9.8^20230501git41a3b80-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index a855772..20063b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.8-20230501git41a3b80.tar.gz) = ea31fe43bb1803d34956e21ac022d8b2f90257f6e74819c78e679c85865d451725fdb8089c268dc988c125457d5f40a2c10b4e355a2c8197839b4ea32f0fa0a5 +SHA512 (onig-6.9.9.tar.gz) = 14d2afd0d2cf86012c9959f221e9a77e7787e709c9dd7295d159e0a9ba89df52fa3edc59f95a6d859c34181e2e2e53e21b932b3eceb4d6ddeb2a3445ef951e95 From 0d4bfad89fd8f95ba639380df02fae28d3ec8106 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:57:06 +0000 Subject: [PATCH 24/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 21b41e3..5dbc505 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 1 +%global baserelease 2 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -124,6 +124,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 6.9.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Oct 17 2023 Mamoru TASAKA - 6.9.9-1 - 6.9.9 From aa22b08b65bb90429b768cc7e48cb8edf246f090 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 11:02:49 +0000 Subject: [PATCH 25/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 5dbc505..d7589bc 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 2 +%global baserelease 3 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -124,6 +124,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 6.9.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 6.9.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 97bfc75a4c48d3b5527a0c1665d12e83e39e57cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:42:18 +0000 Subject: [PATCH 26/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index d7589bc..96a4fdd 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 3 +%global baserelease 4 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -124,6 +124,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 6.9.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 6.9.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 56611f989dedf806dc3458b1467a527a095ef96b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 18 Nov 2024 15:14:29 +0900 Subject: [PATCH 27/31] Apply upstream patch for C23 --- oniguruma-issue312-c23-compliant.patch | 135 +++++++++++++++++++++++++ oniguruma.spec | 12 ++- 2 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 oniguruma-issue312-c23-compliant.patch diff --git a/oniguruma-issue312-c23-compliant.patch b/oniguruma-issue312-c23-compliant.patch new file mode 100644 index 0000000..adf9c2f --- /dev/null +++ b/oniguruma-issue312-c23-compliant.patch @@ -0,0 +1,135 @@ +From 5f1408dee4a01dee60c4cd67f2e2e46484ef50a5 Mon Sep 17 00:00:00 2001 +From: "K.Kosako" +Date: Mon, 18 Nov 2024 00:18:12 +0900 +Subject: [PATCH] fix #312: Build failure with GCC 15 (C23) + +--- + src/regparse.c | 44 ++++++++++++++++++++++++++++++++++++-------- + src/st.h | 9 +-------- + 2 files changed, 37 insertions(+), 16 deletions(-) + +diff --git a/src/regparse.c b/src/regparse.c +index 24bcbaac..9acdd6e2 100644 +--- a/src/regparse.c ++++ b/src/regparse.c +@@ -793,8 +793,13 @@ onig_print_names(FILE* fp, regex_t* reg) + #endif /* ONIG_DEBUG */ + + static int +-i_free_name_entry(UChar* key, NameEntry* e, void* arg ARG_UNUSED) ++i_free_name_entry(st_data_t akey, st_data_t ae, st_data_t arg ARG_UNUSED) + { ++ UChar* key; ++ NameEntry* e; ++ ++ key = (UChar* )akey; ++ e = (NameEntry* )ae; + xfree(e->name); + if (IS_NOT_NULL(e->back_refs)) xfree(e->back_refs); + xfree(key); +@@ -850,8 +855,14 @@ typedef struct { + } INamesArg; + + static int +-i_names(UChar* key ARG_UNUSED, NameEntry* e, INamesArg* arg) ++i_names(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t aarg) + { ++ NameEntry* e; ++ INamesArg* arg; ++ ++ e = (NameEntry* )ae; ++ arg = (INamesArg* )aarg; ++ + int r = (*(arg->func))(e->name, + e->name + e->name_len, + e->back_num, +@@ -883,9 +894,14 @@ onig_foreach_name(regex_t* reg, + } + + static int +-i_renumber_name(UChar* key ARG_UNUSED, NameEntry* e, GroupNumMap* map) ++i_renumber_name(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t amap) + { + int i; ++ NameEntry* e; ++ GroupNumMap* map; ++ ++ e = (NameEntry* )ae; ++ map = (GroupNumMap* )amap; + + if (e->back_num > 1) { + for (i = 0; i < e->back_num; i++) { +@@ -1374,9 +1390,14 @@ static int CalloutNameIDCounter; + #ifdef USE_ST_LIBRARY + + static int +-i_free_callout_name_entry(st_callout_name_key* key, CalloutNameEntry* e, +- void* arg ARG_UNUSED) ++i_free_callout_name_entry(st_data_t akey, st_data_t ae, st_data_t arg ARG_UNUSED) + { ++ st_callout_name_key* key; ++ CalloutNameEntry* e; ++ ++ key = (st_callout_name_key* )akey; ++ e = (CalloutNameEntry* )ae; ++ + if (IS_NOT_NULL(e)) { + xfree(e->name); + } +@@ -1870,10 +1891,14 @@ typedef intptr_t CalloutTagVal; + #define CALLOUT_TAG_LIST_FLAG_TAG_EXIST (1<<0) + + static int +-i_callout_callout_list_set(UChar* key, CalloutTagVal e, void* arg) ++i_callout_callout_list_set(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t arg) + { + int num; +- RegexExt* ext = (RegexExt* )arg; ++ CalloutTagVal e; ++ RegexExt* ext; ++ ++ e = (CalloutTagVal )ae; ++ ext = (RegexExt* )arg; + + num = (int )e - 1; + ext->callout_list[num].flag |= CALLOUT_TAG_LIST_FLAG_TAG_EXIST; +@@ -1926,8 +1951,11 @@ onig_callout_tag_is_exist_at_callout_num(regex_t* reg, int callout_num) + } + + static int +-i_free_callout_tag_entry(UChar* key, CalloutTagVal e, void* arg ARG_UNUSED) ++i_free_callout_tag_entry(st_data_t akey, st_data_t e ARG_UNUSED, st_data_t arg ARG_UNUSED) + { ++ UChar* key; ++ ++ key = (UChar* )akey; + xfree(key); + return ST_DELETE; + } +diff --git a/src/st.h b/src/st.h +index 5efee8bb..70798dc5 100644 +--- a/src/st.h ++++ b/src/st.h +@@ -34,13 +34,6 @@ enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK}; + #ifndef _ + # define _(args) args + #endif +-#ifndef ANYARGS +-# ifdef __cplusplus +-# define ANYARGS ... +-# else +-# define ANYARGS +-# endif +-#endif + + st_table *st_init_table _((struct st_hash_type *)); + st_table *st_init_table_with_size _((struct st_hash_type *, int)); +@@ -52,7 +45,7 @@ int st_delete _((st_table *, st_data_t *, st_data_t *)); + int st_delete_safe _((st_table *, st_data_t *, st_data_t *, st_data_t)); + int st_insert _((st_table *, st_data_t, st_data_t)); + int st_lookup _((st_table *, st_data_t, st_data_t *)); +-int st_foreach _((st_table *, int (*)(ANYARGS), st_data_t)); ++int st_foreach _((st_table *, int (*)(st_data_t, st_data_t, st_data_t), st_data_t)); + void st_add_direct _((st_table *, st_data_t, st_data_t)); + void st_free_table _((st_table *)); + void st_cleanup_safe _((st_table *, st_data_t)); diff --git a/oniguruma.spec b/oniguruma.spec index 96a4fdd..174bf27 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 4 +%global baserelease 5 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -33,6 +33,10 @@ License: BSD-2-Clause URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}%{?gitversion:-%{?gitversion}}.tar.gz Source1: create-tarball-from-git.sh +# https://github.com/kkos/oniguruma/issues/312 +# https://github.com/kkos/oniguruma/commit/5f1408dee4a01dee60c4cd67f2e2e46484ef50a5 +# make code C23 compliant +Patch0: oniguruma-issue312-c23-compliant.patch BuildRequires: make BuildRequires: gcc @@ -61,12 +65,15 @@ developing applications that use %{name}. %setup -q -n onig-%{mainver}%{?gitversion:-%{?gitversion}} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in +%patch -P0 -p1 -b .c23 %build # This package fails its testsuite when compiled with LTO, but the real problem # is that it ends up mixing and matching regexp bits between itself and glibc. # Disable LTO %define _lto_cflags %{nil} +%dnl %global optflags_orig %optflags +%dnl %global optflags %optflags_orig -std=gnu23 %if 0%{?git_snapshot} autoreconf -fi @@ -124,6 +131,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Nov 18 2024 Mamoru TASAKA - 6.9.9-5 +- Apply upstream patch for C23 compliance + * Thu Jul 18 2024 Fedora Release Engineering - 6.9.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 0860e50eac7cab084d8533021f90c068eb37db91 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Jan 2025 13:02:43 +0900 Subject: [PATCH 28/31] 6.9.10 --- oniguruma-issue312-c23-compliant.patch | 135 ------------------------- oniguruma.spec | 13 +-- sources | 2 +- 3 files changed, 6 insertions(+), 144 deletions(-) delete mode 100644 oniguruma-issue312-c23-compliant.patch diff --git a/oniguruma-issue312-c23-compliant.patch b/oniguruma-issue312-c23-compliant.patch deleted file mode 100644 index adf9c2f..0000000 --- a/oniguruma-issue312-c23-compliant.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 5f1408dee4a01dee60c4cd67f2e2e46484ef50a5 Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Mon, 18 Nov 2024 00:18:12 +0900 -Subject: [PATCH] fix #312: Build failure with GCC 15 (C23) - ---- - src/regparse.c | 44 ++++++++++++++++++++++++++++++++++++-------- - src/st.h | 9 +-------- - 2 files changed, 37 insertions(+), 16 deletions(-) - -diff --git a/src/regparse.c b/src/regparse.c -index 24bcbaac..9acdd6e2 100644 ---- a/src/regparse.c -+++ b/src/regparse.c -@@ -793,8 +793,13 @@ onig_print_names(FILE* fp, regex_t* reg) - #endif /* ONIG_DEBUG */ - - static int --i_free_name_entry(UChar* key, NameEntry* e, void* arg ARG_UNUSED) -+i_free_name_entry(st_data_t akey, st_data_t ae, st_data_t arg ARG_UNUSED) - { -+ UChar* key; -+ NameEntry* e; -+ -+ key = (UChar* )akey; -+ e = (NameEntry* )ae; - xfree(e->name); - if (IS_NOT_NULL(e->back_refs)) xfree(e->back_refs); - xfree(key); -@@ -850,8 +855,14 @@ typedef struct { - } INamesArg; - - static int --i_names(UChar* key ARG_UNUSED, NameEntry* e, INamesArg* arg) -+i_names(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t aarg) - { -+ NameEntry* e; -+ INamesArg* arg; -+ -+ e = (NameEntry* )ae; -+ arg = (INamesArg* )aarg; -+ - int r = (*(arg->func))(e->name, - e->name + e->name_len, - e->back_num, -@@ -883,9 +894,14 @@ onig_foreach_name(regex_t* reg, - } - - static int --i_renumber_name(UChar* key ARG_UNUSED, NameEntry* e, GroupNumMap* map) -+i_renumber_name(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t amap) - { - int i; -+ NameEntry* e; -+ GroupNumMap* map; -+ -+ e = (NameEntry* )ae; -+ map = (GroupNumMap* )amap; - - if (e->back_num > 1) { - for (i = 0; i < e->back_num; i++) { -@@ -1374,9 +1390,14 @@ static int CalloutNameIDCounter; - #ifdef USE_ST_LIBRARY - - static int --i_free_callout_name_entry(st_callout_name_key* key, CalloutNameEntry* e, -- void* arg ARG_UNUSED) -+i_free_callout_name_entry(st_data_t akey, st_data_t ae, st_data_t arg ARG_UNUSED) - { -+ st_callout_name_key* key; -+ CalloutNameEntry* e; -+ -+ key = (st_callout_name_key* )akey; -+ e = (CalloutNameEntry* )ae; -+ - if (IS_NOT_NULL(e)) { - xfree(e->name); - } -@@ -1870,10 +1891,14 @@ typedef intptr_t CalloutTagVal; - #define CALLOUT_TAG_LIST_FLAG_TAG_EXIST (1<<0) - - static int --i_callout_callout_list_set(UChar* key, CalloutTagVal e, void* arg) -+i_callout_callout_list_set(st_data_t key ARG_UNUSED, st_data_t ae, st_data_t arg) - { - int num; -- RegexExt* ext = (RegexExt* )arg; -+ CalloutTagVal e; -+ RegexExt* ext; -+ -+ e = (CalloutTagVal )ae; -+ ext = (RegexExt* )arg; - - num = (int )e - 1; - ext->callout_list[num].flag |= CALLOUT_TAG_LIST_FLAG_TAG_EXIST; -@@ -1926,8 +1951,11 @@ onig_callout_tag_is_exist_at_callout_num(regex_t* reg, int callout_num) - } - - static int --i_free_callout_tag_entry(UChar* key, CalloutTagVal e, void* arg ARG_UNUSED) -+i_free_callout_tag_entry(st_data_t akey, st_data_t e ARG_UNUSED, st_data_t arg ARG_UNUSED) - { -+ UChar* key; -+ -+ key = (UChar* )akey; - xfree(key); - return ST_DELETE; - } -diff --git a/src/st.h b/src/st.h -index 5efee8bb..70798dc5 100644 ---- a/src/st.h -+++ b/src/st.h -@@ -34,13 +34,6 @@ enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK}; - #ifndef _ - # define _(args) args - #endif --#ifndef ANYARGS --# ifdef __cplusplus --# define ANYARGS ... --# else --# define ANYARGS --# endif --#endif - - st_table *st_init_table _((struct st_hash_type *)); - st_table *st_init_table_with_size _((struct st_hash_type *, int)); -@@ -52,7 +45,7 @@ int st_delete _((st_table *, st_data_t *, st_data_t *)); - int st_delete_safe _((st_table *, st_data_t *, st_data_t *, st_data_t)); - int st_insert _((st_table *, st_data_t, st_data_t)); - int st_lookup _((st_table *, st_data_t, st_data_t *)); --int st_foreach _((st_table *, int (*)(ANYARGS), st_data_t)); -+int st_foreach _((st_table *, int (*)(st_data_t, st_data_t, st_data_t), st_data_t)); - void st_add_direct _((st_table *, st_data_t, st_data_t)); - void st_free_table _((st_table *)); - void st_cleanup_safe _((st_table *, st_data_t)); diff --git a/oniguruma.spec b/oniguruma.spec index 174bf27..d5542a9 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -16,12 +16,12 @@ %global gitversion %{gitdate}git%{shortcommit} %endif -%global mainver 6.9.9 +%global mainver 6.9.10 #%%global postver 1 #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 5 +%global baserelease 1 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -33,10 +33,6 @@ License: BSD-2-Clause URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}%{?gitversion:-%{?gitversion}}.tar.gz Source1: create-tarball-from-git.sh -# https://github.com/kkos/oniguruma/issues/312 -# https://github.com/kkos/oniguruma/commit/5f1408dee4a01dee60c4cd67f2e2e46484ef50a5 -# make code C23 compliant -Patch0: oniguruma-issue312-c23-compliant.patch BuildRequires: make BuildRequires: gcc @@ -65,8 +61,6 @@ developing applications that use %{name}. %setup -q -n onig-%{mainver}%{?gitversion:-%{?gitversion}} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in -%patch -P0 -p1 -b .c23 - %build # This package fails its testsuite when compiled with LTO, but the real problem # is that it ends up mixing and matching regexp bits between itself and glibc. @@ -131,6 +125,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 01 2025 Mamoru TASAKA - 6.9.10-1 +- 6.9.10 + * Mon Nov 18 2024 Mamoru TASAKA - 6.9.9-5 - Apply upstream patch for C23 compliance diff --git a/sources b/sources index 20063b9..65274b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.9.tar.gz) = 14d2afd0d2cf86012c9959f221e9a77e7787e709c9dd7295d159e0a9ba89df52fa3edc59f95a6d859c34181e2e2e53e21b932b3eceb4d6ddeb2a3445ef951e95 +SHA512 (onig-6.9.10.tar.gz) = f7cf33008ca0181322fb8efc8e6bb67a1f81677095a33d88134781b804e6a9fbf675f05789d762fdd3d9f0171f8dc4c2e960c2b6a09ddd03bfd35a5ab0920317 From 9f02b3ca58544d4721294daae7ce15b81be5e0dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 21:30:19 +0000 Subject: [PATCH 29/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index d5542a9..6e9d361 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 1 +%global baserelease 2 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -125,6 +125,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 6.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 01 2025 Mamoru TASAKA - 6.9.10-1 - 6.9.10 From f46c81b70cec6e869b7af9c61b37a5380fc65467 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Feb 2025 16:10:10 +0900 Subject: [PATCH 30/31] remove no longer needed comment --- oniguruma.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index 6e9d361..3df2fa2 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -66,8 +66,6 @@ developing applications that use %{name}. # is that it ends up mixing and matching regexp bits between itself and glibc. # Disable LTO %define _lto_cflags %{nil} -%dnl %global optflags_orig %optflags -%dnl %global optflags %optflags_orig -std=gnu23 %if 0%{?git_snapshot} autoreconf -fi From fcfa905419796bde85f9d531a7a9db3c3d0d2bbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:30:44 +0000 Subject: [PATCH 31/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 3df2fa2..3521ff4 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -21,7 +21,7 @@ #%%global betaver rc4 #%%define prerelease 1 -%global baserelease 2 +%global baserelease 3 Name: oniguruma Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}} @@ -123,6 +123,9 @@ autoreconf -fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 6.9.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 6.9.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild