From d290d006430262b2e481b58259b1adbe203ccfdc Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 27 Oct 2020 20:20:07 +0100
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/dotnet3.1.git#b34ac5ae8854dcac1d9bb9530b89cf03c58c3835
---
 .gitignore           |  1 +
 corefx-f34-rid.patch | 84 --------------------------------------------
 dotnet3.1.spec       | 17 +++++----
 sources              |  2 +-
 4 files changed, 10 insertions(+), 94 deletions(-)
 delete mode 100644 corefx-f34-rid.patch

diff --git a/.gitignore b/.gitignore
index e6007e4..7201626 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /dotnet-v3.1.106-SDK.tar.gz
 /dotnet-v3.1.107-SDK.tar.gz
 /dotnet-v3.1.108-SDK.tar.gz
+/dotnet-v3.1.109-SDK.tar.gz
diff --git a/corefx-f34-rid.patch b/corefx-f34-rid.patch
deleted file mode 100644
index 055b9b5..0000000
--- a/corefx-f34-rid.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-index 91766bd892..cc10ebf83d 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-@@ -1026,6 +1026,38 @@
-     "any",
-     "base"
-   ],
-+  "fedora.34": [
-+    "fedora.34",
-+    "fedora",
-+    "linux",
-+    "unix",
-+    "any",
-+    "base"
-+  ],
-+  "fedora.34-arm64": [
-+    "fedora.34-arm64",
-+    "fedora.34",
-+    "fedora-arm64",
-+    "fedora",
-+    "linux-arm64",
-+    "linux",
-+    "unix-arm64",
-+    "unix",
-+    "any",
-+    "base"
-+  ],
-+  "fedora.34-x64": [
-+    "fedora.34-x64",
-+    "fedora.34",
-+    "fedora-x64",
-+    "fedora",
-+    "linux-x64",
-+    "linux",
-+    "unix-x64",
-+    "unix",
-+    "any",
-+    "base"
-+  ],
-   "freebsd": [
-     "freebsd",
-     "unix",
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
-index 4159a84e32..4fc2ee175f 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtime.json
-+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
-@@ -516,6 +516,23 @@
-         "fedora-x64"
-       ]
-     },
-+    "fedora.34": {
-+      "#import": [
-+        "fedora"
-+      ]
-+    },
-+    "fedora.34-arm64": {
-+      "#import": [
-+        "fedora.34",
-+        "fedora-arm64"
-+      ]
-+    },
-+    "fedora.34-x64": {
-+      "#import": [
-+        "fedora.34",
-+        "fedora-x64"
-+      ]
-+    },
-     "freebsd": {
-       "#import": [
-         "unix"
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-index e4a6d269d2..333d174360 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-@@ -43,7 +43,7 @@
-     <RuntimeGroup Include="fedora">
-       <Parent>linux</Parent>
-       <Architectures>x64;arm64</Architectures>
--      <Versions>23;24;25;26;27;28;29;30;31;32;33</Versions>
-+      <Versions>23;24;25;26;27;28;29;30;31;32;33;34</Versions>
-       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
-     </RuntimeGroup>
- 
diff --git a/dotnet3.1.spec b/dotnet3.1.spec
index 52bd0a6..80e5362 100644
--- a/dotnet3.1.spec
+++ b/dotnet3.1.spec
@@ -21,10 +21,10 @@
 %define _lto_cflags %{nil}
 
 
-%global host_version 3.1.8
-%global runtime_version 3.1.8
+%global host_version 3.1.9
+%global runtime_version 3.1.9
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.108
+%global sdk_version 3.1.109
 # 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/
@@ -77,9 +77,6 @@ Patch101:       corefx-39686-cgroupv2-01.patch
 Patch102:       corefx-39686-cgroupv2-02.patch
 Patch103:       corefx-39633-cgroupv2-mountpoints.patch
 
-# Add Fedora 34 RID
-Patch104:       corefx-f34-rid.patch
-
 # Build with with hardening flags, including -pie
 Patch200:       coreclr-hardening-flags.patch
 # Fix build with clang 10; Already applied at tarball-build time
@@ -360,7 +357,6 @@ pushd src/corefx.*
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1
 popd
 
 pushd src/coreclr.*
@@ -555,7 +551,10 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
-* Thu Jul 16 2020 Tom Stellard <tstellar@redhat.com> - 3.1.108-2
+* Wed Oct 14 2020 Omair Majid <omajid@redhat.com> - 3.1.109-1
+- Update to .NET Core SDK 3.1.109 and Runtime 3.1.9
+
+* Mon Sep 21 2020 Tom Stellard <tstellar@redhat.com> - 3.1.108-2
 - Use toolchain macro for setting clang-specific c/ld flags
 
 * Wed Sep 16 2020 Troy Dawson <tdawson@redhat.com> - 3.1.108-1
diff --git a/sources b/sources
index b8553c7..73fe4f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dotnet-v3.1.108-SDK.tar.gz) = 323ad31de8f0228d514cdd1349cd86069cc3a7bba2892241d1885f011c51d1ec4c858b52901953c5713fcdbcc71b0ecb6c50375152f3990ca1075c7d372f1fc1
+SHA512 (dotnet-v3.1.109-SDK.tar.gz) = 178d768a53d439139b99384a6bc486dca4664fb43cc3b31b2344218cf60e86edecec1787266d40bed5909fa808f17ad6809fdc076198a172c12ebe76ee8b447c