Skip to content

Commit

Permalink
gcc: update and re-enable CVE-2023-4039.patch (#9465)
Browse files Browse the repository at this point in the history
  • Loading branch information
anphel31 authored Jun 21, 2024
1 parent 238a839 commit 63a3aa7
Showing 8 changed files with 613 additions and 410 deletions.
922 changes: 561 additions & 361 deletions SPECS/gcc/CVE-2023-4039.patch

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions SPECS/gcc/gcc.spec
Original file line number Diff line number Diff line change
@@ -56,14 +56,14 @@
Summary: Contains the GNU compiler collection
Name: gcc
Version: 13.2.0
Release: 6%{?dist}
Release: 7%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
Distribution: Azure Linux
Group: Development/Tools
URL: https://gcc.gnu.org/
Source0: https://ftp.gnu.org/gnu/gcc/%{name}-%{version}/%{name}-%{version}.tar.xz
#Patch0: CVE-2023-4039.patch
Patch0: CVE-2023-4039.patch
Patch1: 0011-libsanitizer-Remove-crypt-and-crypt_r-interceptors.patch

BuildRequires: gmp-devel
@@ -523,6 +523,9 @@ $tests_ok
%do_files aarch64-linux-gnu %{build_cross}

%changelog
* Fri Jun 21 2024 Andrew Phelps <[email protected]> - 13.2.0-7
- Re-enable CVE-2023-4039.patch and refresh against 13.2.0 source

* Tue Apr 09 2024 Andrew Phelps <[email protected]> - 13.2.0-6
- Revert change to baseline architecture for x86-64-v3

18 changes: 9 additions & 9 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
Original file line number Diff line number Diff line change
@@ -21,15 +21,15 @@ mpfr-4.2.1-1.azl3.aarch64.rpm
mpfr-devel-4.2.1-1.azl3.aarch64.rpm
libmetalink-0.1.3-1.azl3.aarch64.rpm
libmpc-1.3.1-1.azl3.aarch64.rpm
libgcc-13.2.0-6.azl3.aarch64.rpm
libgcc-atomic-13.2.0-6.azl3.aarch64.rpm
libgcc-devel-13.2.0-6.azl3.aarch64.rpm
libstdc++-13.2.0-6.azl3.aarch64.rpm
libstdc++-devel-13.2.0-6.azl3.aarch64.rpm
libgomp-13.2.0-6.azl3.aarch64.rpm
libgomp-devel-13.2.0-6.azl3.aarch64.rpm
gcc-13.2.0-6.azl3.aarch64.rpm
gcc-c++-13.2.0-6.azl3.aarch64.rpm
libgcc-13.2.0-7.azl3.aarch64.rpm
libgcc-atomic-13.2.0-7.azl3.aarch64.rpm
libgcc-devel-13.2.0-7.azl3.aarch64.rpm
libstdc++-13.2.0-7.azl3.aarch64.rpm
libstdc++-devel-13.2.0-7.azl3.aarch64.rpm
libgomp-13.2.0-7.azl3.aarch64.rpm
libgomp-devel-13.2.0-7.azl3.aarch64.rpm
gcc-13.2.0-7.azl3.aarch64.rpm
gcc-c++-13.2.0-7.azl3.aarch64.rpm
libpkgconf-2.0.2-1.azl3.aarch64.rpm
pkgconf-2.0.2-1.azl3.aarch64.rpm
pkgconf-m4-2.0.2-1.azl3.noarch.rpm
18 changes: 9 additions & 9 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Original file line number Diff line number Diff line change
@@ -21,15 +21,15 @@ mpfr-4.2.1-1.azl3.x86_64.rpm
mpfr-devel-4.2.1-1.azl3.x86_64.rpm
libmetalink-0.1.3-1.azl3.x86_64.rpm
libmpc-1.3.1-1.azl3.x86_64.rpm
libgcc-13.2.0-6.azl3.x86_64.rpm
libgcc-atomic-13.2.0-6.azl3.x86_64.rpm
libgcc-devel-13.2.0-6.azl3.x86_64.rpm
libstdc++-13.2.0-6.azl3.x86_64.rpm
libstdc++-devel-13.2.0-6.azl3.x86_64.rpm
libgomp-13.2.0-6.azl3.x86_64.rpm
libgomp-devel-13.2.0-6.azl3.x86_64.rpm
gcc-13.2.0-6.azl3.x86_64.rpm
gcc-c++-13.2.0-6.azl3.x86_64.rpm
libgcc-13.2.0-7.azl3.x86_64.rpm
libgcc-atomic-13.2.0-7.azl3.x86_64.rpm
libgcc-devel-13.2.0-7.azl3.x86_64.rpm
libstdc++-13.2.0-7.azl3.x86_64.rpm
libstdc++-devel-13.2.0-7.azl3.x86_64.rpm
libgomp-13.2.0-7.azl3.x86_64.rpm
libgomp-devel-13.2.0-7.azl3.x86_64.rpm
gcc-13.2.0-7.azl3.x86_64.rpm
gcc-c++-13.2.0-7.azl3.x86_64.rpm
libpkgconf-2.0.2-1.azl3.x86_64.rpm
pkgconf-2.0.2-1.azl3.x86_64.rpm
pkgconf-m4-2.0.2-1.azl3.noarch.rpm
24 changes: 12 additions & 12 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
Original file line number Diff line number Diff line change
@@ -106,16 +106,16 @@ flex-debuginfo-2.6.4-7.azl3.aarch64.rpm
flex-devel-2.6.4-7.azl3.aarch64.rpm
gawk-5.2.2-1.azl3.aarch64.rpm
gawk-debuginfo-5.2.2-1.azl3.aarch64.rpm
gcc-13.2.0-6.azl3.aarch64.rpm
gcc-c++-13.2.0-6.azl3.aarch64.rpm
gcc-debuginfo-13.2.0-6.azl3.aarch64.rpm
gcc-13.2.0-7.azl3.aarch64.rpm
gcc-c++-13.2.0-7.azl3.aarch64.rpm
gcc-debuginfo-13.2.0-7.azl3.aarch64.rpm
gdbm-1.23-1.azl3.aarch64.rpm
gdbm-debuginfo-1.23-1.azl3.aarch64.rpm
gdbm-devel-1.23-1.azl3.aarch64.rpm
gdbm-lang-1.23-1.azl3.aarch64.rpm
gettext-0.22-1.azl3.aarch64.rpm
gettext-debuginfo-0.22-1.azl3.aarch64.rpm
gfortran-13.2.0-6.azl3.aarch64.rpm
gfortran-13.2.0-7.azl3.aarch64.rpm
glib-2.78.1-4.azl3.aarch64.rpm
glib-debuginfo-2.78.1-4.azl3.aarch64.rpm
glib-devel-2.78.1-4.azl3.aarch64.rpm
@@ -166,7 +166,7 @@ libarchive-devel-3.7.1-1.azl3.aarch64.rpm
libassuan-2.5.6-1.azl3.aarch64.rpm
libassuan-debuginfo-2.5.6-1.azl3.aarch64.rpm
libassuan-devel-2.5.6-1.azl3.aarch64.rpm
libbacktrace-static-13.2.0-6.azl3.aarch64.rpm
libbacktrace-static-13.2.0-7.azl3.aarch64.rpm
libcap-2.69-1.azl3.aarch64.rpm
libcap-debuginfo-2.69-1.azl3.aarch64.rpm
libcap-devel-2.69-1.azl3.aarch64.rpm
@@ -176,14 +176,14 @@ libcap-ng-devel-0.8.4-1.azl3.aarch64.rpm
libffi-3.4.4-1.azl3.aarch64.rpm
libffi-debuginfo-3.4.4-1.azl3.aarch64.rpm
libffi-devel-3.4.4-1.azl3.aarch64.rpm
libgcc-13.2.0-6.azl3.aarch64.rpm
libgcc-atomic-13.2.0-6.azl3.aarch64.rpm
libgcc-devel-13.2.0-6.azl3.aarch64.rpm
libgcc-13.2.0-7.azl3.aarch64.rpm
libgcc-atomic-13.2.0-7.azl3.aarch64.rpm
libgcc-devel-13.2.0-7.azl3.aarch64.rpm
libgcrypt-1.10.2-1.azl3.aarch64.rpm
libgcrypt-debuginfo-1.10.2-1.azl3.aarch64.rpm
libgcrypt-devel-1.10.2-1.azl3.aarch64.rpm
libgomp-13.2.0-6.azl3.aarch64.rpm
libgomp-devel-13.2.0-6.azl3.aarch64.rpm
libgomp-13.2.0-7.azl3.aarch64.rpm
libgomp-devel-13.2.0-7.azl3.aarch64.rpm
libgpg-error-1.47-1.azl3.aarch64.rpm
libgpg-error-debuginfo-1.47-1.azl3.aarch64.rpm
libgpg-error-devel-1.47-1.azl3.aarch64.rpm
@@ -222,8 +222,8 @@ libsolv-tools-0.7.28-1.azl3.aarch64.rpm
libssh2-1.11.0-1.azl3.aarch64.rpm
libssh2-debuginfo-1.11.0-1.azl3.aarch64.rpm
libssh2-devel-1.11.0-1.azl3.aarch64.rpm
libstdc++-13.2.0-6.azl3.aarch64.rpm
libstdc++-devel-13.2.0-6.azl3.aarch64.rpm
libstdc++-13.2.0-7.azl3.aarch64.rpm
libstdc++-devel-13.2.0-7.azl3.aarch64.rpm
libtasn1-4.19.0-1.azl3.aarch64.rpm
libtasn1-debuginfo-4.19.0-1.azl3.aarch64.rpm
libtasn1-devel-4.19.0-1.azl3.aarch64.rpm
30 changes: 15 additions & 15 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ createrepo_c-1.0.3-1.azl3.x86_64.rpm
createrepo_c-debuginfo-1.0.3-1.azl3.x86_64.rpm
createrepo_c-devel-1.0.3-1.azl3.x86_64.rpm
cross-binutils-common-2.41-2.azl3.noarch.rpm
cross-gcc-common-13.2.0-6.azl3.noarch.rpm
cross-gcc-common-13.2.0-7.azl3.noarch.rpm
curl-8.5.0-1.azl3.x86_64.rpm
curl-debuginfo-8.5.0-1.azl3.x86_64.rpm
curl-devel-8.5.0-1.azl3.x86_64.rpm
@@ -109,18 +109,18 @@ flex-debuginfo-2.6.4-7.azl3.x86_64.rpm
flex-devel-2.6.4-7.azl3.x86_64.rpm
gawk-5.2.2-1.azl3.x86_64.rpm
gawk-debuginfo-5.2.2-1.azl3.x86_64.rpm
gcc-13.2.0-6.azl3.x86_64.rpm
gcc-aarch64-linux-gnu-13.2.0-6.azl3.x86_64.rpm
gcc-c++-13.2.0-6.azl3.x86_64.rpm
gcc-c++-aarch64-linux-gnu-13.2.0-6.azl3.x86_64.rpm
gcc-debuginfo-13.2.0-6.azl3.x86_64.rpm
gcc-13.2.0-7.azl3.x86_64.rpm
gcc-aarch64-linux-gnu-13.2.0-7.azl3.x86_64.rpm
gcc-c++-13.2.0-7.azl3.x86_64.rpm
gcc-c++-aarch64-linux-gnu-13.2.0-7.azl3.x86_64.rpm
gcc-debuginfo-13.2.0-7.azl3.x86_64.rpm
gdbm-1.23-1.azl3.x86_64.rpm
gdbm-debuginfo-1.23-1.azl3.x86_64.rpm
gdbm-devel-1.23-1.azl3.x86_64.rpm
gdbm-lang-1.23-1.azl3.x86_64.rpm
gettext-0.22-1.azl3.x86_64.rpm
gettext-debuginfo-0.22-1.azl3.x86_64.rpm
gfortran-13.2.0-6.azl3.x86_64.rpm
gfortran-13.2.0-7.azl3.x86_64.rpm
glib-2.78.1-4.azl3.x86_64.rpm
glib-debuginfo-2.78.1-4.azl3.x86_64.rpm
glib-devel-2.78.1-4.azl3.x86_64.rpm
@@ -172,7 +172,7 @@ libarchive-devel-3.7.1-1.azl3.x86_64.rpm
libassuan-2.5.6-1.azl3.x86_64.rpm
libassuan-debuginfo-2.5.6-1.azl3.x86_64.rpm
libassuan-devel-2.5.6-1.azl3.x86_64.rpm
libbacktrace-static-13.2.0-6.azl3.x86_64.rpm
libbacktrace-static-13.2.0-7.azl3.x86_64.rpm
libcap-2.69-1.azl3.x86_64.rpm
libcap-debuginfo-2.69-1.azl3.x86_64.rpm
libcap-devel-2.69-1.azl3.x86_64.rpm
@@ -182,14 +182,14 @@ libcap-ng-devel-0.8.4-1.azl3.x86_64.rpm
libffi-3.4.4-1.azl3.x86_64.rpm
libffi-debuginfo-3.4.4-1.azl3.x86_64.rpm
libffi-devel-3.4.4-1.azl3.x86_64.rpm
libgcc-13.2.0-6.azl3.x86_64.rpm
libgcc-atomic-13.2.0-6.azl3.x86_64.rpm
libgcc-devel-13.2.0-6.azl3.x86_64.rpm
libgcc-13.2.0-7.azl3.x86_64.rpm
libgcc-atomic-13.2.0-7.azl3.x86_64.rpm
libgcc-devel-13.2.0-7.azl3.x86_64.rpm
libgcrypt-1.10.2-1.azl3.x86_64.rpm
libgcrypt-debuginfo-1.10.2-1.azl3.x86_64.rpm
libgcrypt-devel-1.10.2-1.azl3.x86_64.rpm
libgomp-13.2.0-6.azl3.x86_64.rpm
libgomp-devel-13.2.0-6.azl3.x86_64.rpm
libgomp-13.2.0-7.azl3.x86_64.rpm
libgomp-devel-13.2.0-7.azl3.x86_64.rpm
libgpg-error-1.47-1.azl3.x86_64.rpm
libgpg-error-debuginfo-1.47-1.azl3.x86_64.rpm
libgpg-error-devel-1.47-1.azl3.x86_64.rpm
@@ -228,8 +228,8 @@ libsolv-tools-0.7.28-1.azl3.x86_64.rpm
libssh2-1.11.0-1.azl3.x86_64.rpm
libssh2-debuginfo-1.11.0-1.azl3.x86_64.rpm
libssh2-devel-1.11.0-1.azl3.x86_64.rpm
libstdc++-13.2.0-6.azl3.x86_64.rpm
libstdc++-devel-13.2.0-6.azl3.x86_64.rpm
libstdc++-13.2.0-7.azl3.x86_64.rpm
libstdc++-devel-13.2.0-7.azl3.x86_64.rpm
libtasn1-4.19.0-1.azl3.x86_64.rpm
libtasn1-debuginfo-4.19.0-1.azl3.x86_64.rpm
libtasn1-devel-4.19.0-1.azl3.x86_64.rpm
Original file line number Diff line number Diff line change
@@ -348,7 +348,7 @@ case $(uname -m) in
sed -e '/mabi.lp64=/s/lib64/lib/' -i.orig gcc/config/aarch64/t-aarch64-linux
;;
esac
# TODO: patch -Np1 -i /tools/CVE-2023-4039.patch
patch -Np1 -i /tools/CVE-2023-4039.patch
mkdir -v build
cd build
LD=ld \
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ case $(uname -m) in
sed -e '/mabi.lp64=/s/lib64/lib/' -i.orig gcc/config/aarch64/t-aarch64-linux
;;
esac
# TODO: patch -Np1 -i /tools/CVE-2023-4039.patch
patch -Np1 -i /tools/CVE-2023-4039.patch
mkdir -v build
cd build
../configure \

0 comments on commit 63a3aa7

Please sign in to comment.