From 3cb3c40f2c4fae97ce91aa9fe6657914c4c2842d Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 11 Jun 2025 07:43:32 +0000
Subject: [PATCH] import UBI dotnet9.0-9.0.107-1.el8_10

---
 .dotnet9.0.metadata             |  2 +-
 .gitignore                      |  2 +-
 SOURCES/dotnet-9.0.5.tar.gz.sig | 17 -----------
 SOURCES/dotnet-9.0.6.tar.gz.sig | 17 +++++++++++
 SOURCES/release.json            | 12 ++++----
 SPECS/dotnet9.0.spec            | 53 ++++++++++++++++++++++++++++-----
 6 files changed, 71 insertions(+), 32 deletions(-)
 delete mode 100644 SOURCES/dotnet-9.0.5.tar.gz.sig
 create mode 100644 SOURCES/dotnet-9.0.6.tar.gz.sig

diff --git a/.dotnet9.0.metadata b/.dotnet9.0.metadata
index 0fd1ab1..7348589 100644
--- a/.dotnet9.0.metadata
+++ b/.dotnet9.0.metadata
@@ -1 +1 @@
-8bf1d9c457bb428dde84780de4f9bf12e13d2c3e SOURCES/dotnet-9.0.5.tar.gz
+41839a3cdfa8671621c56b19ae2e9553c8bb0d49 SOURCES/dotnet-9.0.6.tar.gz
diff --git a/.gitignore b/.gitignore
index 6512715..42f9fd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-9.0.5.tar.gz
+SOURCES/dotnet-9.0.6.tar.gz
diff --git a/SOURCES/dotnet-9.0.5.tar.gz.sig b/SOURCES/dotnet-9.0.5.tar.gz.sig
deleted file mode 100644
index f6ead52..0000000
--- a/SOURCES/dotnet-9.0.5.tar.gz.sig
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BSN Pgp v1.0.0.0
-
-iQIcBAABCAAGBQJoE8E7AAoJEP2/U8JNtIcuvcEP/Ra3QUkDDiG0YzdTP8pPTRo4
-7jc+kj0qxCsXzNigWhaPXDZa6U59lZgcYFIem/A9/7qryCYiMq2QA+w2zMcp4WtJ
-XmKjCcoiA0nHJjsiT97p7XuvTI9tVbXXI7fPGkP49NLsEVg5f2DTduRcIxvQEdWL
-AE+L88hxRwuiQrkiX5TDhhUbV833DULhfvHYvvEjHLIA+Dhrjb0eNj5FJBe+3DUB
-0e1YLXfeVpWBTkZXqeWsZ9ZewFybvhepZxOZg9nkEZG0KXnuA3p0SXDlwHC3P9+R
-LHj0xpBASL6VwG3aoiIjhMnpKcm4G0sFPzhU2C9jXJQGaUDcwf5HLKOrOqUUBpeT
-c7reS7Rigww8TJNf2oQXbPr88Y4Hj2nbRHOiq1/K/zctpwvDUgfM1s+xeAR3d2BI
-hBrSUaasjR5iALAvMjHwebZCahpPhCFLZKE2fp065L2+hQ1ENMeZhWgwT9xtJXTb
-jkKLTt6hpS2dCLbNJa7zuR80CGgVW9WAve9u2WQJ0v0H6hlr/KMutHsmApQFdRiK
-OmbmWq88M24Jh1rlhMTFJORRIkvNPsKL5nUhJjvCkrAnjlpfJqDVQZ84dwmFgH+G
-8Yz8EzokUoOp40cerelRa3oBYt2ROBkyeC5vx1hR8S6Dhy74CIzd4l7uLbdnKPXy
-ni70S7e7apsdntBMulw+
-=mwxY
------END PGP SIGNATURE-----
diff --git a/SOURCES/dotnet-9.0.6.tar.gz.sig b/SOURCES/dotnet-9.0.6.tar.gz.sig
new file mode 100644
index 0000000..ace6d1c
--- /dev/null
+++ b/SOURCES/dotnet-9.0.6.tar.gz.sig
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BSN Pgp v1.0.0.0
+
+iQIcBAABCAAGBQJoNzYVAAoJEP2/U8JNtIcufCsQALF5WSMUWQmWFinWCzTLhzD6
+XwFnjpZ3fb+b/yLsN3UsSAFnxjBJaKbxFBndEO7BP6m5HDciPiTtjiS4zN4MCy5+
+W1ekdPC5R5oRsPj3/JaGtFsJ6muTqQxXUyPr1LhQewdNHkl9E8HzGbhlaMZ4HB/p
+9NxY0U5O8m567yEAc+bXEdtehIEAgbEUq2enftoru9rchcvhKHICVFClkb32Gi7D
+D81FN0ZIMPZolzxg3A1kp7esn3HiZOPEcvmOBXK062Uvk3rA8q8MthtbCaBJQXIS
+tavK9oTIaRiP84ZunbMIT5mVBI5zNj4/9jvjZcS0m80R5z8tTQvFbz6UDjzloD5P
+FXK2VQqN13dVW2XwzdnI29d2m4eAxic/ZlQ5Ern5RsgZ/pf9mPXf5Sy/PuqY1Fbz
+xDJFaa3965xILyL5ijWjii1cnZ4gRETu8S2kFsq5HFKlM2vjFDUjQtJbmdSHNEFi
+9lcZTDTEBvLolCLdrvwvM7CNC678Jqzq5VyIHTWp30OGwtUQ6BP1Coa1cxOwLwjO
+uH9UBvQOUreLZV5zRVQShl0LdUQGox96LxSksPXHPLG7nh2fgI5jV58hfEuZLhQ3
+A3kNrON8FkmRRLB/le76PK3VhtN2jez4qh1TgORGuwJ5gcCkn2GyBHWTiAsGRSoP
+9/+7BAjEwWIrZGrjqu1S
+=5qMS
+-----END PGP SIGNATURE-----
diff --git a/SOURCES/release.json b/SOURCES/release.json
index 8403da4..e9e6003 100644
--- a/SOURCES/release.json
+++ b/SOURCES/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "9.0.5",
+  "release": "9.0.6",
   "channel": "9.0",
