From b741d443303614cd72b79b5345a78f0d53576755 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 9 Jul 2024 16:44:27 -0400 Subject: [PATCH] Update to .NET SDK 6.0.132 and Runtime 6.0.32 Resolves: RHEL-45319 --- .gitignore | 1 + dotnet6.0.spec | 10 +++++--- runtime-re-enable-implicit-rejection.patch | 27 ---------------------- sources | 2 +- update-release | 2 ++ 5 files changed, 11 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index dca992a..6eec8b2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ SOURCES/dotnet-v6.0.114.tar.gz /dotnet-v6.0.127.tar.gz /dotnet-v6.0.128.tar.gz /dotnet-v6.0.129.tar.gz +/dotnet-v6.0.132.tar.gz diff --git a/dotnet6.0.spec b/dotnet6.0.spec index d0810ba..3272591 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -21,10 +21,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.29 -%global runtime_version 6.0.29 +%global host_version 6.0.32 +%global runtime_version 6.0.32 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.129 +%global sdk_version 6.0.132 %global sdk_feature_band_version %(echo %{sdk_version} | 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 }') @@ -634,6 +634,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Tue Jul 09 2024 Omair Majid - 6.0.132-2 +- Update to .NET SDK 6.0.132 and Runtime 6.0.32 +- Resolves: RHEL-45319 + * Tue Apr 09 2024 Omair Majid - 6.0.129-2 - Update to .NET SDK 6.0.129 and Runtime 6.0.29 - Resolves: RHEL-31194 diff --git a/runtime-re-enable-implicit-rejection.patch b/runtime-re-enable-implicit-rejection.patch index 0455ad0..3e96a1e 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 f107ada..0daa62b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v6.0.129.tar.gz) = 34355a3311701e6d9d0b2b30ff9986342bcde469463bebb476ab938ffb7973e9afc33f837b188356cba8471c2461b82bce55a58a64706d777e11fefcc42ab8e2 +SHA512 (dotnet-v6.0.132.tar.gz) = 33313e6aa716db0700f99c60d52b966252fa51717c5f571c8a0a0119e7cba7e71d5904752666590df8bb76417c4f1c2d4eb4835c68d8d0d94d639d95746a0f51 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"