From 2514b1dfaf11ab4e7ee9ebf303109cb41bb6bde6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 18 2022 13:17:57 +0000 Subject: import rh-dotnet50-dotnet-5.0.213-1.el7_9 --- diff --git a/.gitignore b/.gitignore index 4598592..9b24a6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v5.0.212-SDK.tar.gz +SOURCES/dotnet-v5.0.213-SDK.tar.gz diff --git a/.rh-dotnet50-dotnet.metadata b/.rh-dotnet50-dotnet.metadata index ca4fe77..8e6f098 100644 --- a/.rh-dotnet50-dotnet.metadata +++ b/.rh-dotnet50-dotnet.metadata @@ -1 +1 @@ -133ea9c29c923aa6be70337bd05743eec55f2392 SOURCES/dotnet-v5.0.212-SDK.tar.gz +1fa58d8223487d79c6a7d43c54e7e4ad661b4748 SOURCES/dotnet-v5.0.213-SDK.tar.gz diff --git a/SOURCES/runtime-linker-order.patch b/SOURCES/runtime-linker-order.patch deleted file mode 100644 index dcd707c..0000000 --- a/SOURCES/runtime-linker-order.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/installer/corehost/cli/apphost/static/CMakeLists.txt -index 85ea6ffe642..e6369f6b9ad 100644 ---- a/src/installer/corehost/cli/apphost/static/CMakeLists.txt -+++ b/src/installer/corehost/cli/apphost/static/CMakeLists.txt -@@ -207,12 +207,12 @@ - libhostcommon - ${CORECLR_LIBRARIES} - -- ${ZLIB_LIBRARIES} -- ${LIBGSS} -- ${NATIVE_LIBS_EXTRA} -- - ${START_WHOLE_ARCHIVE} - ${RUNTIMEINFO_LIB} - ${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 deleted file mode 100644 index 4a87fc9..0000000 --- a/SOURCES/source-build-runtime-fixup-linker-order.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/SPECS/dotnet.spec b/SPECS/dotnet.spec index 0e03452..4f1462b 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.15 -%global runtime_version 5.0.15 +%global host_version 5.0.16 +%global runtime_version 5.0.16 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 5.0.212 +%global sdk_version 5.0.213 %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -71,15 +71,10 @@ Source0: dotnet-v%{src_version}-SDK.tar.gz Source1: check-debug-symbols.py Source2: dotnet.sh.in -Patch1: source-build-runtime-fixup-linker-order.patch # We remove the tests directory during building to save space # Unfortunately, some other patches in the build reference those tests # This removes those references -Patch2: source-build-remove-test-references-from-patches.patch - -# https://github.com/dotnet/runtime/pull/42094 -# Fix linker order when linking with --as-needed -Patch100: runtime-linker-order.patch +Patch1: source-build-remove-test-references-from-patches.patch # Disable telemetry by default; make it opt-in Patch500: sdk-telemetry-optout.patch @@ -180,6 +175,8 @@ Requires: %{?scl_prefix}dotnet-hostfxr-5.0%{?_isa} >= %{host_rpm_version}- # libicu is dlopen()ed Requires: libicu%{?_isa} +# See src/runtime.*/src/libraries/Native/AnyOS/brotli-version.txt +Provides: bundled(brotli) = 1.0.9 %if %{use_bundled_libunwind} Provides: bundled(libunwind) = 1.3 %endif @@ -326,10 +323,9 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-runtime.*/src/install sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props %patch1 -p1 -%patch2 -p1 pushd src/dotnet-runtime.* -%patch100 -p1 + popd pushd src/dotnet-sdk.* @@ -522,6 +518,10 @@ echo "Testing build results for debug symbols..." %changelog +* Wed Apr 06 2022 Omair Majid - 5.0.213-1 +- Update to .NET SDK 5.0.213 and Runtime 5.0.16 +- Resolves: RHBZ#2072001 + * Fri Mar 04 2022 Omair Majid - 5.0.212-1 - Update to .NET SDK 5.0.212 and Runtime 5.0.15 - Resolves: RHBZ#2060493