From 6024daad7ce28578336aec03bed7a0ae61657b03 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 08 2020 15:56:16 +0000
Subject: import dotnet5.0-5.0.100-0.8.0201202git337413b.el8_3


---

diff --git a/.dotnet5.0.metadata b/.dotnet5.0.metadata
index b15c761..fb8f0ac 100644
--- a/.dotnet5.0.metadata
+++ b/.dotnet5.0.metadata
@@ -1 +1 @@
-bf5d159d88cb9740d856caf5cd4b283fef318133 SOURCES/dotnet-v5.0.100-preview.8.20417.9-SDK.tar.xz
+99595a158d9deccaeb02f642eb8a7fb837b50a2e SOURCES/dotnet-v5.0.100-SDK-337413b.tar.gz
diff --git a/.gitignore b/.gitignore
index 8033f2b..8632dbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v5.0.100-preview.8.20417.9-SDK.tar.xz
+SOURCES/dotnet-v5.0.100-SDK-337413b.tar.gz
diff --git a/SOURCES/runtime-dont-strip.patch b/SOURCES/runtime-dont-strip.patch
deleted file mode 100644
index 694face..0000000
--- a/SOURCES/runtime-dont-strip.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Do not strip native/unmanaged symbols from binaries
-
-This is a hack. It rips out the calls to strip directly.
-
-The correct/upstreamable fix is to add a configure/build option to
-keep symbols for some builds, such as those needed by upstream.
-
-diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake
-index 8b73581ed14..7697908425e 100644
---- a/eng/native/functions.cmake
-+++ b/eng/native/functions.cmake
-@@ -282,7 +282,7 @@ function(target_precompile_header)
-   endif(MSVC)
- endfunction()
- 
--function(strip_symbols targetName outputFilename)
-+function(strip_symbols_renamed targetName outputFilename)
-   if (CLR_CMAKE_HOST_UNIX)
-     set(strip_source_file $<TARGET_FILE:${targetName}>)
- 
-@@ -336,8 +336,8 @@ function(strip_symbols targetName outputFilename)
- endfunction()
- 
- function(install_with_stripped_symbols targetName kind destination)
--    strip_symbols(${targetName} symbol_file)
--    install_symbols(${symbol_file} ${destination})
-+    # strip_symbols_renamed(${targetName} symbol_file)
-+    # install_symbols(${symbol_file} ${destination})
-     if ("${kind}" STREQUAL "TARGETS")
-       set(install_source ${targetName})
-     elseif("${kind}" STREQUAL "PROGRAMS")
-@@ -375,13 +375,13 @@ function(install_clr)
-   foreach(targetName ${INSTALL_CLR_TARGETS})
-     list(FIND CLR_CROSS_COMPONENTS_LIST ${targetName} INDEX)
-     if (NOT DEFINED CLR_CROSS_COMPONENTS_LIST OR NOT ${INDEX} EQUAL -1)
--        strip_symbols(${targetName} symbol_file)
-+        # strip_symbols_renamed(${targetName} symbol_file)
- 
-         foreach(destination ${destinations})
-           # We don't need to install the export libraries for our DLLs
-           # since they won't be directly linked against.
-           install(PROGRAMS $<TARGET_FILE:${targetName}> DESTINATION ${destination})
--          install_symbols(${symbol_file} ${destination})
-+          # install_symbols(${symbol_file} ${destination})
- 
-           if(CLR_CMAKE_PGO_INSTRUMENT)
-               if(WIN32)
diff --git a/SOURCES/runtime-flags-support.patch b/SOURCES/runtime-flags-support.patch
deleted file mode 100644
index 921e483..0000000
--- a/SOURCES/runtime-flags-support.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
-index b976f5fdc6c..853580b1c7a 100755
---- a/eng/native/build-commons.sh
-+++ b/eng/native/build-commons.sh
-@@ -163,6 +163,14 @@ EOF
-         return
-     fi
- 
-+    SAVED_CFLAGS="${CFLAGS}"
-+    SAVED_CXXFLAGS="${CXXFLAGS}"
-+    SAVED_LDFLAGS="${LDFLAGS}"
-+
-+    export CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}"
-+    export CXXFLAGS="${CXXFLAGS} ${EXTRA_CXXFLAGS}"
-+    export LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}"
-+
-     if [[ "$__StaticAnalyzer" == 1 ]]; then
-         pushd "$intermediatesDir"
- 
-@@ -181,6 +189,10 @@ EOF
-         $cmake_command --build "$intermediatesDir" --target install -- -j "$__NumProc"
-     fi
- 
-+    CFLAGS="${SAVED_CFLAGS}"
-+    CXXFLAGS="${SAVED_CXXFLAGS}"
-+    LDFLAGS="${SAVED_LDFLAGS}"
-+
-     local exit_code="$?"
-     if [[ "$exit_code" != 0 ]]; then
-         echo "${__ErrMsgPrefix}Failed to build \"$message\"."
diff --git a/SOURCES/source-build-1750-runtime-pack.patch b/SOURCES/source-build-1750-runtime-pack.patch
deleted file mode 100644
index 0500f81..0000000
--- a/SOURCES/source-build-1750-runtime-pack.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From d25bfc2a634230f1cbb73dcffc67439721f3b412 Mon Sep 17 00:00:00 2001
-From: Davis Goodin <dagood@microsoft.com>
-Date: Mon, 14 Sep 2020 18:46:20 -0500
-Subject: [PATCH] Fix runtime pack RID list: omit source-built RID
-
----
- ...get-rid-to-AppHostRuntimeIdentifiers.patch | 47 +++++++++++--------
- 1 file changed, 27 insertions(+), 20 deletions(-)
-
-diff --git a/patches/installer/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch b/patches/installer/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch
-index 8eba95a4ce..43ed58ed95 100644
---- a/patches/installer/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch
-+++ b/patches/installer/0002-Add-target-rid-to-AppHostRuntimeIdentifiers.patch
-@@ -1,30 +1,37 @@
--From 66d0c4da113bb6456eb442a9fee458768e421e67 Mon Sep 17 00:00:00 2001
--From: dseefeld <dseefeld@microsoft.com>
--Date: Mon, 29 Jun 2020 18:07:47 -0400
--Subject: [PATCH 2/3] Add target rid to AppHostRuntimeIdentifiers
-+From e09da5670bfc8df488b65aee94de992a1c75a6a4 Mon Sep 17 00:00:00 2001
-+From: Davis Goodin <dagood@microsoft.com>
-+Date: Mon, 14 Sep 2020 18:43:27 -0500
-+Subject: [PATCH] Add target rid to NetCoreAppHostRids
- 
--Updated from 3.1 patch at
--https://github.com/dotnet/source-build/blob/2d5b506b13a06adf36f0feb4982ceebb7fa27123/patches/core-sdk/0008-Add-target-rid-to-AppHostRuntimeIdentifiers.patch
- ---
-- src/redist/targets/GenerateBundledVersions.targets | 5 +++++
-- 1 file changed, 5 insertions(+)
-+ src/redist/targets/GenerateBundledVersions.targets | 14 ++++++++++++++
-+ 1 file changed, 14 insertions(+)
- 
- diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
--index 7c6f72967..098960015 100644
-+index 7c6f72967..3ee0284e1 100644
- --- a/src/redist/targets/GenerateBundledVersions.targets
- +++ b/src/redist/targets/GenerateBundledVersions.targets
--@@ -71,6 +71,11 @@
--           win-x86;
--           " />
-+@@ -93,6 +93,20 @@
-+       <NetCoreAppHostRids Include="@(NetCore5AppHostRids)" />
-+       <NetCoreRuntimePackRids Include="@(NetCore5RuntimePackRids)" />
-  
--+      <NetCore30RuntimePackRids Include="
--+          $(ProductMonikerRid);
--+          @(NetCoreRuntimePackRids)
--+          " />
-++      <!--
-++        In source-build, we build the current RID from source, which may be
-++        non-portable and/or not an official RID. However, we can only use the
-++        apphost pack, not the runtime pack, because:
-++        - Apphost packs are distributed in the SDK.
-++        - Runtime packs are not shipped with the SDK, only on NuGet.
- +
--       <NetCore31RuntimePackRids Include="@(NetCore30RuntimePackRids)"/>
-- 
--       <NetCore5AppHostRids Include="@(NetCore31RuntimePackRids)"/>
-++        Adding the ability to distribute and use source-built runtime packs is
-++        tracked by: https://github.com/dotnet/source-build/issues/1215
-++      -->
-++      <NetCoreAppHostRids
-++        Condition="'$(DotNetBuildFromSource)' == 'true'"
-++        Include="$(ProductMonikerRid)" /> 
-++
-+       <AspNetCore30RuntimePackRids Include="
-+         win-x64;
-+         win-x86;
- -- 
--2.18.0
-+2.27.0.windows.1
- 
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..5a74b5d
--- /dev/null
+++ b/SOURCES/source-build-runtime-fixup-linker-order.patch
@@ -0,0 +1,13 @@
+--- 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/dotnet5.0.spec b/SPECS/dotnet5.0.spec
index 791c5d6..cb1b0ad 100644
--- a/SPECS/dotnet5.0.spec
+++ b/SPECS/dotnet5.0.spec
@@ -20,17 +20,17 @@
 %global dotnet_cflags %(echo %optflags | sed -e 's/-fstack-clash-protection//' | sed -re 's/-specs=[^ ]*//g')
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
-%global host_version 5.0.0-preview.8.20407.11
-%global runtime_version 5.0.0-preview.8.20407.11
-%global aspnetcore_runtime_version 5.0.0-preview.8.20414.8
-%global sdk_version 5.0.100-preview.8.20417.9
-%global templates_version 5.0.0-preview.8.20417.9
+%global host_version 5.0.0
+%global runtime_version 5.0.0
+%global aspnetcore_runtime_version 5.0.0
+%global sdk_version 5.0.100
+%global templates_version 5.0.0
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
-%global host_rpm_version 5.0.0
-%global aspnetcore_runtime_rpm_version 5.0.0
-%global runtime_rpm_version 5.0.0
-%global sdk_rpm_version 5.0.100
+%global host_rpm_version %{host_version}
+%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version}
+%global runtime_rpm_version %{runtime_version}
+%global sdk_rpm_version %{sdk_version}
 
 # upstream can update releases without revving the SDK version so these don't always match
 %global src_version %{sdk_version}
