From 9bd4bafbc2d43862bb24e1c1458ffe856798d0b9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Oct 2020 15:28:11 +0200 Subject: From Fedora: Revert fix for CVE-2020-26159, marked as false https://github.com/kkos/oniguruma/issues/221 --- oniguruma.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'oniguruma.spec') diff --git a/oniguruma.spec b/oniguruma.spec index 45d84bf..12f49c7 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -24,7 +24,7 @@ Name: %{libname}%{oldsoname}php Version: %{mainver}%{?postver:+%postver} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Regular expressions library License: BSD @@ -33,9 +33,6 @@ Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?postv # Bump soname from 5 to 105 to allow parallel installation Patch0: onig-soname.patch -# https://github.com/kkos/oniguruma/commit/cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0 -# https://github.com/kkos/oniguruma/issues/207 -Patch1: oniguruma-XXX-CVE-2020-26159.patch BuildRequires: gcc @@ -70,7 +67,6 @@ developing applications that use %{name}. %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in %patch0 -p1 -b .bump -%patch1 -p1 -b .CVE-2020-26159 %if 0 for f in \ @@ -156,6 +152,10 @@ sed -e '/^test_regset_LDADD/s/$/ -lrt/' -i test/Makefile %changelog +* Tue Oct 20 2020 Remi Collet -6.9.5+rev1-4 +- From Fedora: Revert fix for CVE-2020-26159, marked as false + https://github.com/kkos/oniguruma/issues/221 + * Thu Oct 1 2020 Remi Collet -6.9.5+rev1-3 - From Fedora: Apply upstream fix for CVE-2020-26159 -- cgit