diff --git a/.dotnet5.0.metadata b/.dotnet5.0.metadata index 1f2ff53..e753c8c 100644 --- a/.dotnet5.0.metadata +++ b/.dotnet5.0.metadata @@ -1 +1 @@ -7d0d8dc54afe995e0fb450e305856f3fd3ffee17 SOURCES/dotnet-v5.0.103-SDK.tar.gz +4c29720e364b8d4c2cf8809085da20141b849c17 SOURCES/dotnet-v5.0.104-SDK.tar.gz 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/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 index 5a74b5d..4a87fc9 100644 --- a/SOURCES/source-build-runtime-fixup-linker-order.patch +++ b/SOURCES/source-build-runtime-fixup-linker-order.patch @@ -1,13 +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 +--- 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) - @@ -212,3 +217,10 @@ target_link_libraries(singlefilehost + @@ -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/SPECS/dotnet5.0.spec b/SPECS/dotnet5.0.spec index 1f373a5..46b6d25 100644 --- a/SPECS/dotnet5.0.spec +++ b/SPECS/dotnet5.0.spec @@ -20,10 +20,10 @@ %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.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 }') @@ -496,6 +496,10 @@ echo "Testing build results for debug symbols..." %changelog +* Tue Mar 02 2021 Omair Majid - 5.0.104-1 +- Update to .NET SDK 5.0.104 and Runtime 5.0.4 +- Resolves: RHBZ#1934247 + * Wed Feb 03 2021 Omair Majid - 5.0.103-1 - Update to .NET SDK 5.0.103 and Runtime 5.0.3 - Resolves: RHBZ#1924765