@@ -52,41 +52,26 @@
 %global runtime_arch arm64
 %endif
 
-%if 0%{?fedora}
-%global runtime_id fedora.%{fedora}-%{runtime_arch}
-%else
-%if 0%{?centos}
-%global runtime_id centos.%{centos}-%{runtime_arch}
-%else
-%global runtime_id rhel.%{rhel}-%{runtime_arch}
-%endif
-%endif
+%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID%%.*}")-%{runtime_arch}}
 
 Name:           dotnet5.0
 Version:        %{sdk_rpm_version}
-Release:        0.6.preview8%{?dist}
+Release:        0.8.0201202git337413b%{?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/
 
 # The source is generated on a Fedora box via:
 # ./build-dotnet-tarball v%%{src_version}-SDK
-Source0:        dotnet-v%{src_version}-SDK.tar.xz
+Source0:        dotnet-v%{src_version}-SDK-337413b.tar.gz
 Source1:        check-debug-symbols.py
 Source2:        dotnet.sh.in
 
-# https://github.com/dotnet/source-build/pull/1750
-Patch1:         source-build-1750-runtime-pack.patch
+Patch1:         source-build-runtime-fixup-linker-order.patch
 
-# https://github.com/dotnet/runtime/pull/39203
-# Do not strip debuginfo from (native/unmanaged) binaries
-Patch100:       runtime-dont-strip.patch
 # https://github.com/dotnet/runtime/pull/42094
 # Fix linker order when linking with --as-needed
-Patch101:       runtime-linker-order.patch
-# https://github.com/dotnet/runtime/pull/39191
-# Fix building with our additional CFLAGS/CXXFLAGS/LDFLAGS
-Patch102:       runtime-flags-support.patch
+Patch100:       runtime-linker-order.patch
 
 # Disable telemetry by default; make it opt-in
 Patch500:       sdk-telemetry-optout.patch
@@ -321,7 +306,7 @@ These are not meant for general use.
 
 
 %prep
-%setup -q -n dotnet-v%{src_version}-SDK
+%setup -q -n dotnet-v%{src_version}-SDK-337413b
 
 %if %{without bootstrap}
 # Remove all prebuilts
@@ -351,22 +336,12 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
 
 pushd src/runtime.*
 %patch100 -p1
-%patch101 -p1
-%patch102 -p1
 popd
 
 pushd src/sdk.*
 %patch500 -p1
 popd
 
-# If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back
-grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/runtime.common.props || \
-    sed -i 's|\$(BuildArguments) </BuildArguments>|$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE</BuildArguments>|' repos/runtime.common.props
-
-%if %{use_bundled_libunwind}
-sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/runtime.common.props
-%endif
-
 %ifnarch x86_64
 mkdir -p artifacts/obj/%{runtime_arch}/Release
 cp artifacts/obj/x64/Release/PackageVersions.props artifacts/obj/%{runtime_arch}/Release/PackageVersions.props
@@ -405,6 +380,11 @@ VERBOSE=1 ./build.sh \
     /p:LogVerbosity=n \
     /p:MinimalConsoleLogOutput=false \
     /p:ContinueOnPrebuiltBaselineError=true \
+%if %{use_bundled_libunwind}
+    /p:UseSystemLibunwind=false \
+%else
+    /p:UseSystemLibunwind=true \
+%endif
 
 
 sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE2} > dotnet.sh
@@ -420,12 +400,14 @@ tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtim
     -C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/
 
 # Fix executable permissions on files
+find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.a' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.dll' -exec chmod -x {} \;
+find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.h' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pdb' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.props' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pubxml' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} \;
-find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.a' -exec chmod -x {} \;
+find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \;
 chmod 0755 %{buildroot}/%{_libdir}/dotnet/sdk/%{sdk_version}/AppHostTemplate/apphost
 chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/apphost
 chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/libnethost.so
@@ -514,6 +496,14 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Thu Dec 03 2020 Omair Majid <omajid@redhat.com> - 5.0.100-0.8.0201202git337413b
+- Update to latest commit of .NET Core SDK 5.0.100 and Runtime 5.0.0
+- Resolves: RHBZ#1897396
+
+* Fri Oct 23 2020 Omair Majid <omajid@redhat.com> - 5.0.100-0.7.rc1
+- Update to .NET Core SDK 5.0.100 RC1 and Runtime 5.0.0 RC1
+- Resolves: RHBZ#1891507
+
 * Tue Sep 15 2020 Omair Majid <omajid@redhat.com> - 5.0.100-0.6.preview8
 - Switch to a smaller tarball
 - Fix restore-with-rid