From 66e93e343b943587709d08196fa18bf6ca33fd0e Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Sat, 25 Jun 2022 10:05:11 -0400
Subject: [PATCH] Update to .NET SDK 6.0.106 and Runtime 6.0.6

Resolves: RHBZ#2093431
---
 .gitignore      |  1 +
 dotnet6.0.spec  | 23 +++++++++++++++--------
 sources         |  2 +-
 tests/tests.yml |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 082e306..a6e133b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /dotnet-v6.0.103.tar.gz
 /dotnet-v6.0.104.tar.gz
 /dotnet-v6.0.105.tar.gz
+/dotnet-v6.0.106.tar.gz
diff --git a/dotnet6.0.spec b/dotnet6.0.spec
index 0248555..8f1047c 100644
--- a/dotnet6.0.spec
+++ b/dotnet6.0.spec
@@ -20,10 +20,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}
 
-%global host_version 6.0.5
-%global runtime_version 6.0.5
+%global host_version 6.0.6
+%global runtime_version 6.0.6
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.105
+%global sdk_version 6.0.106
 %global sdk_feature_band_version %(echo %{sdk_version} | 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 }')
@@ -60,7 +60,7 @@
 
 Name:           dotnet6.0
 Version:        %{sdk_rpm_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
@@ -469,14 +469,18 @@ export EXTRA_CFLAGS="$CFLAGS"
 export EXTRA_CXXFLAGS="$CXXFLAGS"
 export EXTRA_LDFLAGS="$LDFLAGS"
 
-# https://gitlab.com/redhat/centos-stream/rpms/openssl/-/commit/78fb78d30755ae18fdaef28ef392f4e67c662ff6
-export OPENSSL_ENABLE_SHA1_SIGNATURES=1
-
 # Disable tracing, which is incompatible with certain versions of
 # lttng See https://github.com/dotnet/runtime/issues/57784. The
 # suggested compile-time change doesn't work, unfrotunately.
 export COMPlus_LTTng=0
 
+%if 0%{?rhel} > 8
+# OpenSSL 3.0 in RHEL 9 has disabled SHA1, used by .NET for strong
+# name signing. See https://github.com/dotnet/runtime/issues/67304
+# https://gitlab.com/redhat/centos-stream/rpms/openssl/-/commit/78fb78d30755ae18fdaef28ef392f4e67c662ff6
+export OPENSSL_ENABLE_SHA1_SIGNATURES=1
+%endif
+
 VERBOSE=1 ./build.sh \
 %if %{without bootstrap}
     --with-sdk previously-built-dotnet \
@@ -561,7 +565,6 @@ echo "Testing build results for debug symbols..."
 %{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/
 
 
-
 %check
 %if 0%{?fedora} > 35
 # lttng in Fedora > 35 is incompatible with .NET
@@ -619,6 +622,10 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Thu Jun 23 2022 Omair Majid <omajid@redhat.com> - 6.0.106-1
+- Update to .NET SDK 6.0.106 and Runtime 6.0.6
+- Resolves: RHBZ#2093431
+
 * Wed May 25 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
 - Update to .NET SDK 6.0.105 and Runtime 6.0.5
 - Resolves: RHBZ#2082266
diff --git a/sources b/sources
index 012fcac..f83387b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dotnet-v6.0.105.tar.gz) = 5c3d392d0dce66e30505d8bbba07992f5c9b82c1c58bf9781615ea4d18e364f35df48e5c707d86242878258d70a75b66a33d5d3dd14f7e270cdf1a8c31870d3c
+SHA512 (dotnet-v6.0.106.tar.gz) = 72f90ee49649986c20c23108ff02fddbd54409bd8a0f32fd4555dae8088fd3e15ac4e2954fbae9b8004b7f64c36914993db0b08863879a9e34103e5690cf2d2f
diff --git a/tests/tests.yml b/tests/tests.yml
index 33478f5..3b1e6c4 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -27,6 +27,7 @@
     - dotnet-sdk-6.0
     - dotnet-runtime-6.0
     - expect
+    - file
     - git
     - jq
     - lldb