5 changed files with 49 additions and 241 deletions
--- a/.dotnet6.0.metadata
+++ b/.dotnet6.0.metadata
@ -1 +1 @@
-86b34322ef8a1f0d675acabab08fadaac3e399d8 SOURCES/dotnet-v6.0.136.tar.gz
+77c4d3e89fed5ca6cb2d5b7755477fe2e669d64a SOURCES/dotnet-v6.0.121.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/dotnet-v6.0.136.tar.gz
+SOURCES/dotnet-v6.0.121.tar.gz
--- a/SOURCES/arcade-no-apphost.patch
+++ b/SOURCES/arcade-no-apphost.patch
@ -1,3 +1,15 @@
+Index: a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj
+===================================================================
+--- a/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj
+++ b/src/Microsoft.DotNet.GitSync.CommitManager/Microsoft.DotNet.GitSync.CommitManager.csproj
+@@ -5,6 +5,7 @@
+     <TargetFramework>netcoreapp3.1</TargetFramework>
+     <LangVersion>latest</LangVersion>
+     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+    <UseAppHost>false</UseAppHost>
+   </PropertyGroup>
+ 
+   <ItemGroup>
 Index: a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj
 ===================================================================
 --- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj
--- a/SOURCES/runtime-re-enable-implicit-rejection.patch
+++ b/SOURCES/runtime-re-enable-implicit-rejection.patch
@ -1,142 +0,0 @@
-From 076687f5f9e7e1fce24f33f498b4e03c4150108e Mon Sep 17 00:00:00 2001
-From: Omair Majid <omajid@redhat.com>
-Date: Fri, 2 Feb 2024 12:09:52 -0500
-Subject: [PATCH] Revert "Disable implicit rejection for RSA PKCS#1 (#95218)"
-
-This reverts commit e3500b8e8ad18e8bf067dc5250863b64bb8f0de0.
-
-To quote Clemens Lang:
-
-> [Disabling implcit rejection] re-enables a Bleichenbacher timing oracle
-> attack against PKCS#1v1.5 decryption. See
-> https://people.redhat.com/~hkario/marvin/ for details and
-> https://github.com/dotnet/runtime/pull/95157#issuecomment-1842784399 for a
-> comment by the researcher who published the vulnerability and proposed the
-> change in OpenSSL.
-
-For more details, see:
-https://github.com/dotnet/runtime/pull/95216#issuecomment-1842799314
---
- .../RSA/EncryptDecrypt.cs                     | 49 ++++---------------
- .../opensslshim.h                             |  6 ---
- .../pal_evp_pkey_rsa.c                        | 13 -----
- 3 files changed, 10 insertions(+), 58 deletions(-)
-
-diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
-index 55a044d62a6..e72d42e87d2 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
-+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
-@@ -338,10 +338,19 @@ private void RsaCryptRoundtrip(RSAEncryptionPadding paddingMode, bool expectSucc
-             Assert.Equal(TestData.HelloBytes, output);
-         }
- 
-        [ConditionalFact(nameof(PlatformSupportsEmptyRSAEncryption))]
-+        [ConditionalFact]
-         [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
-         public void RoundtripEmptyArray()
-         {
-+            if (OperatingSystem.IsIOS() && !OperatingSystem.IsIOSVersionAtLeast(13, 6))
-+            {
-+                throw new SkipTestException("iOS prior to 13.6 does not reliably support RSA encryption of empty data.");
-+            }
-+            if (OperatingSystem.IsTvOS() && !OperatingSystem.IsTvOSVersionAtLeast(14, 0))
-+            {
-+                throw new SkipTestException("tvOS prior to 14.0 does not reliably support RSA encryption of empty data.");
-+            }
-+
-             using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params))
-             {
-                 void RoundtripEmpty(RSAEncryptionPadding paddingMode)
-@@ -726,23 +715,5 @@ public static IEnumerable<object[]> OaepPaddingModes
-                 }
-             }
-         }
-
-        public static bool PlatformSupportsEmptyRSAEncryption
-        {
-            get
-            {
-                if (OperatingSystem.IsIOS() && !OperatingSystem.IsIOSVersionAtLeast(13, 6))
-                {
-                    return false;
-                }
-
-                if (OperatingSystem.IsTvOS() && !OperatingSystem.IsTvOSVersionAtLeast(14, 0))
-                {
-                    return false;
-                }
-
-                return true;
-            }
-        }
-     }
- }
-diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
-index 050df1193ff..dad18ebd9a1 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
-+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
-@@ -272,10 +272,8 @@ const EVP_CIPHER* EVP_chacha20_poly1305(void);
-     REQUIRED_FUNCTION(ERR_peek_error) \
-     REQUIRED_FUNCTION(ERR_peek_error_line) \
-     REQUIRED_FUNCTION(ERR_peek_last_error) \
-    REQUIRED_FUNCTION(ERR_pop_to_mark) \
-     FALLBACK_FUNCTION(ERR_put_error) \
-     REQUIRED_FUNCTION(ERR_reason_error_string) \
-    REQUIRED_FUNCTION(ERR_set_mark) \
-     LIGHTUP_FUNCTION(ERR_set_debug) \
-     LIGHTUP_FUNCTION(ERR_set_error) \
-     REQUIRED_FUNCTION(EVP_aes_128_cbc) \
-@@ -330,7 +328,6 @@ const EVP_CIPHER* EVP_chacha20_poly1305(void);
-     REQUIRED_FUNCTION(EVP_PKCS82PKEY) \
-     REQUIRED_FUNCTION(EVP_PKEY2PKCS8) \
-     REQUIRED_FUNCTION(EVP_PKEY_CTX_ctrl) \
-    REQUIRED_FUNCTION(EVP_PKEY_CTX_ctrl_str) \
-     REQUIRED_FUNCTION(EVP_PKEY_CTX_free) \
-     REQUIRED_FUNCTION(EVP_PKEY_CTX_get0_pkey) \
-     REQUIRED_FUNCTION(EVP_PKEY_CTX_new) \
-@@ -728,10 +725,8 @@ FOR_ALL_OPENSSL_FUNCTIONS
- #define ERR_peek_error_line ERR_peek_error_line_ptr
- #define ERR_peek_last_error ERR_peek_last_error_ptr
- #define ERR_put_error ERR_put_error_ptr
-#define ERR_pop_to_mark ERR_pop_to_mark_ptr
- #define ERR_reason_error_string ERR_reason_error_string_ptr
- #define ERR_set_debug ERR_set_debug_ptr
-#define ERR_set_mark ERR_set_mark_ptr
- #define ERR_set_error ERR_set_error_ptr
- #define EVP_aes_128_cbc EVP_aes_128_cbc_ptr
- #define EVP_aes_128_cfb8 EVP_aes_128_cfb8_ptr
-@@ -785,7 +780,6 @@ FOR_ALL_OPENSSL_FUNCTIONS
- #define EVP_PKCS82PKEY EVP_PKCS82PKEY_ptr
- #define EVP_PKEY2PKCS8 EVP_PKEY2PKCS8_ptr
- #define EVP_PKEY_CTX_ctrl EVP_PKEY_CTX_ctrl_ptr
-#define EVP_PKEY_CTX_ctrl_str EVP_PKEY_CTX_ctrl_str_ptr
- #define EVP_PKEY_CTX_free EVP_PKEY_CTX_free_ptr
- #define EVP_PKEY_CTX_get0_pkey EVP_PKEY_CTX_get0_pkey_ptr
- #define EVP_PKEY_CTX_new EVP_PKEY_CTX_new_ptr
-diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c b/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
-index c3e491a868f..36924abb505 100644
--- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
-+++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
-@@ -63,19 +63,6 @@ static bool ConfigureEncryption(EVP_PKEY_CTX* ctx, RsaPaddingMode padding, const
-         {
-             return false;
-         }
-
-        // OpenSSL 3.2 introduced a change where PKCS#1 RSA decryption does not fail for invalid padding.
-        // If the padding is invalid, the decryption operation returns random data.
-        // See https://github.com/openssl/openssl/pull/13817 for background.
-        // Some Linux distributions backported this change to previous versions of OpenSSL.
-        // Here we do a best-effort to set a flag to revert the behavior to failing if the padding is invalid.
-        ERR_set_mark();
-
-        EVP_PKEY_CTX_ctrl_str(ctx, "rsa_pkcs1_implicit_rejection", "0");
-
-        // Undo any changes to the error queue that may have occured while configuring implicit rejection if the
-        // current version does not support implicit rejection.
-        ERR_pop_to_mark();
-     }
-     else
-     {
-- 
-2.43.0
-
--- a/SPECS/dotnet6.0.spec
+++ b/SPECS/dotnet6.0.spec
@ -1,5 +1,4 @@
-# CentOS Koji doesn't understand %%bootstrap
-%bcond_with bootstrap_dotnet
+%bcond_with bootstrap

 # Avoid provides/requires from private libraries
 %global privlibs             libhostfxr
@ -21,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.36
-%global runtime_version 6.0.36
+%global host_version 6.0.21
+%global runtime_version 6.0.21
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.136
+%global sdk_version 6.0.121
 %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 }')
@ -66,15 +65,14 @@ 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/

-%if %{with bootstrap_dotnet}
-%global bootstrap_sdk_version 6.0.120
+%if %{with bootstrap}
 # The source is generated on a RHEL box via:
 # ./build-dotnet-tarball --bootstrap %%{upstream_tag}
 Source0:        dotnet-%{upstream_tag}-x64-bootstrap.tar.xz
 # Generated via ./build-arm64-bootstrap-tarball
-Source1:        dotnet-prebuilts-%{bootstrap_sdk_version}-arm64.tar.gz
+Source1:        dotnet-arm64-prebuilts-2021-10-29.tar.gz
 # Generated manually, same pattern as the arm64 tarball
-Source2:        dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz
+Source2:        dotnet-s390x-prebuilts-2021-10-29.tar.gz
 %else
 # The source is generated on a RHEL box via:
 # ./build-dotnet-tarball %%{upstream_tag}
@ -89,8 +87,6 @@ Source11:       dotnet.sh.in
 Patch100:       runtime-arm64-lld-fix.patch
 #  Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315
 Patch101:       runtime-mono-remove-ilstrip.patch
-# https://github.com/dotnet/runtime/pull/95217#issuecomment-1842799362
-Patch102:       runtime-re-enable-implicit-rejection.patch

 # Disable apphost, needed for s390x
 Patch500:       fsharp-no-apphost.patch