-  "tag": "v9.0.5",
-  "sdkVersion": "9.0.106",
-  "runtimeVersion": "9.0.5",
-  "aspNetCoreVersion": "9.0.5",
+  "tag": "v9.0.6",
+  "sdkVersion": "9.0.107",
+  "runtimeVersion": "9.0.6",
+  "aspNetCoreVersion": "9.0.6",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "3d441471e6d6513e40022042a13b536bebff0590"
+  "sourceVersion": "3b2a975be6836979a19db7625a972b46a36efaeb"
 }
diff --git a/SPECS/dotnet9.0.spec b/SPECS/dotnet9.0.spec
index 3d7c46b..93e8ccb 100644
--- a/SPECS/dotnet9.0.spec
+++ b/SPECS/dotnet9.0.spec
@@ -10,13 +10,13 @@
 
 # upstream can produce releases with a different tag than the SDK version
 #%%global upstream_tag v%%{runtime_version}
-%global upstream_tag v9.0.5
+%global upstream_tag v9.0.6
 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
 
 %global hostfxr_version %{runtime_version}
-%global runtime_version 9.0.5
-%global aspnetcore_runtime_version 9.0.5
-%global sdk_version 9.0.106
+%global runtime_version 9.0.6
+%global aspnetcore_runtime_version 9.0.6
+%global sdk_version 9.0.107
 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
 %global templates_version %{aspnetcore_runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -643,8 +643,36 @@ system_libs=
     system_libs=$system_libs+zlib+
 %endif
 
-VERBOSE=1 timeout 5h \
-    ./build.sh \
+%ifarch ppc64le s390x
+max_attempts=3
+%else
+max_attempts=1
+%endif
+
+function retry_until_success {
+    local exit_code=1
+    local tries=$1
+    shift
+    set +e
+    while [[ $exit_code != 0 ]] && [[ $tries != 0 ]]; do
+        (( tries = tries - 1 ))
+        "$@"
+        exit_code=$?
+    done
+    set -e
+    return $exit_code
+}
+
+
+cat >dotnet-rpm-build.sh <<EOF
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+find -depth -name 'artifacts' -type d -print -exec rm -rf {} \;
+
+./build.sh \
     --source-only \
     --release-manifest %{SOURCE5} \
 %if %{without bootstrap_dotnet}
@@ -661,6 +689,13 @@ VERBOSE=1 timeout 5h \
     /p:ContinueOnPrebuiltBaselineError=true \
     /v:n \
     /p:LogVerbosity=n
+EOF
+
+chmod +x dotnet-rpm-build.sh
+
+VERBOSE=1 retry_until_success $max_attempts \
+    timeout 5h \
+    ./dotnet-rpm-build.sh
 
 
 sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE21} > dotnet.sh
@@ -843,7 +878,11 @@ export COMPlus_LTTng=0
 
 
 %changelog
-* Fri May 02 2025 Omair Majid <omajid@redhat.com> - 9.0.106-1
+* Thu May 29 2025 Omair Majid <omajid@redhat.com> - 9.0.107-1
+- Update to .NET SDK 9.0.107 and Runtime 9.0.6
+- Resolves: RHEL-94422
+
+* Tue May 13 2025 Omair Majid <omajid@redhat.com> - 9.0.106-2
 - Update to .NET SDK 9.0.106 and Runtime 9.0.5
 - Resolves: RHEL-89451