.gitignore

@@ -1 +1 @@
-SOURCES/harfbuzz-2.7.4.tar.xz
+SOURCES/harfbuzz-8.4.0.tar.xz

.harfbuzz.metadata

@@ -1 +1 @@
-a85339c716b0ff249e4afe0839ece611594cf648 SOURCES/harfbuzz-2.7.4.tar.xz
+53497e8af05bd17fe3d608b35e9a849a2cb980f7 SOURCES/harfbuzz-8.4.0.tar.xz

SOURCES/CVE-2022-33068-sbix-Limit-glyph-extents.patch

@@ -1,30 +0,0 @@
-From 62e803b36173fd096d7ad460dd1d1db9be542593 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Wed, 1 Jun 2022 07:38:21 -0600
-Subject: [PATCH 001/363] [sbix] Limit glyph extents
-
-Fixes https://github.com/harfbuzz/harfbuzz/issues/3557
----
- src/hb-ot-color-sbix-table.hh       |   6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh
-index 9741ebd45..6efae43cd 100644
---- a/src/hb-ot-color-sbix-table.hh
-+++ b/src/hb-ot-color-sbix-table.hh
-@@ -298,6 +298,12 @@ struct sbix
- 
-       const PNGHeader &png = *blob->as<PNGHeader>();
- 
-+      if ((png.IHDR.height >= 65536) | (png.IHDR.width >= 65536))
-+      {
-+	hb_blob_destroy (blob);
-+	return false;
-+      }
-+
-       extents->x_bearing = x_offset;
-       extents->y_bearing = png.IHDR.height + y_offset;
-       extents->width     = png.IHDR.width;
--- 
-2.36.1
-

SOURCES/harfbuzz-8.4.0-sast.patch

@@ -0,0 +1,44 @@
+diff -urN harfbuzz-8.4.0.old/src/hb-cff-interp-dict-common.hh harfbuzz-8.4.0/src/hb-cff-interp-dict-common.hh
+--- harfbuzz-8.4.0.old/src/hb-cff-interp-dict-common.hh	2024-03-29 20:03:04.000000000 +0530
++++ harfbuzz-8.4.0/src/hb-cff-interp-dict-common.hh	2024-08-16 14:53:09.265168054 +0530
+@@ -84,7 +84,7 @@
+ 
+     enum Nibble { DECIMAL=10, EXP_POS, EXP_NEG, RESERVED, NEG, END };
+ 
+-    char buf[32];
++    char buf[32] = {0};
+     unsigned char byte = 0;
+     for (unsigned i = 0, count = 0; count < ARRAY_LENGTH (buf); ++i, ++count)
+     {
+diff -urN harfbuzz-8.4.0.old/test/api/test-font.c harfbuzz-8.4.0/test/api/test-font.c
+--- harfbuzz-8.4.0.old/test/api/test-font.c	2024-03-29 20:03:04.000000000 +0530
++++ harfbuzz-8.4.0/test/api/test-font.c	2024-08-16 14:53:09.266168070 +0530
+@@ -417,7 +417,7 @@
+   font2 = hb_font_create_sub_font (font1);
+   hb_font_destroy (font1);
+   ffuncs2 = hb_font_funcs_create ();
+-  hb_font_funcs_set_nominal_glyphs_func (ffuncs1, nominal_glyphs_func, NULL, NULL);
++  hb_font_funcs_set_nominal_glyphs_func (ffuncs2, nominal_glyphs_func, NULL, NULL);
+   hb_font_set_funcs (font2, ffuncs2, NULL, NULL);
+   hb_font_funcs_destroy (ffuncs2);
+ 
+diff -urN harfbuzz-8.4.0.old/util/hb-subset.cc harfbuzz-8.4.0/util/hb-subset.cc
+--- harfbuzz-8.4.0.old/util/hb-subset.cc	2024-03-29 20:03:04.000000000 +0530
++++ harfbuzz-8.4.0/util/hb-subset.cc	2024-08-16 14:53:09.267168086 +0530
+@@ -792,6 +792,7 @@
+       g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
+ 		   "Failed reading file `%s': %s",
+ 		   arg, strerror (errno));
++      fclose(fp);
+       return false;
+     }
+     g_string_append_c (gs, '\0');
+@@ -812,6 +813,8 @@
+ 
+   g_string_free (gs, false);
+ 
++  fclose(fp);
++
+   return true;
+ }
+ 

