From a0939e3f839a07cb7e221072d2a7eb588c5f82db Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 14 May 2024 21:33:04 -0400 Subject: [PATCH] Update to .NET SDK 7.0.119 and Runtime 7.0.19 Resolves: RHEL-35313 --- .gitignore | 1 + dotnet7.0.spec | 12 ++++++---- runtime-re-enable-implicit-rejection.patch | 27 ---------------------- sources | 2 +- update-release | 2 ++ 5 files changed, 12 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index ccfb963..5416e35 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /dotnet-v7.0.116.tar.gz /dotnet-v7.0.117.tar.gz /dotnet-v7.0.118.tar.gz +/dotnet-v7.0.119.tar.gz diff --git a/dotnet7.0.spec b/dotnet7.0.spec index f607265..aaa6bf8 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.18 -%global runtime_version 7.0.18 +%global host_version 7.0.19 +%global runtime_version 7.0.19 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 7.0.118 +%global sdk_version 7.0.119 %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 }') @@ -52,7 +52,7 @@ Name: dotnet7.0 Version: %{sdk_rpm_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: .NET Runtime and SDK License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib URL: https://github.com/dotnet/ @@ -615,6 +615,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Tue May 14 2024 Omair Majid - 7.0.119-1 +- Update to .NET SDK 7.0.119 and Runtime 7.0.19 +- Resolves: RHEL-35313 + * Tue Apr 09 2024 Omair Majid - 7.0.118-2 - Update to .NET SDK 7.0.118 and Runtime 7.0.18 - Resolves: RHEL-31199 diff --git a/runtime-re-enable-implicit-rejection.patch b/runtime-re-enable-implicit-rejection.patch index d4f0e0f..f97a695 100644 --- a/runtime-re-enable-implicit-rejection.patch +++ b/runtime-re-enable-implicit-rejection.patch @@ -47,33 +47,6 @@ index 55a044d62a6..e72d42e87d2 100644 using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) { void RoundtripEmpty(RSAEncryptionPadding paddingMode) -@@ -692,26 +701,6 @@ public void NotSupportedValueMethods() - } - } - -- [ConditionalTheory] -- [InlineData(new byte[] { 1, 2, 3, 4 })] -- [InlineData(new byte[0])] -- public void Decrypt_Pkcs1_ErrorsForInvalidPadding(byte[] data) -- { -- if (data.Length == 0 && !PlatformSupportsEmptyRSAEncryption) -- { -- throw new SkipTestException("Platform does not support RSA encryption of empty data."); -- } -- -- using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params)) -- { -- byte[] encrypted = Encrypt(rsa, data, RSAEncryptionPadding.Pkcs1); -- encrypted[1] ^= 0xFF; -- -- // PKCS#1, the data, and the key are all deterministic so this should always throw an exception. -- Assert.ThrowsAny(() => Decrypt(rsa, encrypted, RSAEncryptionPadding.Pkcs1)); -- } -- } -- - [Fact] - public void Decrypt_Pkcs1_BadPadding() - { @@ -726,23 +715,5 @@ public static IEnumerable OaepPaddingModes } } diff --git a/sources b/sources index 4c35846..215f49c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v7.0.118.tar.gz) = 8205def9d6d3c201cb92f30fbf9ac8e9851b491cd20559defe66984636e6e56113c730697b522a57bb1d57750171c8d3d10a714742a73f3767365f98d64a6f58 +SHA512 (dotnet-v7.0.119.tar.gz) = e8c4dc05fc61f02f4282b47ed5e059d6cd9059171e9a0ac7f383545821cf42424d0e7a4f881a5ea80857c91a64ca0922f850cd20742830eb90b8a08fc9877479 diff --git a/update-release b/update-release index 89d44fc..bc40977 100755 --- a/update-release +++ b/update-release @@ -139,3 +139,5 @@ sed -i -E 's|^Release: [[:digit:]]+%|Release: '"$rpm_release"'%|' # Reset Release in changelog comment # See https://stackoverflow.com/questions/18620153/find-matching-text-and-replace-next-line sed -i -E '/^%changelog$/!b;n;s/-[[:digit:]]+$/-'"$rpm_release"'/' "$spec_file" + +echo "Done updating sources. Commit message in ./git-commit-message"