14 changed files with 568 additions and 115 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -79,3 +79,75 @@
 /harfbuzz-1.7.3.tar.bz2
 /harfbuzz-1.7.4.tar.bz2
 /harfbuzz-1.7.5.tar.bz2
+/harfbuzz-1.7.6.tar.bz2
+/harfbuzz-1.7.7.tar.bz2
+/harfbuzz-1.8.0.tar.bz2
+/harfbuzz-1.8.1.tar.bz2
+/harfbuzz-1.8.2.tar.bz2
+/harfbuzz-1.8.3.tar.bz2
+/harfbuzz-1.8.4.tar.bz2
+/harfbuzz-1.8.5.tar.bz2
+/harfbuzz-1.8.7.tar.bz2
+/harfbuzz-1.8.8.tar.bz2
+/harfbuzz-2.0.0.tar.bz2
+/harfbuzz-2.0.1.tar.bz2
+/harfbuzz-2.0.2.tar.bz2
+/harfbuzz-2.1.0.tar.bz2
+/harfbuzz-2.1.1.tar.bz2
+/harfbuzz-2.1.3.tar.bz2
+/harfbuzz-2.3.1.tar.bz2
+/harfbuzz-2.5.0.tar.xz
+/harfbuzz-2.5.1.tar.xz
+/harfbuzz-2.5.2.tar.xz
+/harfbuzz-2.5.3.tar.xz
+/harfbuzz-2.6.0.tar.xz
+/harfbuzz-2.6.1.tar.xz
+/harfbuzz-2.6.2.tar.xz
+/harfbuzz-2.6.3.tar.xz
+/harfbuzz-2.6.4.tar.xz
+/harfbuzz-2.6.6.tar.xz
+/harfbuzz-2.6.7.tar.xz
+/harfbuzz-2.6.8.tar.xz
+/harfbuzz-2.7.1.tar.xz
+/harfbuzz-2.7.2.tar.xz
+/harfbuzz-2.7.3.tar.xz
+/harfbuzz-2.7.4.tar.xz
+/harfbuzz-2.8.0.tar.xz
+/harfbuzz-2.8.1.tar.xz
+/harfbuzz-2.8.2.tar.xz
+/harfbuzz-2.9.0.tar.xz
+/harfbuzz-3.0.0.tar.xz
+/harfbuzz-3.1.0.tar.xz
+/harfbuzz-3.1.1.tar.xz
+/harfbuzz-3.1.2.tar.xz
+/harfbuzz-3.2.0.tar.xz
+/harfbuzz-3.3.1.tar.xz
+/harfbuzz-3.3.2.tar.xz
+/harfbuzz-3.4.0.tar.xz
+/harfbuzz-4.0.0.tar.xz
+/harfbuzz-4.0.1.tar.xz
+/harfbuzz-4.1.0.tar.xz
+/harfbuzz-4.2.0.tar.xz
+/harfbuzz-4.2.1.tar.xz
+/harfbuzz-4.3.0.tar.xz
+/harfbuzz-4.4.0.tar.xz
+/harfbuzz-4.4.1.tar.xz
+/harfbuzz-5.0.1.tar.xz
+/harfbuzz-5.1.0.tar.xz
+/harfbuzz-5.2.0.tar.xz
+/harfbuzz-5.3.0.tar.xz
+/harfbuzz-5.3.1.tar.xz
+/harfbuzz-6.0.0.tar.xz
+/harfbuzz-7.0.0.tar.xz
+/harfbuzz-7.0.1.tar.xz
+/harfbuzz-7.1.0.tar.xz
+/harfbuzz-7.2.0.tar.xz
+/harfbuzz-7.3.0.tar.xz
+/harfbuzz-8.0.0.tar.xz
+/harfbuzz-8.0.1.tar.xz
+/harfbuzz-8.1.1.tar.xz
+/harfbuzz-8.2.0.tar.xz
+/harfbuzz-8.2.1.tar.xz
+/harfbuzz-8.3.0.tar.xz
+/harfbuzz-8.3.1.tar.xz
+/harfbuzz-8.4.0.tar.xz
--- a/CVE-2023-25193-Limit_how_far_we_skip_when_looking_back.patch
+++ b/CVE-2023-25193-Limit_how_far_we_skip_when_looking_back.patch
@ -1,20 +0,0 @@
-diff -urN harfbuzz-1.7.5.old/src/hb-ot-layout-gsubgpos-private.hh harfbuzz-1.7.5/src/hb-ot-layout-gsubgpos-private.hh
--- harfbuzz-1.7.5.old/src/hb-ot-layout-gsubgpos-private.hh	2018-01-27 07:43:07.000000000 +0530
-+++ harfbuzz-1.7.5/src/hb-ot-layout-gsubgpos-private.hh	2023-09-25 12:18:00.277228938 +0530
-@@ -368,7 +368,15 @@
-     inline bool prev (void)
-     {
-       assert (num_items > 0);
-      while (idx >= num_items)
-+      unsigned stop = num_items - 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) ((int) stop >= (int) idx - HB_MAX_CONTEXT_LENGTH ? stop : (int) idx - HB_MAX_CONTEXT_LENGTH);
-+
-+      while (idx > stop)
-       {
- 	idx--;
- 	const hb_glyph_info_t &info = c->buffer->out_info[idx];
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-8
+  - rhel-10
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/harfbuzz-8.4.0-sast.patch
+++ b/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;
+ }
+ 
--- a/harfbuzz.spec
+++ b/harfbuzz.spec
@ -1,22 +1,23 @@
 Name:           harfbuzz
