From 50796bb656ee6bad4609d51f67e4bc35dfa92807 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 11 2021 18:35:11 +0000
Subject: import rh-dotnet31-dotnet-3.1.118-1.el7_9


---

diff --git a/.gitignore b/.gitignore
index 7c8d21b..7db3884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.117-SDK.tar.gz
+SOURCES/dotnet-v3.1.118-SDK.tar.gz
diff --git a/.rh-dotnet31-dotnet.metadata b/.rh-dotnet31-dotnet.metadata
index 66930a8..e942cf4 100644
--- a/.rh-dotnet31-dotnet.metadata
+++ b/.rh-dotnet31-dotnet.metadata
@@ -1 +1 @@
-9625cce3bec16d23288ab81b423f8982c252e8d3 SOURCES/dotnet-v3.1.117-SDK.tar.gz
+ec2d08971d164c81531d096a388e1c7d0837711e SOURCES/dotnet-v3.1.118-SDK.tar.gz
diff --git a/SOURCES/coreclr-hardening-flags.patch b/SOURCES/coreclr-hardening-flags.patch
deleted file mode 100644
index 3b45c58..0000000
--- a/SOURCES/coreclr-hardening-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/debug/createdump/CMakeLists.txt b/src/debug/createdump/CMakeLists.txt
---- a/src/debug/createdump/CMakeLists.txt
-+++ b/src/debug/createdump/CMakeLists.txt
-@@ -42,6 +42,8 @@
- 
- add_dependencies(createdump pal_redefines_file)
- 
-+SET_TARGET_PROPERTIES(createdump PROPERTIES LINK_FLAGS -pie)
-+
- target_link_libraries(createdump
-     createdump_lib
-     # share the PAL/corguids in the dac module
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index 64c4a23..7afb0a9 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -26,10 +26,10 @@
 %endif
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
-%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
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
 %global host_rpm_version %{host_version}
@@ -67,8 +67,6 @@ Source2:        dotnet.sh
 
 Patch100:       corefx-optflags-support.patch
 
-Patch200:       coreclr-hardening-flags.patch
-
 Patch300:       core-setup-do-not-strip.patch
 
 Patch500:       cli-telemetry-optout.patch
@@ -285,7 +283,6 @@ pushd src/dotnet-corefx.*
 popd
 
 pushd src/dotnet-coreclr.*
-%patch200 -p1
 popd
 
 pushd src/dotnet-core-setup.*
@@ -439,6 +436,11 @@ echo "Testing build results for debug symbols..."
 %dir %{_libdir}/dotnet/packs
 
 %changelog
+* Fri Aug 06 2021 Omair Majid <omajid@redhat.com> - 3.1.118-1
+- Update to .NET SDK 3.1.118 and Runtime 3.1.18
+- Drop upstreamed patches
+- Resolves: RHBZ#1990173
+
 * Tue Jul 06 2021 Andrew Slice <aslice@redhat.com> - 3.1.117-1
 - Update to .NET SDK 3.1.117 and Runtime 3.1.17
 - Fix renaming of coreclr to dotnet-coreclr