From cc86c8d1a5b1b22c377938787f5621aafd2245fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 00:46:00 +0000 Subject: [PATCH 01/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 1a8754f..17f53ea 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma Version: 6.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -101,6 +101,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 6.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Dec 28 2016 Mamoru TASAKA - 6.1.3-1 - 6.1.3 From 54c5e26287691bef4880cbab875de60f8004e3ce Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 21 Apr 2017 10:51:14 +0900 Subject: [PATCH 02/74] 6.2.0 --- .gitignore | 1 + oniguruma.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d7c0e5d..4281d26 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 17f53ea..1af082c 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma -Version: 6.1.3 -Release: 2%{?dist} +Version: 6.2.0 +Release: 1%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -101,6 +101,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Apr 21 2017 Mamoru TASAKA - 6.2.0-1 +- 6.2.0 + * Sat Feb 11 2017 Fedora Release Engineering - 6.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 50a4ae0..41f126c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.1.3.tar.gz) = 42b3757c4c95443fbbeca0b6d43b1ed71b29bb717e6b33d20c183dd9f2b2ef8cd8cf6272846e332fe0a8326a3e299bcf99d9745c0f17c5e496efa0aa60ca9c55 +SHA512 (onig-6.2.0.tar.gz) = ecd460f4d051ceb743ce88ea1dc91b961cd79ac2453b08fc0803c722f2af9e1542876cc3a469f4245ed7470592de8036745b8e3bcb156a9380f262fab29b9d0b From 9e008774fab5450ab950380344be36a19bf37f3a Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 26 Apr 2017 17:29:31 +0200 Subject: [PATCH 03/74] remove unnecessary BR: ruby --- oniguruma.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index 1af082c..ecba8ca 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma Version: 6.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -12,9 +12,6 @@ Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{ # NULL reg variable Patch0: oniguruma-5.9.2-onig_new-returns-NULL-reg.patch -BuildRequires: ruby >= 1.8 -#Requires: - %description Oniguruma is a regular expressions library. The characteristics of this library is that different character encoding @@ -101,6 +98,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Apr 26 2017 Nils Philippsen - 6.2.0-2 +- remove unnecessary BR: ruby + * Fri Apr 21 2017 Mamoru TASAKA - 6.2.0-1 - 6.2.0 From 01a9bfb7d2fca6d0dfba1d64541b3036fd8d5d45 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 30 May 2017 13:00:28 +0900 Subject: [PATCH 04/74] 6.3.0 CVEs 2017-9226 CVE-2017-9225 CVE-2017-9224 CVE-2017-9227 CVE-2017-9229 CVE-2017-9228 --- .gitignore | 1 + oniguruma.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4281d26..0fa7a5c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index ecba8ca..ee6a969 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma -Version: 6.2.0 -Release: 2%{?dist} +Version: 6.3.0 +Release: 1%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -98,6 +98,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue May 30 2017 Mamoru TASAKA - 6.3.0-1 +- 6.3.0 + - CVEs 2017-9226 CVE-2017-9225 CVE-2017-9224 CVE-2017-9227 CVE-2017-9229 CVE-2017-9228 + * Wed Apr 26 2017 Nils Philippsen - 6.2.0-2 - remove unnecessary BR: ruby diff --git a/sources b/sources index 41f126c..aad1cc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.2.0.tar.gz) = ecd460f4d051ceb743ce88ea1dc91b961cd79ac2453b08fc0803c722f2af9e1542876cc3a469f4245ed7470592de8036745b8e3bcb156a9380f262fab29b9d0b +SHA512 (onig-6.3.0.tar.gz) = 980603696c2bb20efe5874fe9eb830d2c485eee5126d79b0799416da318158d79f4111409c8fc19e67b04d87ff088136d7e7be797e6380011426ec21bc2013bc From f6b0bc3521b3524040e343456416157076b01fc4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 5 Jul 2017 17:20:36 +0900 Subject: [PATCH 05/74] 6.4.0 --- ...ch => oniguruma-6.4.0-onig_new-returns-NULL-reg.patch | 8 ++++---- oniguruma.spec | 9 +++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) rename oniguruma-5.9.2-onig_new-returns-NULL-reg.patch => oniguruma-6.4.0-onig_new-returns-NULL-reg.patch (79%) diff --git a/oniguruma-5.9.2-onig_new-returns-NULL-reg.patch b/oniguruma-6.4.0-onig_new-returns-NULL-reg.patch similarity index 79% rename from oniguruma-5.9.2-onig_new-returns-NULL-reg.patch rename to oniguruma-6.4.0-onig_new-returns-NULL-reg.patch index 349929a..b26731d 100644 --- a/oniguruma-5.9.2-onig_new-returns-NULL-reg.patch +++ b/oniguruma-6.4.0-onig_new-returns-NULL-reg.patch @@ -1,5 +1,5 @@ ---- onig-5.9.2/regcomp.c.debug 2010-01-05 23:13:38.000000000 +0900 -+++ onig-5.9.2/regcomp.c 2010-01-15 03:58:15.000000000 +0900 +--- onig-5.9.2/regcomp.c.debug 2017-07-03 09:04:43.000000000 +0900 ++++ onig-5.9.2/regcomp.c 2017-07-05 15:49:15.000000000 +0900 @@ -5536,19 +5536,22 @@ OnigErrorInfo* einfo) { @@ -13,11 +13,11 @@ - r = onig_reg_init(*reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax); + r = onig_reg_init(regg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax); - if (r) goto err; + if (r != 0) goto err; - r = onig_compile(*reg, pattern, pattern_end, einfo); + r = onig_compile(regg, pattern, pattern_end, einfo); - if (r) { + if (r != 0) { err: - onig_free(*reg); - *reg = NULL; diff --git a/oniguruma.spec b/oniguruma.spec index ee6a969..9e3a76a 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,5 +1,5 @@ Name: oniguruma -Version: 6.3.0 +Version: 6.4.0 Release: 1%{?dist} Summary: Regular expressions library @@ -10,7 +10,7 @@ Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{ # FIXME # Don't know exactly why, however without Patch0 onig_new returns # NULL reg variable -Patch0: oniguruma-5.9.2-onig_new-returns-NULL-reg.patch +Patch0: oniguruma-6.4.0-onig_new-returns-NULL-reg.patch %description Oniguruma is a regular expressions library. @@ -36,6 +36,7 @@ developing applications that use %{name}. ) %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in +%if 0 for f in \ README.ja \ doc/API.ja \ @@ -46,6 +47,7 @@ for f in \ ( touch -r $f $f.tmp ; %{__mv} -f $f.tmp $f ) || \ %{__rm} -f $f.tmp done +%endif %build %configure \ @@ -98,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 5 2017 Mamoru TASAKA - 6.4.0-1 +- 6.4.0 + * Tue May 30 2017 Mamoru TASAKA - 6.3.0-1 - 6.3.0 - CVEs 2017-9226 CVE-2017-9225 CVE-2017-9224 CVE-2017-9227 CVE-2017-9229 CVE-2017-9228 From 82d62b0fbfdf1257b2038341a0f142cad2cbb9f7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 5 Jul 2017 17:26:53 +0900 Subject: [PATCH 06/74] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0fa7a5c..840c758 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ onig-5.9.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 diff --git a/sources b/sources index aad1cc5..d3ad5cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.3.0.tar.gz) = 980603696c2bb20efe5874fe9eb830d2c485eee5126d79b0799416da318158d79f4111409c8fc19e67b04d87ff088136d7e7be797e6380011426ec21bc2013bc +SHA512 (onig-6.4.0.tar.gz) = 476f2110f09eae9b27e0da4b995fa9db46fe6f98f5ef8700b9f1966f9b4bf6db680c6e9e67e1d8d81e759fd8d1787af39c4b38d6681ee4b6405a970c18d583fa From 19df514a225733660bdfc446802aebaed93b45f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 01:42:05 +0000 Subject: [PATCH 07/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 9e3a76a..dd323aa 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma Version: 6.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -100,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 6.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jul 5 2017 Mamoru TASAKA - 6.4.0-1 - 6.4.0 From bfc7ec66f9cfb737c098409f0e48f0c36a98fda9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 04:27:52 +0000 Subject: [PATCH 08/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index dd323aa..40e276c 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma Version: 6.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -100,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 6.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 6.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c2d55d6c57b93fb209ed1f10e2088dd8ca9d51e1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 13 Aug 2017 17:20:17 +0900 Subject: [PATCH 09/74] 6.5.0 --- .gitignore | 1 + oniguruma.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 840c758..ec03054 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 40e276c..17ca4e1 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma -Version: 6.4.0 -Release: 3%{?dist} +Version: 6.5.0 +Release: 1%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -100,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Aug 13 2017 Mamoru TASAKA - 6.5.0-1 +- 6.5.0 + * Thu Aug 03 2017 Fedora Release Engineering - 6.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index d3ad5cc..28a1c7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.4.0.tar.gz) = 476f2110f09eae9b27e0da4b995fa9db46fe6f98f5ef8700b9f1966f9b4bf6db680c6e9e67e1d8d81e759fd8d1787af39c4b38d6681ee4b6405a970c18d583fa +SHA512 (onig-6.5.0.tar.gz) = 0a92553992ac1f53db48144732e0e3b9a5790c456271b05e6701d2b26053413e01ae2c64ec3c47249e4047bf5e6f00a398e76209acf7afb805802a8b976b6dc1 From c9613df63f2c1eadb5ac80690b7f8fdf03326465 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 5 Sep 2017 18:08:19 +0900 Subject: [PATCH 10/74] 6.6.1 --- .gitignore | 1 + oniguruma.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ec03054..0871789 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 17ca4e1..5fa7391 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,5 +1,5 @@ Name: oniguruma -Version: 6.5.0 +Version: 6.6.1 Release: 1%{?dist} Summary: Regular expressions library @@ -77,9 +77,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %doc AUTHORS %license COPYING %doc HISTORY -%doc README +%doc README.md %doc index.html -%lang(ja) %doc README.ja +%lang(ja) %doc README_japanese %lang(ja) %doc index_ja.html %{_libdir}/libonig.so.4* @@ -100,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Sep 5 2017 Mamoru TASAKA - 6.6.1-1 +- 6.6.1 + * Sun Aug 13 2017 Mamoru TASAKA - 6.5.0-1 - 6.5.0 diff --git a/sources b/sources index 28a1c7a..eab2e16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.5.0.tar.gz) = 0a92553992ac1f53db48144732e0e3b9a5790c456271b05e6701d2b26053413e01ae2c64ec3c47249e4047bf5e6f00a398e76209acf7afb805802a8b976b6dc1 +SHA512 (onig-6.6.1.tar.gz) = ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc From 1cb0609f55d183000bd340d6d83f5523835a2557 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 31 Dec 2017 14:43:15 +0900 Subject: [PATCH 11/74] 6.7.0 --- .gitignore | 1 + ...ruma-6.4.0-onig_new-returns-NULL-reg.patch | 31 ------------------- oniguruma.spec | 12 +++---- sources | 2 +- 4 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 oniguruma-6.4.0-onig_new-returns-NULL-reg.patch diff --git a/.gitignore b/.gitignore index 0871789..d7bd912 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ onig-5.9.2.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 diff --git a/oniguruma-6.4.0-onig_new-returns-NULL-reg.patch b/oniguruma-6.4.0-onig_new-returns-NULL-reg.patch deleted file mode 100644 index b26731d..0000000 --- a/oniguruma-6.4.0-onig_new-returns-NULL-reg.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- onig-5.9.2/regcomp.c.debug 2017-07-03 09:04:43.000000000 +0900 -+++ onig-5.9.2/regcomp.c 2017-07-05 15:49:15.000000000 +0900 -@@ -5536,19 +5536,22 @@ - OnigErrorInfo* einfo) - { - int r; -+ regex_t *regg; - -- *reg = (regex_t* )xmalloc(sizeof(regex_t)); -- if (IS_NULL(*reg)) return ONIGERR_MEMORY; -+ regg = (regex_t* )xmalloc(sizeof(regex_t)); -+ if (IS_NULL(regg)) return ONIGERR_MEMORY; - -- r = onig_reg_init(*reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax); -+ r = onig_reg_init(regg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax); - if (r != 0) goto err; - -- r = onig_compile(*reg, pattern, pattern_end, einfo); -+ r = onig_compile(regg, pattern, pattern_end, einfo); - if (r != 0) { - err: -- onig_free(*reg); -- *reg = NULL; -+ onig_free(regg); -+ regg = NULL; - } -+ -+ *reg = regg; - return r; - } - diff --git a/oniguruma.spec b/oniguruma.spec index 5fa7391..65222ea 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,5 +1,5 @@ Name: oniguruma -Version: 6.6.1 +Version: 6.7.0 Release: 1%{?dist} Summary: Regular expressions library @@ -7,10 +7,6 @@ Group: System Environment/Libraries License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{version}.tar.gz -# FIXME -# Don't know exactly why, however without Patch0 onig_new returns -# NULL reg variable -Patch0: oniguruma-6.4.0-onig_new-returns-NULL-reg.patch %description Oniguruma is a regular expressions library. @@ -31,9 +27,6 @@ developing applications that use %{name}. %prep %setup -q -n onig-%{version} -( cd src -%patch0 -p1 -b .nullreg -) %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in %if 0 @@ -100,6 +93,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Dec 31 2017 Mamoru TASAKA - 6.7.0-1 +- 6.7.0 + * Tue Sep 5 2017 Mamoru TASAKA - 6.6.1-1 - 6.6.1 diff --git a/sources b/sources index eab2e16..e74cfea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.6.1.tar.gz) = ce9ac1336e2782fcfdac8cb4a257162f57dd8c2be20f74771a1ab9671b5926ea9c9fc07e2f4b04d80a2138a6e4c0e3295ac3f257e4424acf888e343870a377cc +SHA512 (onig-6.7.0.tar.gz) = 21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30 From 90c16dbfac4e48e4fbd6d185144d06ef39a25b4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 09:18:16 +0000 Subject: [PATCH 12/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 65222ea..6518dc6 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma Version: 6.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -93,6 +93,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 6.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Dec 31 2017 Mamoru TASAKA - 6.7.0-1 - 6.7.0 From bb7bed95556cff414697b7e364dd03a044051945 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 9 Feb 2018 14:29:30 +0900 Subject: [PATCH 13/74] 6.7.1 --- .gitignore | 1 + oniguruma.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d7bd912..41a21e0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 6518dc6..a7ce9f0 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma -Version: 6.7.0 -Release: 2%{?dist} +Version: 6.7.1 +Release: 1%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -93,6 +93,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Feb 9 2018 Mamoru TASAKA - 6.7.1-1 +- 6.7.1 + * Thu Feb 08 2018 Fedora Release Engineering - 6.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index e74cfea..8ee4a80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.7.0.tar.gz) = 21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30 +SHA512 (onig-6.7.1.tar.gz) = 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc From d49b6187157ea48cdcfa606b512d7745ce4ed90b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 1 Apr 2018 14:13:55 +0900 Subject: [PATCH 14/74] 6.8.1 --- .gitignore | 1 + oniguruma.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 41a21e0..85b19d7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index a7ce9f0..142c15d 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,5 +1,5 @@ Name: oniguruma -Version: 6.7.1 +Version: 6.8.1 Release: 1%{?dist} Summary: Regular expressions library @@ -75,7 +75,7 @@ find $RPM_BUILD_ROOT -name '*.la' \ %lang(ja) %doc README_japanese %lang(ja) %doc index_ja.html -%{_libdir}/libonig.so.4* +%{_libdir}/libonig.so.5* %files devel %defattr(-,root,root,-) @@ -93,6 +93,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Apr 1 2018 Mamoru TASAKA - 6.8.1-1 +- 6.8.1 + * Fri Feb 9 2018 Mamoru TASAKA - 6.7.1-1 - 6.7.1 diff --git a/sources b/sources index 8ee4a80..4ada8af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.7.1.tar.gz) = 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc +SHA512 (onig-6.8.1.tar.gz) = 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631 From 8723de5c3f66239b2d6dd64951c59b54d1728bc5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 23 Apr 2018 16:04:11 +0900 Subject: [PATCH 15/74] 6.8.2 --- .gitignore | 1 + oniguruma.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85b19d7..7022f72 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 142c15d..9a77f9c 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,5 +1,5 @@ Name: oniguruma -Version: 6.8.1 +Version: 6.8.2 Release: 1%{?dist} Summary: Regular expressions library @@ -80,9 +80,13 @@ find $RPM_BUILD_ROOT -name '*.la' \ %files devel %defattr(-,root,root,-) %doc doc/API +%doc doc/CALLOUTS.API +%doc doc/CALLOUTS.BUILTIN %doc doc/FAQ %doc doc/RE %lang(ja) %doc doc/API.ja +%lang(ja) %doc doc/CALLOUTS.API.ja +%lang(ja) %doc doc/CALLOUTS.BUILTIN.ja %lang(ja) %doc doc/FAQ.ja %lang(ja) %doc doc/RE.ja @@ -93,6 +97,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Apr 23 2018 Mamoru TASAKA - 6.8.2-1 +- 6.8.2 + * Sun Apr 1 2018 Mamoru TASAKA - 6.8.1-1 - 6.8.1 diff --git a/sources b/sources index 4ada8af..daaa9c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.8.1.tar.gz) = 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631 +SHA512 (onig-6.8.2.tar.gz) = 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596 From 8b84053911a0f911f181038c90a934baef4eef9e Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:56:05 -0500 Subject: [PATCH 16/74] Remove needless use of %defattr --- oniguruma.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index 9a77f9c..564a462 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -66,7 +66,6 @@ find $RPM_BUILD_ROOT -name '*.la' \ %files -%defattr(-,root,root,-) %doc AUTHORS %license COPYING %doc HISTORY @@ -78,7 +77,6 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/libonig.so.5* %files devel -%defattr(-,root,root,-) %doc doc/API %doc doc/CALLOUTS.API %doc doc/CALLOUTS.BUILTIN From 3c632df2b98d8c9b240f0b1986ec606c2fcc10eb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 10 Jul 2018 22:35:51 +0900 Subject: [PATCH 17/74] =?UTF-8?q?=E3=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oniguruma.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oniguruma.spec b/oniguruma.spec index 564a462..9a77f9c 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -66,6 +66,7 @@ find $RPM_BUILD_ROOT -name '*.la' \ %files +%defattr(-,root,root,-) %doc AUTHORS %license COPYING %doc HISTORY @@ -77,6 +78,7 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/libonig.so.5* %files devel +%defattr(-,root,root,-) %doc doc/API %doc doc/CALLOUTS.API %doc doc/CALLOUTS.BUILTIN From c6224984feb0c36ebc4ae992a293c39e246ffc07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 15:00:12 +0000 Subject: [PATCH 18/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 9a77f9c..f1da885 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma Version: 6.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -97,6 +97,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 6.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Apr 23 2018 Mamoru TASAKA - 6.8.2-1 - 6.8.2 From 9d1be2fa9da01dc7adfa8d1f2376f8993f823465 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Jul 2018 17:58:20 +0900 Subject: [PATCH 19/74] compiler --- oniguruma.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oniguruma.spec b/oniguruma.spec index f1da885..74adb60 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -8,6 +8,8 @@ License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{version}.tar.gz +BuildRequires: gcc + %description Oniguruma is a regular expressions library. The characteristics of this library is that different character encoding From 3eef3e1d87a577dabd229a7863f31553cd106f08 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 8 Sep 2018 13:03:25 +0200 Subject: [PATCH 20/74] Update to 6.9.0 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + oniguruma.spec | 81 ++++++++++++++------------------------------------ sources | 2 +- 3 files changed, 25 insertions(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index 7022f72..04ee1c2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 74adb60..2db4094 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,12 +1,11 @@ Name: oniguruma -Version: 6.8.2 -Release: 2%{?dist} +Version: 6.9.0 +Release: 1%{?dist} Summary: Regular expressions library -Group: System Environment/Libraries License: BSD -URL: https://github.com/kkos/oniguruma/ -Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{version}.tar.gz +URL: https://github.com/kkos/oniguruma +Source0: %{url}/releases/download/v%{version}/onig-%{version}.tar.gz BuildRequires: gcc @@ -16,89 +15,55 @@ 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) - %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %prep %setup -q -n onig-%{version} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in -%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 %configure \ - --disable-silent-rules \ + --disable-silent-rules \ --disable-static \ --with-rubydir=%{_bindir} -%{__make} %{?_smp_mflags} - +%make_build %install -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - INSTALL="%{__install} -c -p" -find $RPM_BUILD_ROOT -name '*.la' \ - -exec %{__rm} -f {} ';' +%make_install +find %{buildroot} -type f -name '*.la' -print -delete +find doc -mindepth 1 -type f -name '*.ja' -prune -o -print0 | xargs -0 echo "%%doc" > doc.files +find doc -mindepth 1 -type f -name '*.ja' -print0 | xargs -0 echo "%%lang(ja) %%doc" >> doc.files %check -%{__make} check - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%make_build check +%ldconfig_scriptlets %files -%defattr(-,root,root,-) -%doc AUTHORS -%license COPYING -%doc HISTORY -%doc README.md -%doc index.html -%lang(ja) %doc README_japanese -%lang(ja) %doc index_ja.html - +%license COPYING +%doc AUTHORS HISTORY +%doc README.md +%lang(ja) %doc README.md +%doc index.html +%lang(ja) %doc index_ja.html %{_libdir}/libonig.so.5* -%files devel -%defattr(-,root,root,-) -%doc doc/API -%doc doc/CALLOUTS.API -%doc doc/CALLOUTS.BUILTIN -%doc doc/FAQ -%doc doc/RE -%lang(ja) %doc doc/API.ja -%lang(ja) %doc doc/CALLOUTS.API.ja -%lang(ja) %doc doc/CALLOUTS.BUILTIN.ja -%lang(ja) %doc doc/FAQ.ja -%lang(ja) %doc doc/RE.ja - +%files devel -f doc.files %{_bindir}/onig-config - %{_libdir}/libonig.so %{_includedir}/onig*.h -%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Sep 08 2018 Igor Gnatenko - 6.9.0-1 +- Update to 6.9.0 + * Fri Jul 13 2018 Fedora Release Engineering - 6.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index daaa9c0..07c9e24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.8.2.tar.gz) = 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596 +SHA512 (onig-6.9.0.tar.gz) = 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df From 04a168496eae643117586f027ba6f8acac9bb991 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 8 Sep 2018 22:29:42 +0900 Subject: [PATCH 21/74] Revert "Update to 6.9.0" This reverts commit 3eef3e1d87a577dabd229a7863f31553cd106f08. --- .gitignore | 1 - oniguruma.spec | 81 ++++++++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 59 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 04ee1c2..7022f72 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,3 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 2db4094..74adb60 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,11 +1,12 @@ Name: oniguruma -Version: 6.9.0 -Release: 1%{?dist} +Version: 6.8.2 +Release: 2%{?dist} Summary: Regular expressions library +Group: System Environment/Libraries License: BSD -URL: https://github.com/kkos/oniguruma -Source0: %{url}/releases/download/v%{version}/onig-%{version}.tar.gz +URL: https://github.com/kkos/oniguruma/ +Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{version}.tar.gz BuildRequires: gcc @@ -15,55 +16,89 @@ 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) + %package devel Summary: Development files for %{name} +Group: Development/Libraries Requires: %{name}%{?isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. + %prep %setup -q -n onig-%{version} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in +%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 %configure \ - --disable-silent-rules \ + --disable-silent-rules \ --disable-static \ --with-rubydir=%{_bindir} -%make_build +%{__make} %{?_smp_mflags} + %install -%make_install -find %{buildroot} -type f -name '*.la' -print -delete -find doc -mindepth 1 -type f -name '*.ja' -prune -o -print0 | xargs -0 echo "%%doc" > doc.files -find doc -mindepth 1 -type f -name '*.ja' -print0 | xargs -0 echo "%%lang(ja) %%doc" >> doc.files +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ + INSTALL="%{__install} -c -p" +find $RPM_BUILD_ROOT -name '*.la' \ + -exec %{__rm} -f {} ';' %check -%make_build check +%{__make} check + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig -%ldconfig_scriptlets %files -%license COPYING -%doc AUTHORS HISTORY -%doc README.md -%lang(ja) %doc README.md -%doc index.html -%lang(ja) %doc index_ja.html +%defattr(-,root,root,-) +%doc AUTHORS +%license COPYING +%doc HISTORY +%doc README.md +%doc index.html +%lang(ja) %doc README_japanese +%lang(ja) %doc index_ja.html + %{_libdir}/libonig.so.5* -%files devel -f doc.files +%files devel +%defattr(-,root,root,-) +%doc doc/API +%doc doc/CALLOUTS.API +%doc doc/CALLOUTS.BUILTIN +%doc doc/FAQ +%doc doc/RE +%lang(ja) %doc doc/API.ja +%lang(ja) %doc doc/CALLOUTS.API.ja +%lang(ja) %doc doc/CALLOUTS.BUILTIN.ja +%lang(ja) %doc doc/FAQ.ja +%lang(ja) %doc doc/RE.ja + %{_bindir}/onig-config + %{_libdir}/libonig.so %{_includedir}/onig*.h -%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{name}.pc %changelog -* Sat Sep 08 2018 Igor Gnatenko - 6.9.0-1 -- Update to 6.9.0 - * Fri Jul 13 2018 Fedora Release Engineering - 6.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 07c9e24..daaa9c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.0.tar.gz) = 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df +SHA512 (onig-6.8.2.tar.gz) = 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596 From 8a1137bc493d608789853a58140e18588fe3a912 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 8 Sep 2018 22:34:59 +0900 Subject: [PATCH 22/74] Bump release --- oniguruma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 74adb60..6dfa3b8 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma Version: 6.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -99,6 +99,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Sep 8 2019 Mamoru TASAKA - 6.8.2-3 +- Bump release + * Fri Jul 13 2018 Fedora Release Engineering - 6.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 174cc343ea51e030e98df1beafbf75b2b21ccd54 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 12 Sep 2018 14:41:25 +0900 Subject: [PATCH 23/74] 6.9.0 --- .gitignore | 1 + oniguruma.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7022f72..04ee1c2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 6dfa3b8..82eb903 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,6 @@ Name: oniguruma -Version: 6.8.2 -Release: 3%{?dist} +Version: 6.9.0 +Release: 2%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -46,7 +46,7 @@ done %build %configure \ - --disable-silent-rules \ + --disable-silent-rules \ --disable-static \ --with-rubydir=%{_bindir} %{__make} %{?_smp_mflags} @@ -99,7 +99,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog -* Sat Sep 8 2019 Mamoru TASAKA - 6.8.2-3 +* Wed Sep 12 2018 Mamoru TASAKA - 6.9.0-2 +- 6.9.0 + +* Sat Sep 8 2018 Mamoru TASAKA - 6.8.2-3 - Bump release * Fri Jul 13 2018 Fedora Release Engineering - 6.8.2-2 diff --git a/sources b/sources index daaa9c0..07c9e24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.8.2.tar.gz) = 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596 +SHA512 (onig-6.9.0.tar.gz) = 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df From ffbe93353a829cb5051360ab35f4d4093c571a15 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 12 Dec 2018 10:30:41 +0900 Subject: [PATCH 24/74] 6.9.1 --- .gitignore | 1 + oniguruma.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 04ee1c2..9614a7c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 82eb903..130dc3c 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,6 +1,8 @@ +%undefine _changelog_trimtime + Name: oniguruma -Version: 6.9.0 -Release: 2%{?dist} +Version: 6.9.1 +Release: 1%{?dist} Summary: Regular expressions library Group: System Environment/Libraries @@ -99,6 +101,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Dec 12 2018 Mamoru TASAKA - 6.9.1-1 +- 6.9.1 + * Wed Sep 12 2018 Mamoru TASAKA - 6.9.0-2 - 6.9.0 diff --git a/sources b/sources index 07c9e24..1850f4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.0.tar.gz) = 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df +SHA512 (onig-6.9.1.tar.gz) = 5454c161d2d45f2c992513a695ff586ffa99e44a27d7ac5498370e200adb664bb02f2d8cd7d73e61d467f626d1a9b41d9e6e3051e1ea1a021624f94f7d52975f From e7dc7832f24ebea974f26860597caf4c4d330402 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:40:33 +0100 Subject: [PATCH 25/74] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- oniguruma.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index 130dc3c..bfd62c9 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -64,9 +64,7 @@ find $RPM_BUILD_ROOT -name '*.la' \ %check %{__make} check -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files From d29ad1d61e7cd5e8bafa2e57fd3828e69951cd24 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:59 +0100 Subject: [PATCH 26/74] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- oniguruma.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index bfd62c9..520884d 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -5,7 +5,6 @@ Version: 6.9.1 Release: 1%{?dist} Summary: Regular expressions library -Group: System Environment/Libraries License: BSD URL: https://github.com/kkos/oniguruma/ Source0: https://github.com/kkos/oniguruma/releases/download/v%{version}/onig-%{version}.tar.gz @@ -21,7 +20,6 @@ for every regular expression object can be specified. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?isa} = %{version}-%{release} %description devel From 9727bb7ce1b5b9a8d3b6f7bc628f1aae3c210fa0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 17:15:06 +0000 Subject: [PATCH 27/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 520884d..1139536 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -2,7 +2,7 @@ Name: oniguruma Version: 6.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Regular expressions library License: BSD @@ -97,6 +97,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 6.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Dec 12 2018 Mamoru TASAKA - 6.9.1-1 - 6.9.1 From d4d6ab77dec8260218eb824b190b3cf658cf0c80 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 24 Apr 2019 14:26:21 +0900 Subject: [PATCH 28/74] 6.9.2-rc3 --- .gitignore | 1 + oniguruma.spec | 18 ++++++++++++++---- sources | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9614a7c..24f1397 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index 1139536..2072eb2 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,13 +1,18 @@ %undefine _changelog_trimtime +%global mainver 6.9.2 +%global betaver rc3 + +%global fedorarel 1 + Name: oniguruma -Version: 6.9.1 -Release: 2%{?dist} +Version: %{mainver} +Release: %{?betaver: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%{version}/onig-%{version}.tar.gz +Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz BuildRequires: gcc @@ -28,7 +33,7 @@ developing applications that use %{name}. %prep -%setup -q -n onig-%{version} +%setup -q -n onig-%{mainver} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in %if 0 @@ -84,6 +89,8 @@ find $RPM_BUILD_ROOT -name '*.la' \ %doc doc/CALLOUTS.BUILTIN %doc doc/FAQ %doc doc/RE +%doc doc/SYNTAX.md +%doc doc/UNICODE_PROPERTIES %lang(ja) %doc doc/API.ja %lang(ja) %doc doc/CALLOUTS.API.ja %lang(ja) %doc doc/CALLOUTS.BUILTIN.ja @@ -97,6 +104,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Apr 24 2019 Mamoru TASAKA - 6.9.2-0.1.rc3 +- 6.9.2-rc3 + * Fri Feb 01 2019 Fedora Release Engineering - 6.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 1850f4b..ecb47fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.1.tar.gz) = 5454c161d2d45f2c992513a695ff586ffa99e44a27d7ac5498370e200adb664bb02f2d8cd7d73e61d467f626d1a9b41d9e6e3051e1ea1a021624f94f7d52975f +SHA512 (onig-6.9.2-rc3.tar.gz) = c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001 From e4219c20bd7267169b9ac7a1ef081dce4898e609 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 7 May 2019 14:51:40 +0900 Subject: [PATCH 29/74] rc3 released as 6.9.2 final release --- .gitignore | 1 + oniguruma.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 24f1397..f13c061 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ onig-5.9.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 diff --git a/oniguruma.spec b/oniguruma.spec index 2072eb2..b75eee2 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,7 +1,7 @@ %undefine _changelog_trimtime %global mainver 6.9.2 -%global betaver rc3 +#%%global betaver rc3 %global fedorarel 1 @@ -104,6 +104,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue May 7 2019 Mamoru TASAKA - 6.9.2-1 +- rc3 released as 6.9.2 final release + * Wed Apr 24 2019 Mamoru TASAKA - 6.9.2-0.1.rc3 - 6.9.2-rc3 diff --git a/sources b/sources index ecb47fe..7fbc84f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.2-rc3.tar.gz) = c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001 +SHA512 (onig-6.9.2.tar.gz) = c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001 From 8ebd53c39d2e8283f10ce8139dfef657c3f7c79f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Jul 2019 15:47:42 +0900 Subject: [PATCH 30/74] Upstream patch for CVE-2019-13225 (#1728966) NON-upstream patch for CVE-2019-13224 (#1728971) --- ...25-problem-in-converting-if-then-els.patch | 72 +++++++++++++++++++ ...24-don-t-allow-different-encodings-f.patch | 44 ++++++++++++ ...xe-don-t-free-new-pattern-if-success.patch | 27 +++++++ oniguruma.spec | 18 ++++- 4 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch create mode 100644 0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch create mode 100644 0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch diff --git a/0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch b/0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch new file mode 100644 index 0000000..a4c140d --- /dev/null +++ b/0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch @@ -0,0 +1,72 @@ +From c509265c5f6ae7264f7b8a8aae1cfa5fc59d108c Mon Sep 17 00:00:00 2001 +From: "K.Kosako" +Date: Thu, 27 Jun 2019 14:11:55 +0900 +Subject: [PATCH 10/32] Fix CVE-2019-13225: problem in converting if-then-else + pattern to bytecode. + +--- + src/regcomp.c | 25 +++++++++++++++++-------- + 1 file changed, 17 insertions(+), 8 deletions(-) + +diff --git a/src/regcomp.c b/src/regcomp.c +index c2c04a4..ff3431f 100644 +--- a/src/regcomp.c ++++ b/src/regcomp.c +@@ -1307,8 +1307,9 @@ compile_length_bag_node(BagNode* node, regex_t* reg) + len += tlen; + } + ++ len += SIZE_OP_JUMP + SIZE_OP_ATOMIC_END; ++ + if (IS_NOT_NULL(Else)) { +- len += SIZE_OP_JUMP; + tlen = compile_length_tree(Else, reg); + if (tlen < 0) return tlen; + len += tlen; +@@ -1455,7 +1456,7 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env) + + case BAG_IF_ELSE: + { +- int cond_len, then_len, jump_len; ++ int cond_len, then_len, else_len, jump_len; + Node* cond = NODE_BAG_BODY(node); + Node* Then = node->te.Then; + Node* Else = node->te.Else; +@@ -1472,8 +1473,7 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env) + else + then_len = 0; + +- jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END; +- if (IS_NOT_NULL(Else)) jump_len += SIZE_OP_JUMP; ++ jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END + SIZE_OP_JUMP; + + r = add_op(reg, OP_PUSH); + if (r != 0) return r; +@@ -1490,11 +1490,20 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env) + } + + if (IS_NOT_NULL(Else)) { +- int else_len = compile_length_tree(Else, reg); +- r = add_op(reg, OP_JUMP); +- if (r != 0) return r; +- COP(reg)->jump.addr = else_len + SIZE_INC_OP; ++ else_len = compile_length_tree(Else, reg); ++ if (else_len < 0) return else_len; ++ } ++ else ++ else_len = 0; + ++ r = add_op(reg, OP_JUMP); ++ if (r != 0) return r; ++ COP(reg)->jump.addr = SIZE_OP_ATOMIC_END + else_len + SIZE_INC_OP; ++ ++ r = add_op(reg, OP_ATOMIC_END); ++ if (r != 0) return r; ++ ++ if (IS_NOT_NULL(Else)) { + r = compile_tree(Else, reg, env); + } + } +-- +2.21.0 + diff --git a/0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch b/0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch new file mode 100644 index 0000000..4a2b994 --- /dev/null +++ b/0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch @@ -0,0 +1,44 @@ +From 0f7f61ed1b7b697e283e37bd2d731d0bd57adb55 Mon Sep 17 00:00:00 2001 +From: "K.Kosako" +Date: Thu, 27 Jun 2019 17:25:26 +0900 +Subject: [PATCH 11/32] Fix CVE-2019-13224: don't allow different encodings for + onig_new_deluxe() + +--- + src/regext.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/regext.c b/src/regext.c +index fa4b360..965c793 100644 +--- a/src/regext.c ++++ b/src/regext.c +@@ -29,6 +29,7 @@ + + #include "regint.h" + ++#if 0 + static void + conv_ext0be32(const UChar* s, const UChar* end, UChar* conv) + { +@@ -158,6 +159,7 @@ conv_encoding(OnigEncoding from, OnigEncoding to, const UChar* s, const UChar* e + + return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION; + } ++#endif + + extern int + onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, +@@ -169,9 +171,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, + if (IS_NOT_NULL(einfo)) einfo->par = (UChar* )NULL; + + if (ci->pattern_enc != ci->target_enc) { +- r = conv_encoding(ci->pattern_enc, ci->target_enc, pattern, pattern_end, +- &cpat, &cpat_end); +- if (r != 0) return r; ++ return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION; + } + else { + cpat = (UChar* )pattern; +-- +2.21.0 + diff --git a/0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch b/0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch new file mode 100644 index 0000000..6567d25 --- /dev/null +++ b/0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch @@ -0,0 +1,27 @@ +From 4a8db9d50f8281930678ed6f06692545293f3c9d Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 12 Jul 2019 15:38:43 +0900 +Subject: [PATCH] onig_new_deluxe: don't free new pattern if success + +On onig_new_deluxe() success (r == 0), new pattern (cpat) is used in +einfo->pattern, so don't free this. +--- + src/regext.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/regext.c b/src/regext.c +index fa4b360..920d183 100644 +--- a/src/regext.c ++++ b/src/regext.c +@@ -196,7 +196,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, + } + + err2: +- if (cpat != pattern) xfree(cpat); ++ if (r && (cpat != pattern)) xfree(cpat); + + return r; + } +-- +2.21.0 + diff --git a/oniguruma.spec b/oniguruma.spec index b75eee2..7bc0bb1 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -3,7 +3,7 @@ %global mainver 6.9.2 #%%global betaver rc3 -%global fedorarel 1 +%global fedorarel 2 Name: oniguruma Version: %{mainver} @@ -13,6 +13,14 @@ 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 +Patch10: 0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch +#Patch11: 0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch +# Not use Patch11 for F-30 and below, this is almost API change (deprecation of API) in +# onig_new_deluxe() and this change should be avoided (if possible) in stable +# branch +# Instead use another fix +Patch101: 0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch BuildRequires: gcc @@ -49,6 +57,10 @@ for f in \ done %endif +%patch10 -p1 -b .CVE-2019-13225 +#%%patch11 -p1 -b .CVE-2019-13224 +%patch101 -p1 -b .CVE-2019-13224 + %build %configure \ --disable-silent-rules \ @@ -104,6 +116,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 12 2019 Mamoru TASAKA - 6.9.2-2 +- Upstream patch for CVE-2019-13225 (#1728966) +- NON-upstream patch for CVE-2019-13224 (#1728971) + * Tue May 7 2019 Mamoru TASAKA - 6.9.2-1 - rc3 released as 6.9.2 final release From 58adcc65e046af5215b5f006c3b0fb4fef814dfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 23:18:16 +0000 Subject: [PATCH 31/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 7bc0bb1..d39df44 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -7,7 +7,7 @@ Name: oniguruma Version: %{mainver} -Release: %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist} +Release: %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 Summary: Regular expressions library License: BSD @@ -116,6 +116,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 6.9.2-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jul 12 2019 Mamoru TASAKA - 6.9.2-2 - Upstream patch for CVE-2019-13225 (#1728966) - NON-upstream patch for CVE-2019-13224 (#1728971) From aa64d1b7a2c46bd7210e2fd0024074c07808dc83 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 11 Aug 2019 23:51:49 +0900 Subject: [PATCH 32/74] 6.9.3 --- .gitignore | 1 + ...25-problem-in-converting-if-then-els.patch | 72 ------------------- ...24-don-t-allow-different-encodings-f.patch | 44 ------------ ...xe-don-t-free-new-pattern-if-success.patch | 27 ------- oniguruma.spec | 21 ++---- sources | 2 +- 6 files changed, 8 insertions(+), 159 deletions(-) delete mode 100644 0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch delete mode 100644 0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch delete mode 100644 0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch diff --git a/.gitignore b/.gitignore index f13c061..197bd5e 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ onig-5.9.2.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 diff --git a/0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch b/0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch deleted file mode 100644 index a4c140d..0000000 --- a/0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c509265c5f6ae7264f7b8a8aae1cfa5fc59d108c Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Thu, 27 Jun 2019 14:11:55 +0900 -Subject: [PATCH 10/32] Fix CVE-2019-13225: problem in converting if-then-else - pattern to bytecode. - ---- - src/regcomp.c | 25 +++++++++++++++++-------- - 1 file changed, 17 insertions(+), 8 deletions(-) - -diff --git a/src/regcomp.c b/src/regcomp.c -index c2c04a4..ff3431f 100644 ---- a/src/regcomp.c -+++ b/src/regcomp.c -@@ -1307,8 +1307,9 @@ compile_length_bag_node(BagNode* node, regex_t* reg) - len += tlen; - } - -+ len += SIZE_OP_JUMP + SIZE_OP_ATOMIC_END; -+ - if (IS_NOT_NULL(Else)) { -- len += SIZE_OP_JUMP; - tlen = compile_length_tree(Else, reg); - if (tlen < 0) return tlen; - len += tlen; -@@ -1455,7 +1456,7 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env) - - case BAG_IF_ELSE: - { -- int cond_len, then_len, jump_len; -+ int cond_len, then_len, else_len, jump_len; - Node* cond = NODE_BAG_BODY(node); - Node* Then = node->te.Then; - Node* Else = node->te.Else; -@@ -1472,8 +1473,7 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env) - else - then_len = 0; - -- jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END; -- if (IS_NOT_NULL(Else)) jump_len += SIZE_OP_JUMP; -+ jump_len = cond_len + then_len + SIZE_OP_ATOMIC_END + SIZE_OP_JUMP; - - r = add_op(reg, OP_PUSH); - if (r != 0) return r; -@@ -1490,11 +1490,20 @@ compile_bag_node(BagNode* node, regex_t* reg, ScanEnv* env) - } - - if (IS_NOT_NULL(Else)) { -- int else_len = compile_length_tree(Else, reg); -- r = add_op(reg, OP_JUMP); -- if (r != 0) return r; -- COP(reg)->jump.addr = else_len + SIZE_INC_OP; -+ else_len = compile_length_tree(Else, reg); -+ if (else_len < 0) return else_len; -+ } -+ else -+ else_len = 0; - -+ r = add_op(reg, OP_JUMP); -+ if (r != 0) return r; -+ COP(reg)->jump.addr = SIZE_OP_ATOMIC_END + else_len + SIZE_INC_OP; -+ -+ r = add_op(reg, OP_ATOMIC_END); -+ if (r != 0) return r; -+ -+ if (IS_NOT_NULL(Else)) { - r = compile_tree(Else, reg, env); - } - } --- -2.21.0 - diff --git a/0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch b/0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch deleted file mode 100644 index 4a2b994..0000000 --- a/0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0f7f61ed1b7b697e283e37bd2d731d0bd57adb55 Mon Sep 17 00:00:00 2001 -From: "K.Kosako" -Date: Thu, 27 Jun 2019 17:25:26 +0900 -Subject: [PATCH 11/32] Fix CVE-2019-13224: don't allow different encodings for - onig_new_deluxe() - ---- - src/regext.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/regext.c b/src/regext.c -index fa4b360..965c793 100644 ---- a/src/regext.c -+++ b/src/regext.c -@@ -29,6 +29,7 @@ - - #include "regint.h" - -+#if 0 - static void - conv_ext0be32(const UChar* s, const UChar* end, UChar* conv) - { -@@ -158,6 +159,7 @@ conv_encoding(OnigEncoding from, OnigEncoding to, const UChar* s, const UChar* e - - return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION; - } -+#endif - - extern int - onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, -@@ -169,9 +171,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, - if (IS_NOT_NULL(einfo)) einfo->par = (UChar* )NULL; - - if (ci->pattern_enc != ci->target_enc) { -- r = conv_encoding(ci->pattern_enc, ci->target_enc, pattern, pattern_end, -- &cpat, &cpat_end); -- if (r != 0) return r; -+ return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION; - } - else { - cpat = (UChar* )pattern; --- -2.21.0 - diff --git a/0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch b/0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch deleted file mode 100644 index 6567d25..0000000 --- a/0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4a8db9d50f8281930678ed6f06692545293f3c9d Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Fri, 12 Jul 2019 15:38:43 +0900 -Subject: [PATCH] onig_new_deluxe: don't free new pattern if success - -On onig_new_deluxe() success (r == 0), new pattern (cpat) is used in -einfo->pattern, so don't free this. ---- - src/regext.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/regext.c b/src/regext.c -index fa4b360..920d183 100644 ---- a/src/regext.c -+++ b/src/regext.c -@@ -196,7 +196,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end, - } - - err2: -- if (cpat != pattern) xfree(cpat); -+ if (r && (cpat != pattern)) xfree(cpat); - - return r; - } --- -2.21.0 - diff --git a/oniguruma.spec b/oniguruma.spec index d39df44..fcedf12 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,26 +1,18 @@ %undefine _changelog_trimtime -%global mainver 6.9.2 +%global mainver 6.9.3 #%%global betaver rc3 -%global fedorarel 2 +%global fedorarel 1 Name: oniguruma Version: %{mainver} -Release: %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 +Release: %{?betaver: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 -# upstream patches -Patch10: 0010-Fix-CVE-2019-13225-problem-in-converting-if-then-els.patch -#Patch11: 0011-Fix-CVE-2019-13224-don-t-allow-different-encodings-f.patch -# Not use Patch11 for F-30 and below, this is almost API change (deprecation of API) in -# onig_new_deluxe() and this change should be avoided (if possible) in stable -# branch -# Instead use another fix -Patch101: 0101-onig_new_deluxe-don-t-free-new-pattern-if-success.patch BuildRequires: gcc @@ -57,10 +49,6 @@ for f in \ done %endif -%patch10 -p1 -b .CVE-2019-13225 -#%%patch11 -p1 -b .CVE-2019-13224 -%patch101 -p1 -b .CVE-2019-13224 - %build %configure \ --disable-silent-rules \ @@ -116,6 +104,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Aug 11 2019 Mamoru TASAKA - 6.9.3-1 +- 6.9.3 + * Thu Jul 25 2019 Fedora Release Engineering - 6.9.2-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 7fbc84f..cc32cbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.2.tar.gz) = c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001 +SHA512 (onig-6.9.3.tar.gz) = 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861 From 58d458a0e6d5800a623e1520fc049629c3032e4f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 9 Nov 2019 15:45:45 +0900 Subject: [PATCH 33/74] 6.9.4 rc1 --- .gitignore | 1 + oniguruma.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 197bd5e..3c4fe75 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index fcedf12..ede06d6 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,7 +1,7 @@ %undefine _changelog_trimtime -%global mainver 6.9.3 -#%%global betaver rc3 +%global mainver 6.9.4 +%global betaver rc1 %global fedorarel 1 @@ -104,6 +104,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Nov 9 2019 Mamoru TASAKA - 6.9.4-0.1.rc1 +- 6.9.4 rc1 + * Sun Aug 11 2019 Mamoru TASAKA - 6.9.3-1 - 6.9.3 diff --git a/sources b/sources index cc32cbd..0672a22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.3.tar.gz) = 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861 +SHA512 (onig-6.9.4-rc1.tar.gz) = a10e674aef0e57dc2ceb2adb0e42359fa6b6ea550773923f8a0fd235c94e4a6a583b1f6bb459f20afc372727504fadc5c646716b1d5bf1f3f41efc982d4137cb From d107a23a67b1823cfe1b506368733d48bfe188f8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Nov 2019 00:50:22 +0900 Subject: [PATCH 34/74] 6.9.4 rc3 --- .gitignore | 1 + oniguruma.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3c4fe75..a2e0011 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index ede06d6..5e231e9 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,9 +1,9 @@ %undefine _changelog_trimtime %global mainver 6.9.4 -%global betaver rc1 +%global betaver rc3 -%global fedorarel 1 +%global fedorarel 2 Name: oniguruma Version: %{mainver} @@ -104,6 +104,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Nov 29 2019 Mamoru TASAKA - 6.9.4-0.2.rc3 +- 6.9.4 rc3 + * Sat Nov 9 2019 Mamoru TASAKA - 6.9.4-0.1.rc1 - 6.9.4 rc1 diff --git a/sources b/sources index 0672a22..e2d4e2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.4-rc1.tar.gz) = a10e674aef0e57dc2ceb2adb0e42359fa6b6ea550773923f8a0fd235c94e4a6a583b1f6bb459f20afc372727504fadc5c646716b1d5bf1f3f41efc982d4137cb +SHA512 (onig-6.9.4-rc3.tar.gz) = d0da80ba79daa8cdc2f202924cd1ed2ce56a2908b627d9c44e92030591573276dc45b7ac67d3392252038c9c8309848b411d1b7cf8ca80b35c847856991645c6 From d600d86a3f45830016322ff59de9731212fe4fdb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Nov 2019 14:02:04 +0900 Subject: [PATCH 35/74] add CVE note --- oniguruma.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index 5e231e9..c322d74 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -105,13 +105,13 @@ find $RPM_BUILD_ROOT -name '*.la' \ %changelog * Fri Nov 29 2019 Mamoru TASAKA - 6.9.4-0.2.rc3 -- 6.9.4 rc3 +- 6.9.4 rc3 (CVE-2019-19246 CVE-2019-19204 CVE-2019-19203 CVE-2019-19012) * Sat Nov 9 2019 Mamoru TASAKA - 6.9.4-0.1.rc1 - 6.9.4 rc1 * Sun Aug 11 2019 Mamoru TASAKA - 6.9.3-1 -- 6.9.3 +- 6.9.3 (CVE-2019-13224 CVE-2019-13225 CVE-2019-16163) * Thu Jul 25 2019 Fedora Release Engineering - 6.9.2-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 03f0ab577ecf462674d092019f15140ac7b8255f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Nov 2019 14:03:17 +0900 Subject: [PATCH 36/74] fix note --- oniguruma.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oniguruma.spec b/oniguruma.spec index c322d74..f22215c 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -105,10 +105,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ %changelog * Fri Nov 29 2019 Mamoru TASAKA - 6.9.4-0.2.rc3 -- 6.9.4 rc3 (CVE-2019-19246 CVE-2019-19204 CVE-2019-19203 CVE-2019-19012) +- 6.9.4 rc3 (CVE-2019-19204 CVE-2019-19203 CVE-2019-19012) * Sat Nov 9 2019 Mamoru TASAKA - 6.9.4-0.1.rc1 -- 6.9.4 rc1 +- 6.9.4 rc1 (CVE-2019-19246) * Sun Aug 11 2019 Mamoru TASAKA - 6.9.3-1 - 6.9.3 (CVE-2019-13224 CVE-2019-13225 CVE-2019-16163) From 7bdd135d2a1ef4851503e0fc85f7928a42ec26e9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Nov 2019 14:06:15 +0900 Subject: [PATCH 37/74] 6.9.4 final --- .gitignore | 1 + oniguruma.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a2e0011..a80f0e7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ onig-5.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 diff --git a/oniguruma.spec b/oniguruma.spec index f22215c..018d629 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,9 +1,9 @@ %undefine _changelog_trimtime %global mainver 6.9.4 -%global betaver rc3 +#%%global betaver rc3 -%global fedorarel 2 +%global fedorarel 0.100 Name: oniguruma Version: %{mainver} @@ -104,6 +104,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Nov 29 2019 Mamoru TASAKA - 6.9.4-1 +- 6.9.4 final + * Fri Nov 29 2019 Mamoru TASAKA - 6.9.4-0.2.rc3 - 6.9.4 rc3 (CVE-2019-19204 CVE-2019-19203 CVE-2019-19012) diff --git a/sources b/sources index e2d4e2d..1490cca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.4-rc3.tar.gz) = d0da80ba79daa8cdc2f202924cd1ed2ce56a2908b627d9c44e92030591573276dc45b7ac67d3392252038c9c8309848b411d1b7cf8ca80b35c847856991645c6 +SHA512 (onig-6.9.4.tar.gz) = ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b From b02d6d55a4bdd8720a36229221a4ca62988d5268 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 29 Nov 2019 14:10:48 +0900 Subject: [PATCH 38/74] fix release --- oniguruma.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 018d629..5b90947 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -3,7 +3,7 @@ %global mainver 6.9.4 #%%global betaver rc3 -%global fedorarel 0.100 +%global fedorarel 1 Name: oniguruma Version: %{mainver} From 07d92c343d9d6ac6b64d9d7f76acb8eee2aeaebd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 20:07:12 +0000 Subject: [PATCH 39/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 5b90947..cac2c0e 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -7,7 +7,7 @@ Name: oniguruma Version: %{mainver} -Release: %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist} +Release: %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 Summary: Regular expressions library License: BSD @@ -104,6 +104,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 6.9.4-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 29 2019 Mamoru TASAKA - 6.9.4-1 - 6.9.4 final From 7956227af42fa5ca0053834b3e014d64aab1aa50 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 7 May 2020 18:31:43 +0900 Subject: [PATCH 40/74] 6.9.5 revised 1 --- .gitignore | 1 + oniguruma.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a80f0e7..c706dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ onig-5.9.2.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 diff --git a/oniguruma.spec b/oniguruma.spec index cac2c0e..2087bd3 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,13 +1,14 @@ %undefine _changelog_trimtime -%global mainver 6.9.4 -#%%global betaver rc3 +%global mainver 6.9.5 +%global betaver rev1 +%undefine prerelease %global fedorarel 1 Name: oniguruma Version: %{mainver} -Release: %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 +Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist} Summary: Regular expressions library License: BSD @@ -51,6 +52,7 @@ done %build %configure \ + --enable-posix-api \ --disable-silent-rules \ --disable-static \ --with-rubydir=%{_bindir} @@ -101,9 +103,12 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/libonig.so %{_includedir}/onig*.h -%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu May 7 2020 Mamoru TASAKA - 6.9.5-1.rev1 +- 6.9.5 revised 1 + * Wed Jan 29 2020 Fedora Release Engineering - 6.9.4-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 1490cca..61da54f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.4.tar.gz) = ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b +SHA512 (onig-6.9.5-rev1.tar.gz) = d45208f0fc48aab7104601282d68e6d074c0fd74d5791adc35d5b89c7d5a5d34548bff831a606f302e20ae8d5928802bd0965e587f60b162b7cb2b45a66e9c1f From 7d1a3747bc7f0046cb92dbaae444d399b4a780c2 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 1 Jul 2020 12:07:53 -0600 Subject: [PATCH 41/74] Disable LTO --- oniguruma.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/oniguruma.spec b/oniguruma.spec index 2087bd3..3f86a39 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -4,7 +4,7 @@ %global betaver rev1 %undefine prerelease -%global fedorarel 1 +%global fedorarel 2 Name: oniguruma Version: %{mainver} @@ -51,6 +51,11 @@ done %endif %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} + %configure \ --enable-posix-api \ --disable-silent-rules \ @@ -106,6 +111,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 1 2020 Jeff Law - 6.9.5-2.rev1 +- Disable LTO + * Thu May 7 2020 Mamoru TASAKA - 6.9.5-1.rev1 - 6.9.5 revised 1 From 9d54a2d91ebe66cd274df76153dd71032cbeae02 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 02:18:53 +0000 Subject: [PATCH 42/74] 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 f09e2b49e21976362d9f5ca57f44f96b3b60b9f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 12:34:58 +0000 Subject: [PATCH 43/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 3f86a39..07cd3b5 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 @@ -111,6 +111,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 6.9.5-2.rev1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 1 2020 Jeff Law - 6.9.5-2.rev1 - Disable LTO From ffde8e9148aab2bb85739f811584ba194205031f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Oct 2020 16:13:18 +0900 Subject: [PATCH 44/74] Apply upstream fix for CVE-2020-26159 --- oniguruma-XXX-CVE-2020-26159.patch | 22 ++++++++++++++++++++++ oniguruma.spec | 11 +++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 oniguruma-XXX-CVE-2020-26159.patch diff --git a/oniguruma-XXX-CVE-2020-26159.patch b/oniguruma-XXX-CVE-2020-26159.patch new file mode 100644 index 0000000..71a8ada --- /dev/null +++ b/oniguruma-XXX-CVE-2020-26159.patch @@ -0,0 +1,22 @@ +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 07cd3b5..475e85d 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -4,16 +4,19 @@ %global betaver rev1 %undefine prerelease -%global fedorarel 2 +%global fedorarel 3 Name: oniguruma Version: %{mainver} -Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}.1 +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 +# https://github.com/kkos/oniguruma/commit/cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0 +# https://github.com/kkos/oniguruma/issues/207 +Patch1: oniguruma-XXX-CVE-2020-26159.patch BuildRequires: gcc @@ -36,6 +39,7 @@ developing applications that use %{name}. %prep %setup -q -n onig-%{mainver} %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in +%patch1 -p1 -b .CVE-2020-26159 %if 0 for f in \ @@ -111,6 +115,9 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Oct 1 2020 Mamoru TASAKA - 6.9.5-3.rev1 +- Apply upstream fix for CVE-2020-26159 + * Tue Jul 28 2020 Fedora Release Engineering - 6.9.5-2.rev1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 725ebe385188d2f059192b08ba6013e72739fa43 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 12 Oct 2020 15:36:39 +0900 Subject: [PATCH 45/74] 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 46/74] 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 47/74] 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 48/74] 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 49/74] 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 50/74] 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 51/74] 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 52/74] 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 53/74] 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 54/74] - 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 55/74] 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 56/74] - 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 57/74] - 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 58/74] 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 59/74] 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 60/74] 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 61/74] 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 62/74] 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 63/74] 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 64/74] 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 65/74] 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 66/74] 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 67/74] 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 68/74] 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 69/74] 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 70/74] 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 71/74] 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 72/74] 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 73/74] 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 74/74] 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