diff --git a/backport-CVE-2023-25193.patch b/backport-CVE-2023-25193.patch deleted file mode 100644 index 675fafd855671a9ac9fab4a25648b518e4cfc944..0000000000000000000000000000000000000000 --- a/backport-CVE-2023-25193.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 85be877925ddbf34f74a1229f3ca1716bb6170dc Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod -Date: Wed, 1 Feb 2023 20:00:43 -0700 -Subject: [PATCH] [layout] Limit how far we skip when looking back - -See comments. ---- - src/hb-ot-layout-gsubgpos.hh | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh -index bf74672a1..8ca691805 100644 ---- a/src/hb-ot-layout-gsubgpos.hh -+++ b/src/hb-ot-layout-gsubgpos.hh -@@ -578,6 +578,13 @@ struct hb_ot_apply_context_t : - unsigned stop = num_items - 1; - if (c->buffer->flags & HB_BUFFER_FLAG_PRODUCE_UNSAFE_TO_CONCAT) - stop = 1 - 1; -+ -+ /* When looking back, limit how far we search; this function is mostly -+ * used for looking back for base glyphs when attaching marks. If we -+ * don't limit, we can get O(n^2) behavior where n is the number of -+ * consecutive marks. */ -+ stop = (unsigned) hb_max ((int) stop, (int) idx - HB_MAX_CONTEXT_LENGTH); -+ - while (idx > stop) - { - idx--; --- -2.20.1 - diff --git a/harfbuzz-6.0.0.tar.xz b/harfbuzz-8.3.0.tar.xz similarity index 67% rename from harfbuzz-6.0.0.tar.xz rename to harfbuzz-8.3.0.tar.xz index 75aff2ad11237ecfd950f0499bb773a63d4244c2..df724a4bcada9bf00f659badc859d2a4d89d76e7 100644 Binary files a/harfbuzz-6.0.0.tar.xz and b/harfbuzz-8.3.0.tar.xz differ diff --git a/harfbuzz.spec b/harfbuzz.spec index 75f45bf1d6d094d6877430078597e8c6f7f7bd20..fddb7e5affc983d01f2d21865b6fe19a0e3d94f4 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -1,13 +1,11 @@ Name: harfbuzz -Version: 6.0.0 +Version: 8.3.0 Release: 1 Summary: A text shaping engine License: MIT URL: https://harfbuzz.github.io/ Source0: https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/harfbuzz-%{version}.tar.xz -Patch0001: backport-CVE-2023-25193.patch - BuildRequires: gcc-c++ freetype-devel cairo-devel glib2-devel graphite2-devel BuildRequires: gtk-doc libicu-devel gobject-introspection-devel make Provides: harfbuzz-icu @@ -55,6 +53,7 @@ make check %{_libdir}/libharfbuzz-icu.so.* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/HarfBuzz-0.0.typelib +%{_libdir}/libharfbuzz-cairo.so.0* %files devel %{_bindir}/* @@ -70,6 +69,9 @@ make check %{_datadir}/gtk-doc/html/harfbuzz/* %changelog +* Wed Nov 22 2023 wangqia - 8.3.0-1 +- Update to 8.3.0 + * Wed Feb 22 2023 liweiganga - 6.0.0-1 - upstream to 6.0.0