From 7e09a169766a02f0272a09ac38ff1d70d325f891 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 11 2021 18:27:34 +0000 Subject: import dotnet3.1-3.1.118-1.el8_4 --- diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata index 6ba20e4..f413c81 100644 --- a/.dotnet3.1.metadata +++ b/.dotnet3.1.metadata @@ -1 +1 @@ -ee23286997751dba3e8eac6fe72a5ad7a0b150fe SOURCES/dotnet-v3.1.117-SDK.tar.gz +ccc393389b53e9e1cdf5e3a754e0e6b61d7895e2 SOURCES/dotnet-v3.1.118-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 7c8d21b..7db3884 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.117-SDK.tar.gz +SOURCES/dotnet-v3.1.118-SDK.tar.gz diff --git a/SOURCES/core-setup-hardening-flags.patch b/SOURCES/core-setup-hardening-flags.patch deleted file mode 100644 index 48bbf1a..0000000 --- a/SOURCES/core-setup-hardening-flags.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/settings.cmake b/src/settings.cmake ---- a/src/settings.cmake -+++ b/src/settings.cmake -@@ -174,6 +174,7 @@ - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1 -Wl,-z,relro,-z,now") -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pie") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie -Wl,--build-id=sha1 -Wl,-z,relro,-z,now") - add_compile_options(-fstack-protector-strong) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ---- a/src/corehost/cli/apphost/CMakeLists.txt -+++ b/src/corehost/cli/apphost/CMakeLists.txt -@@ -50,6 +50,8 @@ - - add_definitions(-DFEATURE_APPHOST=1) - -+set_target_properties("apphost" PROPERTIES LINK_FLAGS -pie) -+ - # Disable manifest generation into the file .exe on Windows - if(WIN32) - set_property(TARGET ${PROJECT_NAME} PROPERTY diff --git a/SOURCES/corefx-hardening-flags.patch b/SOURCES/corefx-hardening-flags.patch deleted file mode 100644 index b1588e2..0000000 --- a/SOURCES/corefx-hardening-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Native/Unix/System.Native/CMakeLists.txt -+++ b/src/Native/Unix/System.Native/CMakeLists.txt -@@ -48,6 +48,8 @@ - set_target_properties(System.Native-Static PROPERTIES PREFIX "") - set_target_properties(System.Native-Static PROPERTIES OUTPUT_NAME System.Native CLEAN_DIRECT_OUTPUT 1) - -+set_target_properties(System.Native PROPERTIES LINK_FLAGS -pie) -+ - if (CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_PLATFORM_ANDROID) - target_link_libraries(System.Native rt) - endif () diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec index 1cca290..e86efd0 100644 --- a/SPECS/dotnet3.1.spec +++ b/SPECS/dotnet3.1.spec @@ -23,10 +23,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.17 -%global runtime_version 3.1.17 +%global host_version 3.1.18 +%global runtime_version 3.1.18 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.117 +%global sdk_version 3.1.118 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -72,15 +72,13 @@ Source100: check-debug-symbols.py Source101: dotnet.sh.in Patch100: corefx-optflags-support.patch -Patch103: corefx-39633-cgroupv2-mountpoints.patch -Patch104: corefx-hardening-flags.patch +Patch101: corefx-39633-cgroupv2-mountpoints.patch Patch200: coreclr-27048-sysctl-deprecation.patch Patch201: coreclr-hardening-flags.patch Patch202: coreclr-libunwind-fno-common.patch Patch300: core-setup-do-not-strip.patch -Patch301: core-setup-hardening-flags.patch Patch500: cli-telemetry-optout.patch @@ -305,8 +303,7 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props pushd src/dotnet-corefx.* %patch100 -p1 -%patch103 -p1 -%patch104 -p1 +%patch101 -p1 popd pushd src/dotnet-coreclr.* @@ -317,7 +314,6 @@ popd pushd src/dotnet-core-setup.* %patch300 -p1 -%patch301 -p1 popd pushd src/dotnet-cli.* @@ -451,6 +447,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %dir %{_libdir}/dotnet/packs %changelog +* Thu Aug 05 2021 Omair Majid - 3.1.118-1 +- Update to .NET SDK 3.1.118 and Runtime 3.1.18 +- Resolves: RHBZ#1990189 + * Fri Jul 02 2021 Andrew Slice - 3.1.117-1 - Update to .NET SDK 3.1.117 and Runtime 3.1.17 - Fix renaming of coreclr to dotnet-coreclr