From 48812f7c1a2c843a3e8c35f84975e9691b6835f8 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 9 Apr 2024 19:08:02 +0000
Subject: [PATCH] import UBI dotnet8.0-8.0.104-1.el8_9

---
 .dotnet8.0.metadata                             |  2 +-
 .gitignore                                      |  2 +-
 SOURCES/dotnet-8.0.3.tar.gz.sig                 | 17 -----------------
 SOURCES/dotnet-8.0.4.tar.gz.sig                 | 17 +++++++++++++++++
 SOURCES/release.json                            | 11 ++++++-----
 .../runtime-re-enable-implicit-rejection.patch  |  4 ++--
 SPECS/dotnet8.0.spec                            | 12 ++++++++----
 7 files changed, 35 insertions(+), 30 deletions(-)
 delete mode 100644 SOURCES/dotnet-8.0.3.tar.gz.sig
 create mode 100644 SOURCES/dotnet-8.0.4.tar.gz.sig

diff --git a/.dotnet8.0.metadata b/.dotnet8.0.metadata
index 79c3ea7..309fa08 100644
--- a/.dotnet8.0.metadata
+++ b/.dotnet8.0.metadata
@@ -1 +1 @@
-495e25373e8f6076db3652fcea4edd3342bd3d17 SOURCES/dotnet-8.0.3.tar.gz
+7eaca2a4b3b574a0bff498411bf8ef256da66875 SOURCES/dotnet-8.0.4.tar.gz
diff --git a/.gitignore b/.gitignore
index 46652ec..e0b0703 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-8.0.3.tar.gz
+SOURCES/dotnet-8.0.4.tar.gz
diff --git a/SOURCES/dotnet-8.0.3.tar.gz.sig b/SOURCES/dotnet-8.0.3.tar.gz.sig
deleted file mode 100644
index 18cd23b..0000000
--- a/SOURCES/dotnet-8.0.3.tar.gz.sig
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BSN Pgp v1.0.0.0
-
-iQIcBAABCAAGBQJl3iU8AAoJEP2/U8JNtIcuJ4sP/Rkoq/dL4zxZfx6EQy3we262
-9D7fhMPlkxFoMWgqTTGcmxuNE9bfJEjgUBMjGCY39fSqcM9l3bkKa9Trls+2nF1K
-f637Z94FKfZsfjtaU+b9xPB3ekD9GRZSjhei1QSInjHlF4UYiJxF+Y91jgilw4Kj
-I+/3IH2AN9ZAgUuSS7xdsP6CSa5vCglo/d2ImRsw+cw9X8Fmnze6z3p/nGzkVfWV
-0argZNqCnD1v2LNmpYJlctWDfXaDVQcTClo+K6UnHAoDx9JiAV1JLlDvv6h78fRj
-Fr6vm/0bZDJo9MnjLdBVzJ+9WkEOUmuneOviW3nThiXprJNbE2CK2Fk38CL7hU1r
-pBQpMBKuSDALR6W5I0bty8OBJeWIu3vyxzvNGQC0F7MoxZeKdgrwY/nuP49seEYZ
-tOC0xzLbqQT/7VSmECLm/udx91rMLOZ827qC43IR1p8TQinijqsFlnyMkXuBwOjF
-MdyOaIXPTd39JMn32qqqTr84+dg1TfNKwQEco6IIzDsG+2YmSzhS8dDE9lLKYrwM
-qC5gcaEauCjzclnpHs+Mqx4ADsuftf7zI+gky9NK4Pz1/4pDC+ZqP8ucxSYCy2sA
-PFi+M4aRMBfKzCw4Wa8828G2wPjIaA+d6n5T0XoIrg4xI7ii223J18qr0vMoBMvE
-CrxUFI4N/Gb6+36NB047
-=WrWT
------END PGP SIGNATURE-----
diff --git a/SOURCES/dotnet-8.0.4.tar.gz.sig b/SOURCES/dotnet-8.0.4.tar.gz.sig
new file mode 100644
index 0000000..5b6f653
--- /dev/null
+++ b/SOURCES/dotnet-8.0.4.tar.gz.sig
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BSN Pgp v1.0.0.0
+
+iQIcBAABCAAGBQJmBFuCAAoJEP2/U8JNtIcu+McP/RkPiiLwEr0k4xGd6mIsgvco
+hHL6I3f/1f4/dSYkyr1edqeCynrwU6hYfMyLm71XrwkYHxQCbDvXpo4FekW/kfTR
+LrAhJuhDRMzGfjZU81h4PCHAcktJWPuY2IC5EPw9R4h/UToobYBPqsxayyXpu1hK
+iCm+g+iKxXKPO2ujG4Kj9NSiWg8NMZeDVgAvh4q5Xi+GMiiwQ67VwO/WzZss0HNt
+pAMePhuKp5V5zJXMIf0FwIa3TJZuC4xnCSz2EfKz8Y1tS+ez0p8gAiWzwmR7W705
+p7UouNEEzBiVoTq17DrCOx7+51hyP2gygDy0DbD/2kMJVICCPnECIyU8V42a0KPJ
+w2cPxh/2w1KgUp3gvdVaKAJunHsqvXlNU+8/PvWeVN3yzd40VCiqmuS2HVqpkAZ8
+Lq5hPdxAJmHDdnL4ptLmI3R2PMba/5GYWP0Cr/kQut96drfaDFhHZD8M2wFjsRG2
+Pwkfds+8xcdkYYJpfECz15BZAo7lCF2TjjMkREREfmdBn46UgS9MmAQJWm1D5PBV
+IhXSfX4p6KuxmiMBjovuagoebSiePEh5EnvYLv3Czx073WcZI7Hk4BnqdSc0DjqF
+A2TVS8noAaVlHVIqncLyDS61oVCBoMNyxSPDqcDQNI+6NNeZpbwdj9RJ9d83AepZ
+5VajM4GlJzjwooXCsSNc
+=dp1h
+-----END PGP SIGNATURE-----
diff --git a/SOURCES/release.json b/SOURCES/release.json
index 16ac31c..9a63353 100644
--- a/SOURCES/release.json
+++ b/SOURCES/release.json
@@ -1,9 +1,10 @@
 {
-  "release": "8.0.3",
+  "release": "8.0.4",
   "channel": "8.0",
-  "tag": "v8.0.3",
-  "sdkVersion": "8.0.103",
-  "runtimeVersion": "8.0.3",
+  "tag": "v8.0.4",
+  "sdkVersion": "8.0.104",
+  "runtimeVersion": "8.0.4",
+  "aspNetCoreVersion": "8.0.4",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "49a39629323839c28481dd42545ce44d11c75c5a"
+  "sourceVersion": "83659133a1aa2b2d94f9c4ecebfa10d960e27706"
 }