@ -126,7 +122,7 @@ ExclusiveArch:  x86_64
 BuildRequires:  clang
 BuildRequires:  cmake
 BuildRequires:  coreutils
-%if %{without bootstrap_dotnet}
+%if %{without bootstrap}
 BuildRequires:  dotnet-sdk-6.0
 BuildRequires:  dotnet-sdk-6.0-source-built-artifacts
 %endif
@ -352,7 +348,7 @@ These are not meant for general use.


 %prep
-%if %{without bootstrap_dotnet}
+%if %{without bootstrap}
 %setup -q -n dotnet-%{upstream_tag}
 %else

@ -372,28 +368,11 @@ tar xf packages/prebuilt/dotnet-sdk*.tar.gz -C .dotnet/
 rm packages/prebuilt/dotnet-sdk*.tar.gz
 boot_sdk_version=$(ls -1 .dotnet/sdk/)
 sed -i -E 's|"dotnet": "[^"]+"|"dotnet" : "'$boot_sdk_version'"|' global.json
-
-%ifarch ppc64le s390x
-ilasm_version=$(ls packages/prebuilt| grep -i ilasm | tr 'A-Z' 'a-z' | sed -E 's|runtime.linux-'%{runtime_arch}'.microsoft.netcore.ilasm.||' | sed -E 's|.nupkg$||')
-echo $ilasm_version
-
-mkdir -p packages-customized-local
-pushd packages-customized-local
-tar xf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz
-sed -i -E 's|<MicrosoftNETCoreILAsmVersion>[^<]+</MicrosoftNETCoreILAsmVersion>|<MicrosoftNETCoreILAsmVersion>'$ilasm_version'</MicrosoftNETCoreILAsmVersion>|' PackageVersions.props
-sed -i -E 's|<MicrosoftNETCoreILAsmPackageVersion>[^<]+</MicrosoftNETCoreILAsmPackageVersion>|<MicrosoftNETCoreILAsmPackageVersion>'$ilasm_version'</MicrosoftNETCoreILAsmPackageVersion>|' PackageVersions.props
-sed -i -E 's|<MicrosoftNETCoreILDAsmVersion>[^<]+</MicrosoftNETCoreILDAsmVersion>|<MicrosoftNETCoreILDAsmVersion>'$ilasm_version'</MicrosoftNETCoreILDAsmVersion>|' PackageVersions.props
-sed -i -E 's|<MicrosoftNETCoreILDAsmPackageVersion>[^<]+</MicrosoftNETCoreILDAsmPackageVersion>|<MicrosoftNETCoreILDAsmPackageVersion>'$ilasm_version'</MicrosoftNETCoreILDAsmPackageVersion>|' PackageVersions.props
-tar czf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz *
-popd
-
 %endif

 %endif

