From a9ab04cb3fb1cc43254ea5aababdf592ce9cf93a Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 27 Oct 2020 21:40:00 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/oniguruma.git#35fac660e05dd74f6cc7e29f5ee46ae00053f5d3 --- .gitignore | 2 ++ ...ncompatibilty-between-6.9.5_rev1-6.9.patch | 29 ------------------- oniguruma.spec | 18 ++++++++---- sources | 2 +- 4 files changed, 16 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..b1385bb 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ 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 +/onig-6.9.6-rc4.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..eb77af8 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,10 +1,10 @@ %undefine _changelog_trimtime %global mainver 6.9.6 -%global betaver rc2 +%global betaver rc4 %define prerelease 1 -%global fedorarel 1 +%global fedorarel 4 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,17 @@ 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 + https://github.com/kkos/oniguruma/issues/221 + +* 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..15d2dc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.6-rc2.tar.gz) = 943c4cd3ddab5a41320b61541a5d83b172781871e9478a2c40ed4422877943e2f7c70cb7ef52e31b1836026b35a431b423fa464edde7796b520637c182741fd7 +SHA512 (onig-6.9.6-rc4.tar.gz) = 3fdee2986c1e2049d72372692ca8d0d3afa0c4a853b2e30bf7f26409179fcbca92ee5a3b66ec8c8eb4b7084207b9584fbbd07955ddd5b085da1a299f9b602ebf