diff --git a/.gitignore b/.gitignore index 8d3fe6e..cfb6dda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/libXfont2-2.0.3.tar.bz2 -/libXfont2-2.0.3.tar.bz2 +libXfont2-2.0.6.tar.xz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index ea86f9d..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} diff --git a/libXfont2.spec b/libXfont2.spec index 87e5b82..322f62f 100644 --- a/libXfont2.spec +++ b/libXfont2.spec @@ -1,13 +1,13 @@ Summary: X.Org X11 libXfont2 runtime library Name: libXfont2 -Version: 2.0.3 -Release: 2%{?dist}.1 -License: MIT -Group: System Environment/Libraries +Version: 2.0.6 +Release: 5%{?dist}.1 +License: BSD-2-Clause AND BSD-4-Clause-UC AND HPND-sell-variant AND MIT-open-group AND SMLNJ AND X11 URL: http://www.x.org -Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.xz +BuildRequires: make BuildRequires: autoconf automake libtool BuildRequires: pkgconfig(fontsproto) BuildRequires: xorg-x11-util-macros @@ -15,16 +15,15 @@ BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-3 BuildRequires: libfontenc-devel BuildRequires: freetype-devel -Patch1: 0001-bitscale-fix-integer-overflow-in-BitmapScaleBitmaps-.patch -Patch2: 0002-pcfread-validate-bitmap-sizes-and-offsets-against-pe.patch -Patch3: 0003-bitscale-add-bounds-check-to-computeProps-for-proper.patch +Patch: 0001-bitscale-fix-integer-overflow-in-BitmapScaleBitmaps-.patch +Patch: 0002-pcfread-validate-bitmap-sizes-and-offsets-against-pe.patch +Patch: 0003-bitscale-add-bounds-check-to-computeProps-for-proper.patch %description X.Org X11 libXfont2 runtime library %package devel Summary: X.Org X11 libXfont2 development package -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libfontenc-devel%{?_isa} @@ -51,7 +50,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %files %license COPYING -%doc AUTHORS README ChangeLog +%doc AUTHORS README.md ChangeLog %{_libdir}/libXfont2.so.2* %files devel @@ -60,11 +59,69 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/xfont2.pc %changelog -* Wed Jul 08 2026 Olivier Fourdan - 2.0.3-2.1 +* Wed Jul 08 2026 Olivier Fourdan - 2.0.6-5.1 - CVE fix for: CVE-2026-56001, CVE-2026-56002, CVE-2026-56003 - Resolves: https://redhat.atlassian.net/browse/RHEL-191877 - Resolves: https://redhat.atlassian.net/browse/RHEL-191928 - Resolves: https://redhat.atlassian.net/browse/RHEL-191948 + Resolves: https://redhat.atlassian.net/browse/RHEL-191882 + Resolves: https://redhat.atlassian.net/browse/RHEL-191930 + Resolves: https://redhat.atlassian.net/browse/RHEL-191949 + +* Tue Oct 29 2024 Troy Dawson - 2.0.6-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 2.0.6-4 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 2.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Oct 05 2023 José Expósito - 2.0.6-1 +- libXfont2 2.0.6 + +* Thu Sep 07 2023 José Expósito - 2.0.3-16 +- SPDX Migration + +* Thu Jul 20 2023 Fedora Release Engineering - 2.0.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 2.0.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.0.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 2.0.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.0.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 5 11:25:30 AEST 2020 Peter Hutterer - 2.0.3-9 +- Add BuildRequires for make + +* Tue Jul 28 2020 Fedora Release Engineering - 2.0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Mar 21 2019 Adam Jackson - 2.0.3-5 +- Rebuild for xtrans 1.4.0 + +* Fri Feb 01 2019 Fedora Release Engineering - 2.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Fri Jun 29 2018 Adam Jackson - 2.0.3-2 - Use ldconfig scriptlet macros diff --git a/sources b/sources index 5808ee0..f064d3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXfont2-2.0.3.tar.bz2) = 648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b +SHA512 (libXfont2-2.0.6.tar.xz) = 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd