From 8e801c4a626117cf33c9e4a54cd30df40e5a47c6 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Wed, 15 May 2024 19:55:57 -0400
Subject: [PATCH] Update to .NET SDK 6.0.130 and Runtime 6.0.30

Resolves: RHEL-35308
---
 .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 ecb14af..95f2bf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /dotnet-v6.0.127.tar.gz
 /dotnet-v6.0.128.tar.gz
 /dotnet-v6.0.129.tar.gz
+/dotnet-v6.0.130.tar.gz
diff --git a/dotnet6.0.spec b/dotnet6.0.spec
index 0cd89bc..946c966 100644
--- a/dotnet6.0.spec
+++ b/dotnet6.0.spec
@@ -20,10 +20,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.30
+%global runtime_version 6.0.30
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.129
+%global sdk_version 6.0.130
 %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 }')
@@ -612,6 +612,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
 
 
 %changelog
+* Wed May 15 2024 Omair Majid <omajid@redhat.com> - 6.0.130-2
+- Update to .NET SDK 6.0.130 and Runtime 6.0.30
+- Resolves: RHEL-35308
+
 * Tue Apr 09 2024 Omair Majid <omajid@redhat.com> - 6.0.129-2
 - Update to .NET SDK 6.0.129 and Runtime 6.0.29
 - Resolves: RHEL-31198
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<CryptographicException>(() => Decrypt(rsa, encrypted, RSAEncryptionPadding.Pkcs1));
--            }
--        }
--
-         [Fact]
-         public void Decrypt_Pkcs1_BadPadding()
-         {
 @@ -726,23 +715,5 @@ public static IEnumerable<object[]> OaepPaddingModes
                  }
              }
diff --git a/sources b/sources
index 4e2ba93..45d23ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dotnet-v6.0.129.tar.gz) = 2c1318595a4e3e3df8d8208e98d51ebae27637be798afb4b6255eaa785a438ac4cfab7c56783cbc379f4f3511d0b619ce1d786b98cbd8be01c3da61347f1c4f6
+SHA512 (dotnet-v6.0.130.tar.gz) = d637cf546aaa2d53f48196acc99d6eb77504a481d88c8703563afa52b27f78888b7d0d0d1b247c60eda0d38746a728a2d1f45d652f07d5eb636c2f47a1e73fb0
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"