From a19e43c2cf6a6ee2bf8e5d0fce5bf4d9d0e4494a Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Fri, 27 Aug 2021 09:21:15 -0400
Subject: [PATCH] Update to .NET SDK 3.1.118 and Runtime 3.1.18

Resolves: RHBZ#1961848
---
 .gitignore     |  1 +
 dotnet3.1.spec | 15 +++++++++++----
 sources        |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a73ce56..84d151d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /dotnet-v3.1.115-SDK.tar.gz
 /dotnet-v3.1.116-SDK.tar.gz
 /dotnet-v3.1.117-SDK.tar.gz
+/dotnet-v3.1.118-SDK.tar.gz
diff --git a/dotnet3.1.spec b/dotnet3.1.spec
index 806db6b..27221cb 100644
--- a/dotnet3.1.spec
+++ b/dotnet3.1.spec
@@ -21,10 +21,10 @@
 %define _lto_cflags %{nil}
 
 
-%global host_version 3.1.17
-%global runtime_version 3.1.17
+%global host_version 3.1.18
+%global runtime_version 3.1.18
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.117
+%global sdk_version 3.1.118
 # upstream can update releases without revving the SDK version so these don't always match
 %global src_version %{sdk_version}
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -55,7 +55,7 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        .NET Core 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/
@@ -133,6 +133,9 @@ BuildRequires:  llvm
 BuildRequires:  lttng-ust-devel
 BuildRequires:  make
 BuildRequires:  openssl-devel
+%if 0%{?rhel} > 8
+BuildRequires:  compat-openssl11
+%endif
 BuildRequires:  python3
 BuildRequires:  systemtap-sdt-devel
 BuildRequires:  tar
@@ -572,6 +575,10 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Fri Aug 27 2021 Omair Majid <omajid@redhat.com> - 3.1.118-1
+- Update to .NET SDK 3.1.118 and Runtime 3.1.18
+- Resolves: RHBZ#1961848
+
 * Tue Aug 24 2021 Omair Majid <omajid@redhat.com> - 3.1.117-2
 - Fix building and running against OpenSSL 3.0
 - Resolves: RHBZ#1991050
diff --git a/sources b/sources
index f58ffe5..e834046 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dotnet-v3.1.117-SDK.tar.gz) = 1d2c3dfd4826c0f6b83abed8a7d0028ef049132ab6fc9d22f7913ba16543e35ca41ad115041e215b243b606af69ffbc44c4b0bc7644c3f23751d6a9e35b949c8
+SHA512 (dotnet-v3.1.118-SDK.tar.gz) = 0c8fd6d9bedf262717e1d80bcd9f21c5647fd377a4e3abf29f47d4bfe017fece2cf82972a9fe7ff9284c5ff298c0c9ee7a325527b77d881fea57447e4148524e