-%endif
-
-%if %{without bootstrap_dotnet}
+%if %{without bootstrap}
 # Remove all prebuilts
 find -iname '*.dll' -type f -delete
 find -iname '*.so' -type f -delete
@ -414,7 +393,6 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/
 pushd src/runtime
 %patch100 -p1
 %patch101 -p1
-%patch102 -p1
 popd

 pushd src/fsharp
@ -460,7 +438,7 @@ sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_L
 %build
 cat /etc/os-release

-%if %{without bootstrap_dotnet}
+%if %{without bootstrap}
 # We need to create a copy because we will mutate this
 cp -a %{_libdir}/dotnet previously-built-dotnet
 %endif
@ -502,7 +480,7 @@ export EXTRA_CXXFLAGS="$CXXFLAGS"
 export EXTRA_LDFLAGS="$LDFLAGS"

 VERBOSE=1 ./build.sh \
-%if %{without bootstrap_dotnet}
+%if %{without bootstrap}
    --with-sdk previously-built-dotnet \
 %endif
    -- \
@ -634,73 +612,33 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0


 %changelog
-* Thu Oct 31 2024 Omair Majid <omajid@redhat.com> - 6.0.136-1
- Update to .NET SDK 6.0.136 and Runtime 6.0.36
- Resolves: RHEL-65364
-
-* Tue Oct 15 2024 Omair Majid <omajid@redhat.com> - 6.0.135-2
- Update to .NET SDK 6.0.135 and Runtime 6.0.35
- Resolves: RHEL-60792
-
-* Wed Aug 14 2024 Omair Majid <omajid@redhat.com> - 6.0.133-2
- Update to .NET SDK 6.0.133 and Runtime 6.0.33
- Resolves: RHEL-52384
-
-* Tue Jul 09 2024 Omair Majid <omajid@redhat.com> - 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 <omajid@redhat.com> - 6.0.129-2
- Update to .NET SDK 6.0.129 and Runtime 6.0.29
- Resolves: RHEL-31194
-
-* Tue Mar 19 2024 Omair Majid <omajid@redhat.com> - 6.0.128-2
- Update to .NET SDK 6.0.128 and Runtime 6.0.28
- Resolves: RHEL-27539
-
-* Wed Feb 14 2024 Omair Majid <omajid@redhat.com> - 6.0.127-2
- Update to .NET SDK 6.0.127 and Runtime 6.0.27
- Resolves: RHEL-23784
-
-* Mon Jan 15 2024 Omair Majid <omajid@redhat.com> - 6.0.126-2
- Update to .NET SDK 6.0.126 and Runtime 6.0.26
- Resolves: RHEL-19798
-
-* Mon Dec 11 2023 Omair Majid <omajid@redhat.com> - 6.0.125-2
- Update to .NET SDK 6.0.125 and Runtime 6.0.25
- Resolves: RHEL-15348
-
-* Tue Oct 24 2023 Omair Majid <omajid@redhat.com> - 6.0.124-2
- Update to .NET SDK 6.0.124 and Runtime 6.0.24
- Resolves: RHEL-14466
-
-* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 6.0.123-2
- Update to .NET SDK 6.0.123 and Runtime 6.0.23
- Resolves: RHEL-11696
-
-* Tue Sep 12 2023 Omair Majid <omajid@redhat.com> - 6.0.122-2
- Update to .NET SDK 6.0.122 and Runtime 6.0.22
- Resolves: RHEL-1996
-
-* Thu Aug 24 2023 Omair Majid <omajid@redhat.com> - 6.0.121-4
- Disable bootstrap
- Related: RHBZ#2228566
-
-* Wed Aug 23 2023 Omair Majid <omajid@redhat.com> - 6.0.121-3
- Rebootstrap
- Related: RHBZ#2228566
-
-* Wed Aug 09 2023 Omair Majid <omajid@redhat.com> - 6.0.121-2
+* Wed Aug 02 2023 Omair Majid <omajid@redhat.com> - 6.0.121-1
 - Update to .NET SDK 6.0.121 and Runtime 6.0.21