-Version:        1.7.5
-Release:        4%{?dist}
+Version:        8.4.0
+Release:        5%{?dist}
 Summary:        Text shaping library

-License:        MIT
-URL:            http://freedesktop.org/wiki/Software/HarfBuzz
-Source0:        http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{version}.tar.bz2
+License:        MIT-Modern-Variant
+URL:            https://github.com/harfbuzz/harfbuzz/
+Source0:        https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/harfbuzz-%{version}.tar.xz

-# https://github.com/harfbuzz/harfbuzz/issues/4147#issuecomment-1707674277
-Patch1:         CVE-2023-25193-Limit_how_far_we_skip_when_looking_back.patch
+Patch0:         harfbuzz-8.4.0-sast.patch

 BuildRequires:  cairo-devel
 BuildRequires:  freetype-devel
 BuildRequires:  glib2-devel
+BuildRequires:  gobject-introspection-devel
 BuildRequires:  libicu-devel
 BuildRequires:  graphite2-devel
 BuildRequires:  gtk-doc
 BuildRequires:  gcc-c++
+BuildRequires:  make

 %description
 HarfBuzz is an implementation of the OpenType Layout engine.
@ -26,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
@ -38,55 +40,408 @@ 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
-# rpminspect complained about invalid unicode characters like 0x202B and 0x202C
-rm -f test/shaping/texts/in-house/shaper-arabic/script-arabic/language-persian/mehran.txt
+

 %build
-%configure --disable-static --with-graphite2
-
-# Remove lib64 rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags} V=1
+%configure --disable-static --with-graphite2 --with-gobject --enable-introspection
+%{make_build}


 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%{make_install}
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la


-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets

-%post icu -p /sbin/ldconfig
-%postun icu -p /sbin/ldconfig
+%ldconfig_scriptlets icu

+%ldconfig_scriptlets cairo

 %files
 %license COPYING
 %doc NEWS AUTHORS README
-%{_libdir}/libharfbuzz.so.*
+%{_libdir}/libharfbuzz.so.0*
+%{_libdir}/libharfbuzz-gobject.so.0*
+%{_libdir}/libharfbuzz-subset.so.0*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/HarfBuzz-0.0.typelib

 %files devel
 %doc %{_datadir}/gtk-doc
+%{_bindir}/hb-info
 %{_bindir}/hb-view
 %{_bindir}/hb-ot-shape-closure
 %{_bindir}/hb-shape
+%{_bindir}/hb-subset
 %{_includedir}/harfbuzz/
 %{_libdir}/libharfbuzz.so
