diff --git a/.gitignore b/.gitignore index 844842f..7c8d21b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.116-SDK.tar.gz +SOURCES/dotnet-v3.1.117-SDK.tar.gz diff --git a/.rh-dotnet31-dotnet.metadata b/.rh-dotnet31-dotnet.metadata index 5d5406b..66930a8 100644 --- a/.rh-dotnet31-dotnet.metadata +++ b/.rh-dotnet31-dotnet.metadata @@ -1 +1 @@ -aec520b55f84de87f4e2bc7cd2496c3d85921dd7 SOURCES/dotnet-v3.1.116-SDK.tar.gz +9625cce3bec16d23288ab81b423f8982c252e8d3 SOURCES/dotnet-v3.1.117-SDK.tar.gz diff --git a/SOURCES/core-setup-hardening-flags.patch b/SOURCES/core-setup-hardening-flags.patch deleted file mode 100644 index 3f6b91c..0000000 --- a/SOURCES/core-setup-hardening-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/settings.cmake b/src/settings.cmake ---- a/src/settings.cmake -+++ b/src/settings.cmake -@@ -218,6 +218,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") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") - add_compile_options(-fstack-protector-strong) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - add_compile_options(-fstack-protector) diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 70892aa..64c4a23 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -26,10 +26,10 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.16 -%global runtime_version 3.1.16 +%global host_version 3.1.17 +%global runtime_version 3.1.17 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.116 +%global sdk_version 3.1.117 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} @@ -70,7 +70,6 @@ Patch100: corefx-optflags-support.patch Patch200: coreclr-hardening-flags.patch Patch300: core-setup-do-not-strip.patch -Patch301: core-setup-hardening-flags.patch Patch500: cli-telemetry-optout.patch @@ -285,13 +284,12 @@ pushd src/dotnet-corefx.* %patch100 -p1 popd -pushd src/coreclr.* +pushd src/dotnet-coreclr.* %patch200 -p1 popd pushd src/dotnet-core-setup.* %patch300 -p1 -%patch301 -p1 popd pushd src/dotnet-cli.* @@ -441,6 +439,12 @@ echo "Testing build results for debug symbols..." %dir %{_libdir}/dotnet/packs %changelog +* Tue Jul 06 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 +- Remove the core-setup-hardening patch because the cmake file already contains the diff. +- Resolves: RHBZ#1978388 + * Mon May 31 2021 Omair Majid - 3.1.116-1 - Update to .NET SDK 3.1.116 and Runtime 3.1.16 - Resolves: RHBZ#1965498