Browse Source

import dotnet3.1-3.1.117-1.el8_4

c8 imports/c8/dotnet3.1-3.1.117-1.el8_4
CentOS Sources 1 year ago
committed by Andrew Lukoshko
parent
commit
c1f8304879
  1. 2
      .dotnet3.1.metadata
  2. 2
      .gitignore
  3. 9
      SOURCES/core-setup-hardening-flags.patch
  4. 14
      SPECS/dotnet3.1.spec

2
.dotnet3.1.metadata

@ -1 +1 @@
6328f5f61fafa872db6c0f4ca3fc91533f4e2903 SOURCES/dotnet-v3.1.116-SDK.tar.gz
ee23286997751dba3e8eac6fe72a5ad7a0b150fe SOURCES/dotnet-v3.1.117-SDK.tar.gz

2
.gitignore

@ -1 +1 @@
SOURCES/dotnet-v3.1.116-SDK.tar.gz
SOURCES/dotnet-v3.1.117-SDK.tar.gz

9
SOURCES/core-setup-hardening-flags.patch

@ -1,15 +1,14 @@
diff --git a/src/settings.cmake b/src/settings.cmake
--- a/src/settings.cmake
+++ b/src/settings.cmake
@@ -218,6 +218,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -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")
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} -Wl,--build-id=sha1")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_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")
add_compile_options(-fstack-protector)
--- a/src/corehost/cli/apphost/CMakeLists.txt
+++ b/src/corehost/cli/apphost/CMakeLists.txt
@@ -50,6 +50,8 @@

14
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.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}
@ -309,7 +309,7 @@ pushd src/dotnet-corefx.*
%patch104 -p1
popd
pushd src/coreclr.*
pushd src/dotnet-coreclr.*
%patch200 -p1
%patch201 -p1
%patch202 -p1
@ -451,6 +451,12 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%dir %{_libdir}/dotnet/packs
%changelog
* Fri Jul 02 2021 Andrew Slice <aslice@redhat.com> - 3.1.117-1
- Update to .NET SDK 3.1.117 and Runtime 3.1.17
- Fix renaming of coreclr to dotnet-coreclr
- Remade the core-setup-hardening patch to incorporate new defaults in the cmake file.
- Resolves: RHBZ#1978407
* Thu May 27 2021 Omair Majid <omajid@redhat.com> - 3.1.116-1
- Update to .NET SDK 3.1.116 and Runtime 3.1.16
- Resolves: RHBZ#1965505

Loading…
Cancel
Save