diff --git a/.gitignore b/.gitignore index 7a2bb3c..e71ef92 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /dotnet-v7.0.114.tar.gz /dotnet-v7.0.115.tar.gz /dotnet-v7.0.116.tar.gz +/dotnet-v7.0.117.tar.gz diff --git a/dotnet7.0.spec b/dotnet7.0.spec index 2f7e393..3a42eab 100644 --- a/dotnet7.0.spec +++ b/dotnet7.0.spec @@ -7,10 +7,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 7.0.16 -%global runtime_version 7.0.16 +%global host_version 7.0.17 +%global runtime_version 7.0.17 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 7.0.116 +%global sdk_version 7.0.117 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -79,13 +79,8 @@ Source11: dotnet.sh.in # Disable apphost; there's no net6.0 apphost for ppc64le Patch1: roslyn-analyzers-ppc64le-apphost.patch -# Support building with clang 17. Without this, runtime will not use lld on -# aarch64. That leads to the .text and .rodata sections being placed in the -# same segment, leading to crashes involving GS cookie -# https://github.com/dotnet/runtime/pull/52244 -Patch2: runtime-clang-17.patch # https://github.com/dotnet/runtime/pull/95217#issuecomment-1842799362 -Patch3: runtime-re-enable-implicit-rejection.patch +Patch2: runtime-re-enable-implicit-rejection.patch %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -408,7 +403,6 @@ popd %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Fix bad hardcoded path in build sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp @@ -621,6 +615,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Tue Mar 19 2024 Omair Majid - 7.0.117-2 +- Update to .NET SDK 7.0.117 and Runtime 7.0.17 +- Resolves: RHEL-27547 + * Wed Feb 14 2024 Omair Majid - 7.0.116-2 - Update to .NET SDK 7.0.116 and Runtime 7.0.16 - Resolves: RHEL-23789 diff --git a/runtime-clang-17.patch b/runtime-clang-17.patch deleted file mode 100644 index 86e79b4..0000000 --- a/runtime-clang-17.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/runtime/eng/common/native/init-compiler.sh -+++ b/src/runtime/eng/common/native/init-compiler.sh -@@ -71,7 +71,7 @@ - # Set default versions - if [[ -z "$majorVersion" ]]; then - # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. -- if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) -+ if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) - elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi - - for version in "${versions[@]}"; do diff --git a/sources b/sources index b6fc803..a9f91d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v7.0.116.tar.gz) = b198af3f62484b6fb6c7f5f1658e858cfc3fbedf0f34de2cb849a6621a5aa07e99aa8729da45764133d42cc99bf39d0ee8272071f5bb8568c1c87703d86c90c1 +SHA512 (dotnet-v7.0.117.tar.gz) = a3f44bc9960605a3ff9bf51aa9b5c8d49e1a7de57e75d707912c61dca47b9255a0eb73b7b78aa3df7e3094dcfda172900328bf91c99bea8ecf2b7052684b60c4 diff --git a/update-release b/update-release index 5725315..89d44fc 100755 --- a/update-release +++ b/update-release @@ -103,7 +103,9 @@ else if [[ -f "dotnet-${tag}.tar.gz" ]]; then echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball" elif [[ -n ${user_provided_tarball_name} ]]; then - cp -a "${user_provided_tarball_name}" "dotnet-${tag}.tar.gz" + tag_without_v=${tag#v} + cp -a "${user_provided_tarball_name}" dotnet-${tag_without_v}.tar.gz + cp -a "${user_provided_tarball_name}.sig" dotnet-${tag_without_v}.tar.gz.sig cp -a "${release_json}" release.json else rm -f release.json