From decde463e59ab6bdb87650ad4ba36498cab7ec5a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 09 2021 21:59:07 +0000
Subject: import rh-dotnet50-dotnet-5.0.104-1.el7_9


---

diff --git a/.gitignore b/.gitignore
index 3094369..0639430 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v5.0.103-SDK.tar.gz
+SOURCES/dotnet-v5.0.104-SDK.tar.gz
diff --git a/.rh-dotnet50-dotnet.metadata b/.rh-dotnet50-dotnet.metadata
index 44ed50e..696f1ff 100644
--- a/.rh-dotnet50-dotnet.metadata
+++ b/.rh-dotnet50-dotnet.metadata
@@ -1 +1 @@
-c665420bbc627928776e980e0133f08103c335e2 SOURCES/dotnet-v5.0.103-SDK.tar.gz
+5e30bb3490e4e4125951be7be1bec545823f945b SOURCES/dotnet-v5.0.104-SDK.tar.gz
diff --git a/SOURCES/runtime-linker-order.patch b/SOURCES/runtime-linker-order.patch
index 6ca413f..dcd707c 100644
--- a/SOURCES/runtime-linker-order.patch
+++ b/SOURCES/runtime-linker-order.patch
@@ -2,19 +2,20 @@ diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/inst
 index 85ea6ffe642..e6369f6b9ad 100644
 --- a/src/installer/corehost/cli/apphost/static/CMakeLists.txt
 +++ b/src/installer/corehost/cli/apphost/static/CMakeLists.txt
-@@ -204,11 +204,12 @@ target_link_libraries(singlefilehost
+@@ -207,12 +207,12 @@
      libhostcommon
      ${CORECLR_LIBRARIES}
  
-+    ${START_WHOLE_ARCHIVE}
-+    ${NATIVE_LIBS}
-+    ${END_WHOLE_ARCHIVE}
+-    ${ZLIB_LIBRARIES}
+-    ${LIBGSS}
+-    ${NATIVE_LIBS_EXTRA}
+-
+     ${START_WHOLE_ARCHIVE}
+     ${RUNTIMEINFO_LIB}
+     ${NATIVE_LIBS}
+     ${END_WHOLE_ARCHIVE}
 +
-     ${ZLIB_LIBRARIES}
-     ${LIBGSS}
-     ${NATIVE_LIBS_EXTRA}
- 
--    ${START_WHOLE_ARCHIVE}
--    ${NATIVE_LIBS}
--    ${END_WHOLE_ARCHIVE}
++    ${ZLIB_LIBRARIES}
++    ${LIBGSS}
++    ${NATIVE_LIBS_EXTRA}
  )
diff --git a/SOURCES/source-build-runtime-fixup-linker-order.patch b/SOURCES/source-build-runtime-fixup-linker-order.patch
new file mode 100644
index 0000000..4a87fc9
--- /dev/null
+++ b/SOURCES/source-build-runtime-fixup-linker-order.patch
@@ -0,0 +1,13 @@
+--- a/patches/runtime/0010-Fix-singlefilehost-build-in-non-portable-mode-42415.patch
++++ b/patches/runtime/0010-Fix-singlefilehost-build-in-non-portable-mode-42415.patch
+@@ -45,8 +45,8 @@
+          # These options are used to force every object to be included even if it's unused.
+          set(START_WHOLE_ARCHIVE -Wl,--whole-archive)
+ @@ -216,3 +221,10 @@ target_link_libraries(
+-     ${NATIVE_LIBS}
+-     ${END_WHOLE_ARCHIVE}
++     ${LIBGSS}
++     ${NATIVE_LIBS_EXTRA}
+  )
+ +
+ +if(NOT FEATURE_DISTRO_AGNOSTIC_SSL)
diff --git a/SOURCES/source-build-runtime-patch-fixup.patch b/SOURCES/source-build-runtime-patch-fixup.patch
deleted file mode 100644
index dd31750..0000000
--- a/SOURCES/source-build-runtime-patch-fixup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/patches/runtime/0014-Fix-singlefilehost-build-in-non-portable-mode-42415.patch
-+++ b/patches/runtime/0014-Fix-singlefilehost-build-in-non-portable-mode-42415.patch
-@@ -45,8 +45,8 @@
-          # These options are used to force every object to be included even if it's unused.
-          set(START_WHOLE_ARCHIVE -Wl,--whole-archive)
- @@ -212,3 +217,10 @@ target_link_libraries(singlefilehost
--     ${NATIVE_LIBS}
--     ${END_WHOLE_ARCHIVE}
-+     ${NATIVE_LIBS_EXTRA}
-+
-  )
- +
- +if(NOT FEATURE_DISTRO_AGNOSTIC_SSL)
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index e3030c5..9d91489 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -23,10 +23,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}
 
-%global host_version 5.0.3
-%global runtime_version 5.0.3
+%global host_version 5.0.4
+%global runtime_version 5.0.4
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 5.0.103
+%global sdk_version 5.0.104
 %global templates_version %{runtime_version}
 
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -71,7 +71,7 @@ Source0:        dotnet-v%{src_version}-SDK.tar.gz
 Source1:        check-debug-symbols.py
 Source2:        dotnet.sh.in
 
-Patch1:         source-build-runtime-patch-fixup.patch
+Patch1:         source-build-runtime-fixup-linker-order.patch
 
 # https://github.com/dotnet/runtime/pull/42094
 # Fix linker order when linking with --as-needed
@@ -523,6 +523,10 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Wed Mar 03 2021 Omair Majid <omajid@redhat.com> - 5.0.104-1
+- Update to .NET SDK 5.0.104 and Runtime 5.0.4
+- Resolves: RHBZ#1934240
+
 * Wed Feb 03 2021 Omair Majid <omajid@redhat.com> - 5.0.103-1
 - Update to .NET SDK 5.0.103 and Runtime 5.0.3
 - Resolves: RHBZ#1924761