- Resolves: RHBZ#2228566
+- Resolves: RHBZ#2228568

-* Tue Jul 11 2023 Omair Majid <omajid@redhat.com> - 6.0.120-2
+* Tue Jul 04 2023 Omair Majid <omajid@redhat.com> - 6.0.120-1
 - Update to .NET SDK 6.0.120 and Runtime 6.0.20
- Resolves: RHBZ#2219636
+- Resolves: RHBZ#2219639

-* Thu Jul 06 2023 Omair Majid <omajid@redhat.com> - 6.0.119-2
+* Tue Jun 20 2023 Omair Majid <omajid@redhat.com> - 6.0.119-1
 - Update to .NET SDK 6.0.119 and Runtime 6.0.19
- Resolves: RHBZ#2216218
+- Resolves: RHBZ#2216221
+
+* Thu Jun 01 2023 Andrew Slice <andrew.slice@redhat.com> - 6.0.118-1
+- Update to .NET SDK 6.0.118 and Runtime 6.0.18
+- Resolves: RHBZ#2212378
+
+* Thu May 04 2023 Omair Majid <omajid@redhat.com> - 6.0.117-2
+- Update to .NET SDK 6.0.117 and Runtime 6.0.17
+- Resolves: RHBZ#2190262
+
+* Wed Apr 12 2023 Omair Majid <omajid@redhat.com> - 6.0.116-2
+- Update to .NET SDK 6.0.116 and Runtime 6.0.16
+- Resolves: RHBZ#2183580
+
+* Wed Mar 15 2023 Omair Majid <omajid@redhat.com> - 6.0.115-2
+- Update to .NET SDK 6.0.115 and Runtime 6.0.15
+- Resolves: RHBZ#2174980

 * Thu Feb 16 2023 Omair Majid <omajid@redhat.com> - 6.0.114-2
 - Update to .NET SDK 6.0.114 and Runtime 6.0.14