diff --git a/CVE-2019-18397.patch b/CVE-2019-18397.patch deleted file mode 100644 index 157eb18211a4de64f889e7bcd2c1d3dd5a540744..0000000000000000000000000000000000000000 --- a/CVE-2019-18397.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 034c6e9a1d296286305f4cfd1e0072b879f52568 Mon Sep 17 00:00:00 2001 -From: Dov Grobgeld -Date: Thu, 24 Oct 2019 09:37:29 +0300 -Subject: [PATCH] Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL - ---- - lib/fribidi-bidi.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c -index 6c84392..d384878 100644 ---- a/lib/fribidi-bidi.c -+++ b/lib/fribidi-bidi.c -@@ -747,7 +747,9 @@ fribidi_get_par_embedding_levels_ex ( - } - - RL_LEVEL (pp) = level; -- RL_ISOLATE_LEVEL (pp) = isolate_level++; -+ RL_ISOLATE_LEVEL (pp) = isolate_level; -+ if (isolate_level < FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL-1) -+ isolate_level++; - base_level_per_iso_level[isolate_level] = new_level; - - if (!FRIBIDI_IS_NEUTRAL (override)) - diff --git a/fribidi-1.0.10.tar.xz b/fribidi-1.0.10.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..a2ad957f0e1bad3fada349eccde8936d09c53925 Binary files /dev/null and b/fribidi-1.0.10.tar.xz differ diff --git a/fribidi-1.0.5.tar.bz2 b/fribidi-1.0.5.tar.bz2 deleted file mode 100644 index 221783080266143b72bd0bec2ab0343b9987809a..0000000000000000000000000000000000000000 Binary files a/fribidi-1.0.5.tar.bz2 and /dev/null differ diff --git a/fribidi.spec b/fribidi.spec index cbb57ef7586f7908f184a8fd420326aba1a77b76..f355b1f1e461ce1f6cd5678cab4fac227e1c26cd 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,13 +1,12 @@ Name: fribidi -Version: 1.0.5 -Release: 4 +Version: 1.0.10 +Release: 1 Summary: Library implementing the Unicode Bidirectional Algorithm License: LGPLv2+ and UCD URL: https://github.com/fribidi/fribidi/ -Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz -BuildRequires: gcc automake autoconf libtool -Patch6000: CVE-2019-18397.patch +BuildRequires: gcc meson %description A library to handle bidirectional scripts (for example Hebrew, Arabic), @@ -23,17 +22,16 @@ Include files and libraries needed for developing applications which use FriBidi %prep %autosetup -n %{name}-%{version} -p1 -autoreconf -i %build -%configure --disable-static --disable-docs -%make_build +%meson -Ddocs=false +%meson_build %check -make check +%meson_test %install -%make_install +%meson_install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %post -p /sbin/ldconfig @@ -51,9 +49,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_includedir}/fribidi %{_libdir}/libfribidi.so %{_libdir}/pkgconfig/*.pc -%{_mandir}/man3/*.gz +#%%{_mandir}/man3/*.gz %changelog +* Wed Aug 19 2020 jinzhimin - 1.0.10-1 +- version update to 1.0.10 + * Sun Jan 12 2020 zhangrui - 1.0.5-4 - fix CVE-2019-18397