From 7ca7d1e40671979e6db7540a26a9b9c381318ed8 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 25 Jan 2022 20:58:10 -0800 Subject: [PATCH] Add libasan, liblsan, libtsan, libubsan provides to gcc (#2004) --- SPECS/gcc/gcc.spec | 24 ++++++++++++++++--- .../manifests/package/pkggen_core_aarch64.txt | 18 +++++++------- .../manifests/package/pkggen_core_x86_64.txt | 18 +++++++------- .../manifests/package/toolchain_aarch64.txt | 22 ++++++++--------- .../manifests/package/toolchain_x86_64.txt | 22 ++++++++--------- 5 files changed, 61 insertions(+), 43 deletions(-) diff --git a/SPECS/gcc/gcc.spec b/SPECS/gcc/gcc.spec index f3dc94ef6a..1dc30f9b4e 100644 --- a/SPECS/gcc/gcc.spec +++ b/SPECS/gcc/gcc.spec @@ -3,15 +3,13 @@ Summary: Contains the GNU compiler collection Name: gcc Version: 11.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner Group: Development/Tools URL: https://gcc.gnu.org/ Source0: https://ftp.gnu.org/gnu/gcc/%{name}-%{version}/%{name}-%{version}.tar.xz -# Only applies to the Power9 ISA -Patch1: CVE-2019-15847.nopatch Requires: gcc-c++ = %{version}-%{release} Requires: gmp Requires: libgcc-atomic = %{version}-%{release} @@ -21,6 +19,22 @@ Requires: libmpc Requires: libstdc++-devel = %{version}-%{release} Provides: cpp = %{version}-%{release} Provides: gcc-plugin-devel = %{version}-%{release} +Provides: libasan = %{version}-%{release} +Provides: libasan%{?_isa} = %{version}-%{release} +Provides: libasan-static = %{version}-%{release} +Provides: libasan-static%{?_isa} = %{version}-%{release} +Provides: liblsan = %{version}-%{release} +Provides: liblsan%{?_isa} = %{version}-%{release} +Provides: liblsan-static = %{version}-%{release} +Provides: liblsan-static%{?_isa} = %{version}-%{release} +Provides: libtsan = %{version}-%{release} +Provides: libtsan%{?_isa} = %{version}-%{release} +Provides: libtsan-static = %{version}-%{release} +Provides: libtsan-static%{?_isa} = %{version}-%{release} +Provides: libubsan = %{version}-%{release} +Provides: libubsan%{?_isa} = %{version}-%{release} +Provides: libubsan-static = %{version}-%{release} +Provides: libubsan-static%{?_isa} = %{version}-%{release} Provides: libquadmath = %{version}-%{release} Provides: libquadmath-devel = %{version}-%{release} Provides: libquadmath-devel%{?_isa} = %{version}-%{release} @@ -254,6 +268,10 @@ make %{?_smp_mflags} check-gcc %{_lib64dir}/libgomp.spec %changelog +* Tue Jan 25 2022 Thomas Crain - 11.2.0-2 +- Add provides for libasan, liblsan, libtsan, and libubsan (and their static counterparts) to the main package +- Remove CVE-2019-15847 nopatch file (not relevant to our version of GCC) + * Mon Oct 18 2021 Andrew Phelps - 11.2.0-1 - Update to version 11.2.0 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 1776b7f546..b221fcb69b 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -19,15 +19,15 @@ gmp-devel-6.2.1-2.cm2.aarch64.rpm mpfr-4.1.0-1.cm2.aarch64.rpm mpfr-devel-4.1.0-1.cm2.aarch64.rpm libmpc-1.2.1-1.cm2.aarch64.rpm -libgcc-11.2.0-1.cm2.aarch64.rpm -libgcc-atomic-11.2.0-1.cm2.aarch64.rpm -libgcc-devel-11.2.0-1.cm2.aarch64.rpm -libstdc++-11.2.0-1.cm2.aarch64.rpm -libstdc++-devel-11.2.0-1.cm2.aarch64.rpm -libgomp-11.2.0-1.cm2.aarch64.rpm -libgomp-devel-11.2.0-1.cm2.aarch64.rpm -gcc-11.2.0-1.cm2.aarch64.rpm -gcc-c++-11.2.0-1.cm2.aarch64.rpm +libgcc-11.2.0-2.cm2.aarch64.rpm +libgcc-atomic-11.2.0-2.cm2.aarch64.rpm +libgcc-devel-11.2.0-2.cm2.aarch64.rpm +libstdc++-11.2.0-2.cm2.aarch64.rpm +libstdc++-devel-11.2.0-2.cm2.aarch64.rpm +libgomp-11.2.0-2.cm2.aarch64.rpm +libgomp-devel-11.2.0-2.cm2.aarch64.rpm +gcc-11.2.0-2.cm2.aarch64.rpm +gcc-c++-11.2.0-2.cm2.aarch64.rpm libpkgconf-1.8.0-1.cm2.aarch64.rpm pkgconf-1.8.0-1.cm2.aarch64.rpm pkgconf-m4-1.8.0-1.cm2.noarch.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 26f6c4a327..704266c8c0 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -19,15 +19,15 @@ gmp-devel-6.2.1-2.cm2.x86_64.rpm mpfr-4.1.0-1.cm2.x86_64.rpm mpfr-devel-4.1.0-1.cm2.x86_64.rpm libmpc-1.2.1-1.cm2.x86_64.rpm -libgcc-11.2.0-1.cm2.x86_64.rpm -libgcc-atomic-11.2.0-1.cm2.x86_64.rpm -libgcc-devel-11.2.0-1.cm2.x86_64.rpm -libstdc++-11.2.0-1.cm2.x86_64.rpm -libstdc++-devel-11.2.0-1.cm2.x86_64.rpm -libgomp-11.2.0-1.cm2.x86_64.rpm -libgomp-devel-11.2.0-1.cm2.x86_64.rpm -gcc-11.2.0-1.cm2.x86_64.rpm -gcc-c++-11.2.0-1.cm2.x86_64.rpm +libgcc-11.2.0-2.cm2.x86_64.rpm +libgcc-atomic-11.2.0-2.cm2.x86_64.rpm +libgcc-devel-11.2.0-2.cm2.x86_64.rpm +libstdc++-11.2.0-2.cm2.x86_64.rpm +libstdc++-devel-11.2.0-2.cm2.x86_64.rpm +libgomp-11.2.0-2.cm2.x86_64.rpm +libgomp-devel-11.2.0-2.cm2.x86_64.rpm +gcc-11.2.0-2.cm2.x86_64.rpm +gcc-c++-11.2.0-2.cm2.x86_64.rpm libpkgconf-1.8.0-1.cm2.x86_64.rpm pkgconf-1.8.0-1.cm2.x86_64.rpm pkgconf-m4-1.8.0-1.cm2.noarch.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 950babe6d9..3b5d132337 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -84,16 +84,16 @@ flex-debuginfo-2.6.4-7.cm2.aarch64.rpm flex-devel-2.6.4-7.cm2.aarch64.rpm gawk-5.1.0-1.cm2.aarch64.rpm gawk-debuginfo-5.1.0-1.cm2.aarch64.rpm -gcc-11.2.0-1.cm2.aarch64.rpm -gcc-c++-11.2.0-1.cm2.aarch64.rpm -gcc-debuginfo-11.2.0-1.cm2.aarch64.rpm +gcc-11.2.0-2.cm2.aarch64.rpm +gcc-c++-11.2.0-2.cm2.aarch64.rpm +gcc-debuginfo-11.2.0-2.cm2.aarch64.rpm gdbm-1.21-1.cm2.aarch64.rpm gdbm-debuginfo-1.21-1.cm2.aarch64.rpm gdbm-devel-1.21-1.cm2.aarch64.rpm gdbm-lang-1.21-1.cm2.aarch64.rpm gettext-0.21-2.cm2.aarch64.rpm gettext-debuginfo-0.21-2.cm2.aarch64.rpm -gfortran-11.2.0-1.cm2.aarch64.rpm +gfortran-11.2.0-2.cm2.aarch64.rpm glib-2.60.1-5.cm2.aarch64.rpm glib-debuginfo-2.60.1-5.cm2.aarch64.rpm glib-devel-2.60.1-5.cm2.aarch64.rpm @@ -151,14 +151,14 @@ libcap-devel-2.26-2.cm2.aarch64.rpm libffi-3.4.2-1.cm2.aarch64.rpm libffi-debuginfo-3.4.2-1.cm2.aarch64.rpm libffi-devel-3.4.2-1.cm2.aarch64.rpm -libgcc-11.2.0-1.cm2.aarch64.rpm -libgcc-atomic-11.2.0-1.cm2.aarch64.rpm -libgcc-devel-11.2.0-1.cm2.aarch64.rpm +libgcc-11.2.0-2.cm2.aarch64.rpm +libgcc-atomic-11.2.0-2.cm2.aarch64.rpm +libgcc-devel-11.2.0-2.cm2.aarch64.rpm libgcrypt-1.9.4-1.cm2.aarch64.rpm libgcrypt-debuginfo-1.9.4-1.cm2.aarch64.rpm libgcrypt-devel-1.9.4-1.cm2.aarch64.rpm -libgomp-11.2.0-1.cm2.aarch64.rpm -libgomp-devel-11.2.0-1.cm2.aarch64.rpm +libgomp-11.2.0-2.cm2.aarch64.rpm +libgomp-devel-11.2.0-2.cm2.aarch64.rpm libgpg-error-1.43-1.cm2.aarch64.rpm libgpg-error-debuginfo-1.43-1.cm2.aarch64.rpm libgpg-error-devel-1.43-1.cm2.aarch64.rpm @@ -190,8 +190,8 @@ libsolv-tools-0.7.19-2.cm2.aarch64.rpm libssh2-1.9.0-1.cm2.aarch64.rpm libssh2-debuginfo-1.9.0-1.cm2.aarch64.rpm libssh2-devel-1.9.0-1.cm2.aarch64.rpm -libstdc++-11.2.0-1.cm2.aarch64.rpm -libstdc++-devel-11.2.0-1.cm2.aarch64.rpm +libstdc++-11.2.0-2.cm2.aarch64.rpm +libstdc++-devel-11.2.0-2.cm2.aarch64.rpm libtasn1-4.14-3.cm2.aarch64.rpm libtasn1-debuginfo-4.14-3.cm2.aarch64.rpm libtasn1-devel-4.14-3.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 4d951ff86b..4a5e0aa0b6 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -84,16 +84,16 @@ flex-debuginfo-2.6.4-7.cm2.x86_64.rpm flex-devel-2.6.4-7.cm2.x86_64.rpm gawk-5.1.0-1.cm2.x86_64.rpm gawk-debuginfo-5.1.0-1.cm2.x86_64.rpm -gcc-11.2.0-1.cm2.x86_64.rpm -gcc-c++-11.2.0-1.cm2.x86_64.rpm -gcc-debuginfo-11.2.0-1.cm2.x86_64.rpm +gcc-11.2.0-2.cm2.x86_64.rpm +gcc-c++-11.2.0-2.cm2.x86_64.rpm +gcc-debuginfo-11.2.0-2.cm2.x86_64.rpm gdbm-1.21-1.cm2.x86_64.rpm gdbm-debuginfo-1.21-1.cm2.x86_64.rpm gdbm-devel-1.21-1.cm2.x86_64.rpm gdbm-lang-1.21-1.cm2.x86_64.rpm gettext-0.21-2.cm2.x86_64.rpm gettext-debuginfo-0.21-2.cm2.x86_64.rpm -gfortran-11.2.0-1.cm2.x86_64.rpm +gfortran-11.2.0-2.cm2.x86_64.rpm glib-2.60.1-5.cm2.x86_64.rpm glib-debuginfo-2.60.1-5.cm2.x86_64.rpm glib-devel-2.60.1-5.cm2.x86_64.rpm @@ -151,14 +151,14 @@ libcap-devel-2.26-2.cm2.x86_64.rpm libffi-3.4.2-1.cm2.x86_64.rpm libffi-debuginfo-3.4.2-1.cm2.x86_64.rpm libffi-devel-3.4.2-1.cm2.x86_64.rpm -libgcc-11.2.0-1.cm2.x86_64.rpm -libgcc-atomic-11.2.0-1.cm2.x86_64.rpm -libgcc-devel-11.2.0-1.cm2.x86_64.rpm +libgcc-11.2.0-2.cm2.x86_64.rpm +libgcc-atomic-11.2.0-2.cm2.x86_64.rpm +libgcc-devel-11.2.0-2.cm2.x86_64.rpm libgcrypt-1.9.4-1.cm2.x86_64.rpm libgcrypt-debuginfo-1.9.4-1.cm2.x86_64.rpm libgcrypt-devel-1.9.4-1.cm2.x86_64.rpm -libgomp-11.2.0-1.cm2.x86_64.rpm -libgomp-devel-11.2.0-1.cm2.x86_64.rpm +libgomp-11.2.0-2.cm2.x86_64.rpm +libgomp-devel-11.2.0-2.cm2.x86_64.rpm libgpg-error-1.43-1.cm2.x86_64.rpm libgpg-error-debuginfo-1.43-1.cm2.x86_64.rpm libgpg-error-devel-1.43-1.cm2.x86_64.rpm @@ -190,8 +190,8 @@ libsolv-tools-0.7.19-2.cm2.x86_64.rpm libssh2-1.9.0-1.cm2.x86_64.rpm libssh2-debuginfo-1.9.0-1.cm2.x86_64.rpm libssh2-devel-1.9.0-1.cm2.x86_64.rpm -libstdc++-11.2.0-1.cm2.x86_64.rpm -libstdc++-devel-11.2.0-1.cm2.x86_64.rpm +libstdc++-11.2.0-2.cm2.x86_64.rpm +libstdc++-devel-11.2.0-2.cm2.x86_64.rpm libtasn1-4.14-3.cm2.x86_64.rpm libtasn1-debuginfo-4.14-3.cm2.x86_64.rpm libtasn1-devel-4.14-3.cm2.x86_64.rpm