SPECS/harfbuzz.spec

@@ -1,14 +1,13 @@
 Name:           harfbuzz
-Version:        2.7.4
+Version:        8.4.0
-Release:        8%{?dist}
+Release:        5%{?dist}
 Summary:        Text shaping library
 
-License:        MIT
+License:        MIT-Modern-Variant
-URL:            https://harfbuzz.github.io/
+URL:            https://github.com/harfbuzz/harfbuzz/
 Source0:        https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/harfbuzz-%{version}.tar.xz
 
-# Upstream patch https://github.com/harfbuzz/harfbuzz/issues/3557
+Patch0:         harfbuzz-8.4.0-sast.patch
-Patch0:         CVE-2022-33068-sbix-Limit-glyph-extents.patch
 
 BuildRequires:  cairo-devel
 BuildRequires:  freetype-devel
@@ -18,7 +17,7 @@ BuildRequires:  libicu-devel
 BuildRequires:  graphite2-devel
 BuildRequires:  gtk-doc
 BuildRequires:  gcc-c++
-BuildRequires: make
+BuildRequires:  make
 
 %description
 HarfBuzz is an implementation of the OpenType Layout engine.
@@ -28,6 +27,7 @@ HarfBuzz is an implementation of the OpenType Layout engine.
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-icu%{?_isa} = %{version}-%{release}
+Requires:       %{name}-cairo%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -40,6 +40,13 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description    icu
 This package contains Harfbuzz ICU support library.
 
+%package        cairo
+Summary:        Harfbuzz Cairo support library
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    cairo
+This package contains Harfbuzz Cairo support library.
+
 %prep
 %autosetup -p1
 
@@ -58,6 +65,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %ldconfig_scriptlets icu
 
+%ldconfig_scriptlets cairo
 
 %files
 %license COPYING
@@ -70,6 +78,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %files devel
 %doc %{_datadir}/gtk-doc
+%{_bindir}/hb-info
 %{_bindir}/hb-view
 %{_bindir}/hb-ot-shape-closure
 %{_bindir}/hb-shape
@@ -77,9 +86,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/harfbuzz/
 %{_libdir}/libharfbuzz.so
 %{_libdir}/libharfbuzz-gobject.so
+%{_libdir}/libharfbuzz-cairo.so
 %{_libdir}/libharfbuzz-icu.so
 %{_libdir}/libharfbuzz-subset.so
 %{_libdir}/pkgconfig/harfbuzz.pc
+%{_libdir}/pkgconfig/harfbuzz-cairo.pc
 %{_libdir}/pkgconfig/harfbuzz-gobject.pc
 %{_libdir}/pkgconfig/harfbuzz-icu.pc
 %{_libdir}/pkgconfig/harfbuzz-subset.pc
@@ -90,26 +101,199 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %files icu
 %{_libdir}/libharfbuzz-icu.so.*
 
+%files cairo
+%{_libdir}/libharfbuzz-cairo.so.*
+
 %changelog
-* Mon Jul 18 2022 Parag Nemade <pnemade AT redhat DOT com> - 2.7.4-8
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 8.4.0-5
-- Resolves:rh#2103849
+- Bump release for October 2024 mass rebuild:
-- Update tests.yaml
+  Resolves: RHEL-64018
+
+* Wed Aug 21 2024 Parag Nemade <pnemade AT redhat DOT com> - 8.4.0-4
+- Resolves: RHEL-55386 - split libharfbuzz-cairo library into harfbuzz-cairo subpackage
+
+* Fri Aug 16 2024 Parag Nemade <pnemade AT redhat DOT com> - 8.4.0-3
+- Resolves: RHEL-45541 - SAST fix
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 8.4.0-2
+- Bump release for June 2024 mass rebuild
+
+* Sun Mar 31 2024 Parag Nemade <pnemade AT redhat DOT com> - 8.4.0-1
+- Update to 8.4.0 version (#2272294)
+
+* Mon Mar 18 2024 Parag Nemade <pnemade AT redhat DOT com> - 8.3.1-1
+- Update to 8.3.1 version (#2270012)
+
+* Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 8.3.0-5
+- Rebuild for ICU 74
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Nov 12 2023 Parag Nemade <pnemade AT redhat DOT com> - 8.3.0-2
+- Remove the upstream released patch
+
+* Sun Nov 12 2023 Parag Nemade <pnemade AT redhat DOT com> - 8.3.0-1
+- Update to 8.3.0 version (#2244950)
+
+* Sat Sep 30 2023 Parag Nemade <pnemade AT redhat DOT com> - 8.2.1-2
+- Resolves:rh#2241391 - Fix LibreOffice tests run
+
+* Wed Sep 20 2023 Parag Nemade <pnemade AT redhat DOT com> - 8.2.1-1
+- Update to 8.2.1 version (#2239664)
+
+* Tue Sep 12 2023 Parag Nemade <pnemade AT redhat DOT com> - 8.2.0-1
+- Update to 8.2.0 version (#2238190)
+
+* Thu Aug 03 2023 Parag Nemade <pnemade AT redhat DOT com> - 8.1.1-1
+- Update to 8.1.1 version (#2228195)
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 18 2023 Parag Nemade <pnemade AT redhat DOT com> - 8.0.1-2
+- Attempt another build for previouslt failed i686 build
+
+* Fri Jul 14 2023 Parag Nemade <pnemade AT redhat DOT com> - 8.0.1-1
+- Update to 8.0.1 version (#2222800)
+
+* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 8.0.0-2
+- Rebuilt for ICU 73.2
+
+* Tue Jul 11 2023 Parag Nemade <pnemade AT redhat DOT com> - 8.0.0-1
+- Update to 8.0.0 version (#2221636)
+
+* Fri Jul 07 2023 Parag Nemade <pnemade AT redhat DOT com> - 7.3.0-2
+- Migrate to SPDX license expression
+
+* Thu May 11 2023 Parag Nemade <pnemade AT redhat DOT com> - 7.3.0-1
+- Update to 7.3.0 version (#2201459)
+
+* Fri Apr 28 2023 Parag Nemade <pnemade AT redhat DOT com> - 7.2.0-1
+- Update to 7.2.0 version (#2190067)
+
+* Fri Mar 03 2023 Parag Nemade <pnemade AT redhat DOT com> - 7.1.0-1
+- Update to 7.1.0 version (#2175109)
+
+* Sat Feb 25 2023 Marek Kasik <mkasik@redhat.com> - 7.0.1-2
+- Rebuild for freetype-2.13.0
+
+* Wed Feb 22 2023 Parag Nemade <pnemade AT redhat DOT com> - 7.0.1-1
+- Update to 7.0.1 version (#2169172)
+
+* Mon Feb 13 2023 Parag Nemade <pnemade AT redhat DOT com> - 7.0.0-2
+- Add hb-info, libharfbuzz-cairo library files
+
+* Mon Feb 13 2023 Parag Nemade <pnemade AT redhat DOT com> - 7.0.0-1
+- Update to 7.0.0 version (#2169172)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 6.0.0-2
+- Rebuild for ICU 72
+
+* Sat Dec 17 2022 Parag Nemade <pnemade AT redhat DOT com> - 6.0.0-1
+- Update to 6.0.0 version (#2154489)
+
+* Mon Oct 24 2022 Parag Nemade <pnemade AT redhat DOT com> - 5.3.1-1
+- Update to 5.3.1 version (#2136315)
+
+* Tue Oct 11 2022 Parag Nemade <pnemade AT redhat DOT com> - 5.3.0-1
+- Update to 5.3.0 version (#2133292)
+
+* Sat Sep 17 2022 Parag Nemade <pnemade AT redhat DOT com> - 5.2.0-1
+- Update to 5.2.0 version (#2127603)
+
+* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.1.0-2
+- Rebuilt for ICU 71.1
+
+* Mon Aug 01 2022 Parag Nemade <pnemade AT redhat DOT com> - 5.1.0-1
+- Update to 5.1.0 version (#2112779)
+
+* Sun Jul 24 2022 Parag Nemade <pnemade AT redhat DOT com> - 5.0.1-1
+- Update to 5.0.1 version (#2110181)
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 29 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.4.1-1
+- Update to 4.4.1 version (#2102301)
+
+* Tue Jun 28 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.4.0-1
+- Update to 4.4.0 version (#2101663)
+
+* Mon May 23 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.3.0-1
+- Update to 4.3.0 version (#2088860)
+
+* Mon Apr 25 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.2.1-1
+- Update to 4.2.1 version (#2078234)
+
+* Thu Mar 31 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.2.0-1
+- Update to 4.2.0 version (#2070259)
+
+* Mon Mar 28 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.1.0-1
+- Update to 4.1.0 version (#2067726)
+
+* Mon Mar 14 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.0.1-1
+- Update to 4.0.1 version (#2063439)
+
+* Thu Mar 03 2022 Parag Nemade <pnemade AT redhat DOT com> - 4.0.0-1
+- Update to 4.0.0 version (#2059806)
+
+* Sun Feb 13 2022 Parag Nemade <pnemade AT redhat DOT com> - 3.4.0-1
+- Update to 3.4.0 version (#2053891)
+
+* Sun Feb 06 2022 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 3.3.2-1
+- Update to 3.3.2 (#2051293)
+
+* Thu Feb 03 2022 Parag Nemade <pnemade AT redhat DOT com> - 3.3.1-1
+- Update to 3.3.1 version (#2048881)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Dec 13 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.2.0-1
+- Update to 3.2.0 version (#2031525)
+
+* Tue Nov 30 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.1.2-1
+- Update to 3.1.2 version (#2026992)
+
+* Tue Nov 09 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.1.1-1
+- Update to 3.1.1 version (#2021316)
+
+* Sat Nov 06 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.1.0-2
+- Fix build failure on armv7hl architecture 
+
+* Fri Nov 05 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.1.0-1
+- Update to 3.1.0 version (#2020154)
+
+* Sat Sep 18 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.0.0-1
+- Update to 3.0.0 version (#2005503)
+
+* Mon Sep 13 2021 Parag Nemade <pnemade AT redhat DOT com> - 2.9.1-1
+- Update to 2.9.1 version (#2002020)
+
+* Fri Aug 20 2021 Parag Nemade <pnemade AT redhat DOT com> - 2.9.0-1
+- Update to 2.9.0 version (#1995436)
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Mon Jul 18 2022 Parag Nemade <pnemade AT redhat DOT com> - 2.7.4-7
+* Mon Jul 12 2021 Parag Nemade <pnemade AT redhat DOT com> - 2.8.2-1
-- Resolves:rh#2103849 CVE-2022-33068
+- Update to 2.8.2 version (#1980729)
-- Fix Covscan compiler warning for inclusion of parenthesis
-- Update tests.yaml
 
-* Fri Jul 15 2022 Parag Nemade <pnemade AT redhat DOT com> - 2.7.4-6
+* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 2.8.1-2
-- Resolves:rh#2103849 CVE-2022-33068
+- Rebuild for ICU 69
-  harfbuzz: integer overflow in the component hb-ot-shape-fallback.c
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.4-5
+* Wed May 05 2021 Parag Nemade <pnemade AT redhat DOT com> - 2.8.1-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Update to 2.8.1 version (#1956915)
-  Related: rhbz#1991688
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.4-4
+* Wed Mar 17 2021 Parag Nemade <pnemade AT redhat DOT com> - 2.8.0-1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Update to 2.8.0 version (#1939692)
 
 * Fri Feb 5 2021 Marek Kasik <mkasik@redhat.com> - 2.7.4-3
 - Build HarfBuzz with bootstrapped freetype