From 5a3df1db617910d411e31f7ff73ce2257e672abd Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Thu, 16 Jan 2025 19:57:56 -0500
Subject: [PATCH] Update to .NET SDK 8.0.112 and Runtime 8.0.12

Resolves: RHEL-71553
---
 .gitignore     |  2 ++
 dotnet8.0.spec | 21 +++++++++++++++++----
 release.json   | 12 ++++++------
 sources        |  4 ++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6f12188..707fa21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,5 @@
 /dotnet-8.0.8.tar.gz.sig
 /dotnet-8.0.10.tar.gz
 /dotnet-8.0.10.tar.gz.sig
+/dotnet-8.0.12.tar.gz
+/dotnet-8.0.12.tar.gz.sig
diff --git a/dotnet8.0.spec b/dotnet8.0.spec
index 6be20eb..f72233e 100644
--- a/dotnet8.0.spec
+++ b/dotnet8.0.spec
@@ -12,10 +12,10 @@
 # dotnet-host and netstandard-targeting-pack-2.1
 %global is_latest_dotnet 0
 
-%global host_version 8.0.10
-%global runtime_version 8.0.10
+%global host_version 8.0.12
+%global runtime_version 8.0.12
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 8.0.110
+%global sdk_version 8.0.112
 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
 %global templates_version %{runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -58,7 +58,7 @@
 
 Name:           dotnet%{dotnetver}
 Version:        %{sdk_rpm_version}
-Release:        4%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Runtime and SDK
 License:        0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib
 
@@ -526,6 +526,15 @@ CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -march=z13//')
 CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -mtune=z14//')
 %endif
 
+%if 0%{?rhel} >= 10
+# Workaround for https://github.com/dotnet/runtime/issues/109611
+# FIXME: Remove this, and replace with upstream fix
+CFLAGS=$(echo $CFLAGS | sed -e 's/-march=x86-64-v3 //')
+CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-march=x86-64-v3 //')
+LDFLAGS=$(echo $LDFLAGS | sed -e 's/-march=x86-64-v3 //')
+%endif
+
+
 export EXTRA_CFLAGS="$CFLAGS"
 export EXTRA_CXXFLAGS="$CXXFLAGS"
 export EXTRA_LDFLAGS="$LDFLAGS"
@@ -736,6 +745,10 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Thu Jan 16 2025 Omair Majid <omajid@redhat.com> - 8.0.112-2
+- Update to .NET SDK 8.0.112 and Runtime 8.0.12
+- Resolves: RHEL-71553
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 8.0.110-4
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018
diff --git a/release.json b/release.json
index 501d01c..ed9ca06 100644
--- a/release.json
+++ b/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "8.0.10",
+  "release": "8.0.12",
   "channel": "8.0",
-  "tag": "v8.0.10",
-  "sdkVersion": "8.0.110",
-  "runtimeVersion": "8.0.10",
-  "aspNetCoreVersion": "8.0.10",
+  "tag": "v8.0.12",
+  "sdkVersion": "8.0.112",
+  "runtimeVersion": "8.0.12",
+  "aspNetCoreVersion": "8.0.12",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "8922fe64a1903ed4e35e24568efb056b3e0fad43"
+  "sourceVersion": "ab5d79b36d4f8a16f9f91f53fd6504b354c977b1"
 }
diff --git a/sources b/sources
index bfeb2e9..bc6b669 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dotnet-8.0.10.tar.gz) = 5bb660d4bf750392d4022ceb02a7f76a04a8f789c9fbbde329019bc3e097fd7296984b52d29dfc027d31b7b4defdf3807f10e37a9696f8f0026c77cea6ad0d18
-SHA512 (dotnet-8.0.10.tar.gz.sig) = 3c4ea982659f00d84528ac26493712d9f786d588797649bb4f551d8e5f7a0aca51a6e27dbe71b1979eeb3307acbac7306da83c14782bb944dd4510ea7761f8d8
+SHA512 (dotnet-8.0.12.tar.gz) = d770a6c37de5c657d306a070c4c02c8f96b52a89184d46b946154cfcf470390f7483f8e38ea3a662d8234bc9fe8d7a1d48bf4cd144e4d3ff29fd36d36889f3a5
+SHA512 (dotnet-8.0.12.tar.gz.sig) = a52d08fad89dcb94442b51e6d8529ce0ada4c3f4a2ca7f64e6f9ca7d0dbbb35a47d6fc38e94b372341fdbaf41be622a66279928573252661c854b7f495a056e9