diff --git a/SOURCES/runtime-re-enable-implicit-rejection.patch b/SOURCES/runtime-re-enable-implicit-rejection.patch
index 5276e79..841850f 100644
--- a/SOURCES/runtime-re-enable-implicit-rejection.patch
+++ b/SOURCES/runtime-re-enable-implicit-rejection.patch
@@ -71,9 +71,9 @@ index 39f3ebc82ec..5b97f468a42 100644
 -            }
 -        }
 -
-         public static IEnumerable<object[]> OaepPaddingModes
+         [Fact]
+         public void Decrypt_Pkcs1_BadPadding()
          {
-             get
 @@ -757,23 +746,5 @@ public static IEnumerable<object[]> OaepPaddingModes
                  }
              }
diff --git a/SPECS/dotnet8.0.spec b/SPECS/dotnet8.0.spec
index d2fc0cb..fed2491 100644
--- a/SPECS/dotnet8.0.spec
+++ b/SPECS/dotnet8.0.spec
@@ -8,10 +8,10 @@
 
 %global dotnetver 8.0
 
-%global host_version 8.0.3
-%global runtime_version 8.0.3
+%global host_version 8.0.4
+%global runtime_version 8.0.4
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 8.0.103
+%global sdk_version 8.0.104
 %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 }')
@@ -417,7 +417,7 @@ if [[ ${release_json_tag} != %{upstream_tag} ]]; then
 fi
 
 %if %{without bootstrap_dotnet}
-%setup -q -c -n dotnet-%{upstream_tag_without_v}
+%setup -q -n dotnet-%{upstream_tag_without_v}
 
 # Remove all prebuilts
 find -iname '*.dll' -type f -delete
@@ -716,6 +716,10 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Tue Apr 02 2024 Omair Majid <omajid@redhat.com> - 8.0.104-1
+- Update to .NET SDK 8.0.104 and Runtime 8.0.4
+- Resolves: RHEL-31206
+
 * Thu Feb 29 2024 Omair Majid <omajid@redhat.com> - 8.0.103-1
 - Update to .NET SDK 8.0.103 and Runtime 8.0.3
 - Resolves: RHEL-27550