-%{_libdir}/pkgconfig/harfbuzz.pc
+%{_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
+%{_libdir}/cmake/harfbuzz/
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/HarfBuzz-0.0.gir

 %files icu
 %{_libdir}/libharfbuzz-icu.so.*

+%files cairo
+%{_libdir}/libharfbuzz-cairo.so.*
+
 %changelog
-* Mon Sep 25 2023 Parag Nemade <pnemade AT redhat DOT com> - 1.7.5-4
- Resolves:RHEL-8400 allows attackers to trigger O(n^2) growth via consecutive marks
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 8.4.0-5
+- Bump release for October 2024 mass rebuild:
+  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 12 2021 Parag Nemade <pnemade AT redhat DOT com> - 2.8.2-1
+- Update to 2.8.2 version (#1980729)
+
+* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 2.8.1-2
+- Rebuild for ICU 69
+
+* Wed May 05 2021 Parag Nemade <pnemade AT redhat DOT com> - 2.8.1-1
+- Update to 2.8.1 version (#1956915)
+
+* Wed Mar 17 2021 Parag Nemade <pnemade AT redhat DOT com> - 2.8.0-1
+- 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
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Dec 27 20:48:11 IST 2020 Parag Nemade <pnemade AT redhat DOT com> - 2.7.4-1
+- Update to 2.7.4 version (#1911046)
+
+* Fri Dec 25 14:01:50 IST 2020 Parag Nemade <pnemade AT redhat DOT com> - 2.7.3-1
+- Update to 2.7.3 version (#1910482)
+
+* Sat Aug 29 2020 Parag Nemade <pnemade AT redhat DOT com> - 2.7.2-1
+- Update to 2.7.2 version (#1873689)
+
+* Thu Aug 20 2020 Parag Nemade <pnemade AT redhat DOT com> - 2.7.1-1
+- Update to 2.7.1 version (#1860607)
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 23 2020 Parag Nemade <pnemade AT redhat DOT com> - 2.6.8-1
+- Update to 2.6.8 version (#1849805)
+
+* Thu Jun 04 2020 Parag Nemade <pnemade AT redhat DOT com> - 2.6.7-1
+- Update to 2.6.7 version (#1843592)
+
+* Fri May 15 2020 Pete Walter <pwalter@fedoraproject.org> - 2.6.6-2
+- Rebuild for ICU 67
+
+* Tue May 12 2020 Parag Nemade <pnemade AT redhat DOT com> - 2.6.6-1
+- Update to 2.6.6 version (#1834887)
+
+* Wed Mar 18 2020 Parag Nemade <pnemade AT redhat DOT com> - 2.6.4-4
+- Use make_build and make_install macros
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 2.6.4-2
+- Rebuild for ICU 65
+
+* Wed Oct 30 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.6.4-1
+- Update to 2.6.4 version (#1766762)
+
+* Tue Oct 29 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.6.3-1
+- Update to 2.6.3 version (#1766396)
+
+* Tue Oct 01 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.6.2-1
+- Update to 2.6.2 version (#1757207)
+
+* Wed Sep 18 2019 Kalev Lember <klember@redhat.com> - 2.6.1-2
+- Build with --with-gobject --enable-introspection (#1737186)
+- Tighten soname globs
+
+* Fri Aug 23 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.6.1-1
+- Update to 2.6.1 version (#1744835)
+
+* Sat Aug 17 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.6.0-1
+- Update to 2.6.0 version (#1742730)
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jul 12 2019 Adam Williamson <awilliam@redhat.com> - 2.5.3-2
+- Revert the offending commit to avoid RHBZ #1689037
+
+* Thu Jun 27 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.5.3-1
+- Update to 2.5.3 version (#1724317)
+
+* Fri Jun 21 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.5.2-1
+- Update to 2.5.2 version (#1722623)
+
+* Sat Jun 01 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.5.1-1
+- Update to 2.5.1 version (#1716024)
+
+* Sun May 26 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.5.0-1
+- Update to 2.5.0 version (#1713797)
+
+* Fri Apr 12 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.4.0-1
+- Update to 2.4.0 version (#1693940)
+
+* Thu Jan 31 2019 Parag Nemade <pnemade AT redhat DOT com> - 2.3.1-1
+- Update to 2.3.1 version (#1671165)
+
+* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 2.1.3-2
+- Rebuild for ICU 63
+
+* Fri Nov 23 2018 Parag Nemade <pnemade AT redhat DOT com> - 2.1.3-1
+- Update to 2.1.3 version
+
+* Thu Nov 08 2018 Parag Nemade <pnemade AT redhat DOT com> - 2.1.1-1
+- Update to 2.1.1 version
+
+* Sun Nov 04 2018 Parag Nemade <pnemade AT redhat DOT com> - 2.1.0-1
+- Update to 2.1.0 version
+
+* Thu Nov 01 2018 Parag Nemade <pnemade AT redhat DOT com> - 2.0.2-1
+- Update to 2.0.2 version
+
+* Sun Oct 28 2018 Parag Nemade <pnemade AT redhat DOT com> - 2.0.1-1
+- Update to 2.0.1 version
+
+* Sat Oct 27 2018 Parag Nemade <pnemade AT redhat DOT com> - 2.0.0-1
+- Update to 2.0.0 version
+
+* Fri Sep 07 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.8-1
+- Update to 1.8.8 version
+
+* Thu Aug 09 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.7-1
+- Update to 1.8.7 version (#1613591)
+
+* Thu Aug 02 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.5-1
+- Update to 1.8.5 version (#1611028)
+
+* Wed Jul 18 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.4-1
+- Update to 1.8.4 version (#1601890)
+
+* Fri Jul 13 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.3-1
+- Update to 1.8.3 version (#1600306)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 1.8.2-2
+- Rebuild for ICU 62
+
+* Tue Jul 03 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.2-1
+- Update to 1.8.2 version (#1597679)
+
+* Thu Jun 14 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.1-1
+- Update to 1.8.1 version (#1590575)
+
+* Wed Jun 06 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-1
+- Update to 1.8.0 version (#1587987)
+
+* Wed Jun 06 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.7.7-1
+- Update to 1.7.7 version (#1552962)
+
+* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 1.7.6-2
+- Rebuild for ICU 61.1
+
+* Thu Mar 08 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.7.6-1
+- Update to 1.7.6 version (#1552962)
+- Added new lib libharfbuzz-subset by upstream
+- Added harfbuzz cmake file
+- Added hb-subset binary file

 * Mon Feb 19 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.7.5-3
 - Add BuildRequires: gcc-c++ as per packaging guidelines
--- a/plans/harfbuzz.fmf
+++ b/plans/harfbuzz.fmf
@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (harfbuzz-1.7.5.tar.bz2) = c2c13fc97bb74f0f13092b07804f7087e948bce49793f48b62c2c24a5792523acc0002840bebf21829172bb2e7c3df9f9625250aec6c786a55489667dd04d6a0
+SHA512 (harfbuzz-8.4.0.tar.xz) = 9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542
--- a/tests/RPM-GPG-KEY-EPEL-8
+++ b/tests/RPM-GPG-KEY-EPEL-8
@ -1,28 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFz3zvsBEADJOIIWllGudxnpvJnkxQz2CtoWI7godVnoclrdl83kVjqSQp+2
-dgxuG5mUiADUfYHaRQzxKw8efuQnwxzU9kZ70ngCxtmbQWGmUmfSThiapOz00018
-+eo5MFabd2vdiGo1y+51m2sRDpN8qdCaqXko65cyMuLXrojJHIuvRA/x7iqOrRfy
-a8x3OxC4PEgl5pgDnP8pVK0lLYncDEQCN76D9ubhZQWhISF/zJI+e806V71hzfyL
-/Mt3mQm/li+lRKU25Usk9dWaf4NH/wZHMIPAkVJ4uD4H/uS49wqWnyiTYGT7hUbi
-ecF7crhLCmlRzvJR8mkRP6/4T/F3tNDPWZeDNEDVFUkTFHNU6/h2+O398MNY/fOh
-yKaNK3nnE0g6QJ1dOH31lXHARlpFOtWt3VmZU0JnWLeYdvap4Eff9qTWZJhI7Cq0
-Wm8DgLUpXgNlkmquvE7P2W5EAr2E5AqKQoDbfw/GiWdRvHWKeNGMRLnGI3QuoX3U
-pAlXD7v13VdZxNydvpeypbf/AfRyrHRKhkUj3cU1pYkM3DNZE77C5JUe6/0nxbt4
-ETUZBTgLgYJGP8c7PbkVnO6I/KgL1jw+7MW6Az8Ox+RXZLyGMVmbW/TMc8haJfKL
-MoUo3TVk8nPiUhoOC0/kI7j9ilFrBxBU5dUtF4ITAWc8xnG6jJs/IsvRpQARAQAB
-tChGZWRvcmEgRVBFTCAoOCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB
-AgAiBQJc9877AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAh6kWrL4bW
-oWagD/4xnLWws34GByVDQkjprk0fX7Iyhpm/U7BsIHKspHLL+Y46vAAGY/9vMvdE
-0fcr9Ek2Zp7zE1RWmSCzzzUgTG6BFoTG1H4Fho/7Z8BXK/jybowXSZfqXnTOfhSF
-alwDdwlSJvfYNV9MbyvbxN8qZRU1z7PEWZrIzFDDToFRk0R71zHpnPTNIJ5/YXTw
-NqU9OxII8hMQj4ufF11040AJQZ7br3rzerlyBOB+Jd1zSPVrAPpeMyJppWFHSDAI
-WK6x+am13VIInXtqB/Cz4GBHLFK5d2/IYspVw47Solj8jiFEtnAq6+1Aq5WH3iB4
-bE2e6z00DSF93frwOyWN7WmPIoc2QsNRJhgfJC+isGQAwwq8xAbHEBeuyMG8GZjz
-xohg0H4bOSEujVLTjH1xbAG4DnhWO/1VXLX+LXELycO8ZQTcjj/4AQKuo4wvMPrv
-9A169oETG+VwQlNd74VBPGCvhnzwGXNbTK/KH1+WRH0YSb+41flB3NKhMSU6dGI0
-SGtIxDSHhVVNmx2/6XiT9U/znrZsG5Kw8nIbbFz+9MGUUWgJMsd1Zl9R8gz7V9fp
-n7L7y5LhJ8HOCMsY/Z7/7HUs+t/A1MI4g7Q5g5UuSZdgi0zxukiWuCkLeAiAP4y7
-zKK4OjJ644NDcWCHa36znwVmkz3ixL8Q0auR15Oqq2BjR/fyog==
-=84m8
-----END PGP PUBLIC KEY BLOCK-----
--- a/tests/epel.repo
+++ b/tests/epel.repo
@ -1,6 +0,0 @@
-[epel]
-name=Extra Packages for Enterprise Linux $releasever - $basearch
-baseurl=https://dl.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
--- a/tests/main.fmf
+++ b/tests/main.fmf
@ -0,0 +1,17 @@
+test: ./runtests.sh
+duration: 10m
+framework: beakerlib
+require:
+  - harfbuzz
+  - harfbuzz-devel
+  - rpm-build
+  - autoconf
+  - automake
+  - m4
+  - gcc-c++
+  - make
+  - python3-devel
+  - libtool
+  - gtk-doc
+  - cairo-devel
+  - fontconfig-devel
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@ -0,0 +1,47 @@
+#!/bin/bash
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+NAME=harfbuzz
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm ${NAME}
+        rlAssertRpm ${NAME}-devel
+        rlShowPackageVersion ${NAME}
+        rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION"
+        FEDORA_VERSION=$(rlGetDistroRelease)
+        rlLog "FEDORA_VERSION=${DISTRO_RELEASE}"
+        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
+        rlRun "pushd $tmp"
+        rlFetchSrcForInstalled "${NAME}"
+        rlRun "rpm --define '_topdir $tmp' -i *src.rpm"
+        rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory"
+        rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
+        if [ -d BUILD/${NAME}-${VERSION}-build ]; then
+            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-${VERSION}"
+        else
+            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}"
+        fi
+        rlRun "set -o pipefail"
+        rlRun "NOCONFIGURE=1 ./autogen.sh"
+        rlRun "./configure --disable-static --with-graphite2 --with-gobject --enable-introspection"
+        rlRun "make check"
+        rlRun "retval=$?"
+        rlRun "echo $retval"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun -t -l "INSTALLED_VERSION=$(hb-info --version|awk 'NR==1 {print $3}')" \
+              0 "Get installed version"
+        rlAssertEquals "versions should be equal" "${VERSION}" "${INSTALLED_VERSION}"
+        rlGetTestState
+        rlLog "Number of failed asserts so far: ${ECODE}"
+        rlRun "popd" 0
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $tmp" 0 "Remove tmp directory"
+    rlPhaseEnd
+rlJournalEnd
+
--- a/tests/smoke/runtest.sh
+++ b/tests/smoke/runtest.sh
@ -1,9 +0,0 @@
-#!/bin/bash
-cd ../source
-
-echo "---Start autogen.sh---"
-NOCONFIGURE=1 ./autogen.sh
-echo "---End autogen.sh---"
-echo "--------------------"
-
-find . -type f -exec sed -i 's/env python/python3/g' {} \; && ./configure --disable-static --with-graphite2 && echo "--------------------"; echo "---Start make check---"; make check; echo "---End make check---"
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,25 +0,0 @@
---
- hosts: localhost
-  tags:
-  - classic
-  roles:
-  - role: standard-test-source
- 
- hosts: localhost
-  tags:
-  - classic
-  roles:
-  - role: standard-test-basic
-    tests:
-    - smoke
-    required_packages:
-    - autoconf
-    - automake
-    - m4
-    - gcc-c++
-    - make
-    - python3-devel
-    - libtool
-    - gtk-doc
-    - cairo-devel
-    - fontconfig-devel