From 8f84c460f1f0a7f6f2c541a153ccbf6c6e777ecc Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Tue, 14 Oct 2025 16:42:58 -0400
Subject: [PATCH] Update to .NET SDK 8.0.121 and Runtime 8.0.21

Resolves: RHEL-116867
---
 .gitignore     |  2 ++
 dotnet8.0.spec | 10 +++++++---
 release.json   | 12 ++++++------
 sources        |  4 ++--
 update-release | 45 ++++++++++++++-------------------------------
 5 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index b4a4eea..cfc302c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,5 @@
 /dotnet-8.0.119.tar.gz.sig
 /dotnet-8.0.120.tar.gz
 /dotnet-8.0.120.tar.gz.sig
+/dotnet-8.0.121.tar.gz
+/dotnet-8.0.121.tar.gz.sig
diff --git a/dotnet8.0.spec b/dotnet8.0.spec
index 8f94865..38c16d6 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.20
-%global runtime_version 8.0.20
+%global host_version 8.0.21
+%global runtime_version 8.0.21
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 8.0.120
+%global sdk_version 8.0.121
 %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 }')
@@ -775,6 +775,10 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Tue Oct 14 2025 Omair Majid <omajid@redhat.com> - 8.0.121-2
+- Update to .NET SDK 8.0.121 and Runtime 8.0.21
+- Resolves: RHEL-116867
+
 * Wed Sep 10 2025 Omair Majid <omajid@redhat.com> - 8.0.120-2
 - Update to .NET SDK 8.0.120 and Runtime 8.0.20
 - Resolves: RHEL-112260
diff --git a/release.json b/release.json
index adbe233..9ed73aa 100644
--- a/release.json
+++ b/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "8.0.19",
+  "release": "8.0.21",
   "channel": "8.0",
-  "tag": "v8.0.120",
-  "sdkVersion": "8.0.120",
-  "runtimeVersion": "8.0.20",
-  "aspNetCoreVersion": "8.0.20",
+  "tag": "v8.0.121",
+  "sdkVersion": "8.0.121",
+  "runtimeVersion": "8.0.21",
+  "aspNetCoreVersion": "8.0.21",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "6825a8d5c72c1893049c2c5ffa491b65cbcea7e0"
+  "sourceVersion": "eed318ae2d2a3b35d344b9ec73c361265a938310"
 }
diff --git a/sources b/sources
index 94433b1..3f427a8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dotnet-8.0.120.tar.gz) = 00ab2528520490d3f2bd3acaa8d499f3e1afeb9e26a8526c5a66530b5bc2456bdf2dfd96dbac9b5319e2c74b258e9511883b0ab4b5883e739932c2fc66276172
-SHA512 (dotnet-8.0.120.tar.gz.sig) = 58badfbf8f95e3abc52a0335b88a523ccb52a13038f80a164a7b170dbf112946c8f553fd15b4bf389e31eca94857f3f96283d02796dd6f14b2a5645d72faf907
+SHA512 (dotnet-8.0.121.tar.gz) = 129f7a2b214f538a94e9cf6d84dfabb23e02aed25218ee11da5903bda87254840962e79c03c02dc7c6d70679a01c33ee3c90ddcde64480d7391d95995f3cffb0
+SHA512 (dotnet-8.0.121.tar.gz.sig) = 64da13cfd647c559074d47b7e844f1ba681e5b7b94d58cec06432ff65f2b9adc9e42dd44d2624783afc21396c48acd4ae9d1ef3f2d3701022b3e410346359af0
diff --git a/update-release b/update-release
index a80f685..7da2358 100755
--- a/update-release
+++ b/update-release
@@ -75,38 +75,21 @@ sed -i -E "s|^%global runtime_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%gl
 sed -i -E "s|^%global sdk_version [[:digit:]]\.[[:digit:]]\.[[:digit:]][[:digit:]][[:digit:]]|%global sdk_version ${sdk_version}|" "$spec_file"
 
 
-if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then
-    if [[ -f "dotnet-${tag}.tar.gz" ]]; then
-        echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
-    else
-        if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
-            echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball"
-        else
-            if [[ -n "${user_provided_tarball_name}" ]]; then
-                cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
-            elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then
-                cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
-            elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then
-                cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
-            elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then
-                cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
-            fi
-        fi
-
-        ./build-dotnet-tarball "${tag}"
-    fi
+if [[ -f "dotnet-${tag}.tar.gz" ]]; then
+    echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
+elif [[ -n ${user_provided_tarball_name} ]]; then
+    tag_without_v=${tag#v}
+    cp -a "${user_provided_tarball_name}" dotnet-${tag_without_v}.tar.gz
+    signature_name=$(basename "${user_provided_tarball_name}.sig")
+    user_tarball_dir=$(dirname "${user_provided_tarball_name}" )
+    # intentionally unquoted, since it can be blank
+    # shellcheck disable=SC2116,SC2086
+    signature_path=$(find $user_tarball_dir -iname "${signature_name}")
+    cp -a "${signature_path}" "dotnet-${tag_without_v}.tar.gz.sig"
+    cp -a "${release_json}" release.json
 else
-    if [[ -f "dotnet-${tag}.tar.gz" ]]; then
-        echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
-    elif [[ -n ${user_provided_tarball_name} ]]; then
-        tag_without_v=${tag#v}
-        cp -a "${user_provided_tarball_name}" dotnet-${tag_without_v}.tar.gz
-        cp -a "${user_provided_tarball_name}.sig" dotnet-${tag_without_v}.tar.gz.sig
-        cp -a "${release_json}" release.json
-    else
-        rm -f release.json
-        spectool -g "$spec_file"
-    fi
+    rm -f release.json
+    spectool -g "$spec_file"
 fi
 
 comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}"