Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
|
@ -1 +1 @@
|
|||
00ac4f4508eb3b8a85cb3622bfc0843293f32827 SOURCES/dotnet-v6.0.129.tar.gz
|
||||
81198a6aab86269f1a3b418f8e7e112b3dceda3f SOURCES/dotnet-v6.0.114.tar.gz
|
||||
|
|
|
@ -1 +1 @@
|
|||
SOURCES/dotnet-v6.0.129.tar.gz
|
||||
SOURCES/dotnet-v6.0.114.tar.gz
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -65,7 +65,7 @@ def scan_file(file):
|
|||
|
||||
def is_elf(file):
|
||||
result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True)
|
||||
return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout)
|
||||
return re.search('ELF 64-bit LSB (?:pie )(?:executable|shared object)', result.stdout)
|
||||
|
||||
def scan_file_if_sensible(file):
|
||||
if is_elf(file):
|
||||
|
|
|
@ -1,169 +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)
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
-
|
||||
- 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
|
||||
|
|
@ -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.29
|
||||
%global runtime_version 6.0.29
|
||||
%global host_version 6.0.14
|
||||
%global runtime_version 6.0.14
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 6.0.129
|
||||
%global sdk_version 6.0.114
|
||||
%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,22 +65,20 @@ 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}
|
||||
Source0: dotnet-%{upstream_tag}.tar.gz
|
||||
%endif
|
||||
|
||||
|
||||
Source10: check-debug-symbols.py
|
||||
Source11: dotnet.sh.in
|
||||
|
||||
|
@ -89,8 +86,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
|
||||
|
@ -117,16 +112,18 @@ Patch1001: msbuild-no-systemconfiguration.patch
|
|||
Patch1500: sdk-telemetry-optout.patch
|
||||
|
||||
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
ExclusiveArch: aarch64 x86_64 s390x
|
||||
%else
|
||||
ExclusiveArch: x86_64
|
||||
%endif
|
||||
|
||||
|
||||
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
|
||||
|
@ -165,25 +162,6 @@ framework libraries, an SDK containing compilers and a 'dotnet'
|
|||
application to drive everything.
|
||||
|
||||
|
||||
%package -n dotnet
|
||||
|
||||
Version: %{sdk_rpm_version}
|
||||
Summary: .NET CLI tools and runtime
|
||||
|
||||
Requires: dotnet-sdk-6.0%{?_isa} >= %{sdk_rpm_version}-%{release}
|
||||
|
||||
%description -n dotnet
|
||||
.NET is a fast, lightweight and modular platform for creating
|
||||
cross platform applications that work on Linux, macOS and Windows.
|
||||
|
||||
It particularly focuses on creating console applications, web
|
||||
applications and micro-services.
|
||||
|
||||
.NET contains a runtime conforming to .NET Standards a set of
|
||||
framework libraries, an SDK containing compilers and a 'dotnet'
|
||||
application to drive everything.
|
||||
|
||||
|
||||
%package -n dotnet-host
|
||||
|
||||
Version: %{host_rpm_version}
|
||||
|
@ -233,7 +211,7 @@ Requires: libicu%{?_isa}
|
|||
# See src/runtime/src/libraries/Native/AnyOS/brotli-version.txt
|
||||
Provides: bundled(libbrotli) = 1.0.9
|
||||
%if %{use_bundled_libunwind}
|
||||
# See runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt
|
||||
# See src/runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt
|
||||
Provides: bundled(libunwind) = 1.5.rc1.28.g9165d2a1
|
||||
%endif
|
||||
|
||||
|
@ -352,7 +330,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 +350,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 +375,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
|
||||
|
@ -452,7 +412,6 @@ popd
|
|||
pushd src/installer
|
||||
popd
|
||||
|
||||
|
||||
%if ! %{use_bundled_libunwind}
|
||||
sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props
|
||||
%endif
|
||||
|
@ -460,7 +419,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
|
||||
|
@ -501,8 +460,20 @@ export EXTRA_CFLAGS="$CFLAGS"
|
|||
export EXTRA_CXXFLAGS="$CXXFLAGS"
|
||||
export EXTRA_LDFLAGS="$LDFLAGS"
|
||||
|
||||
VERBOSE=1 ./build.sh \
|
||||
%if %{without bootstrap_dotnet}
|
||||
# Disable tracing, which is incompatible with certain versions of
|
||||
# lttng See https://github.com/dotnet/runtime/issues/57784. The
|
||||
# suggested compile-time change doesn't work, unfrotunately.
|
||||
export COMPlus_LTTng=0
|
||||
|
||||
%if 0%{?rhel} > 8
|
||||
# OpenSSL 3.0 in RHEL 9 has disabled SHA1, used by .NET for strong
|
||||
# name signing. See https://github.com/dotnet/runtime/issues/67304
|
||||
# https://gitlab.com/redhat/centos-stream/rpms/openssl/-/commit/78fb78d30755ae18fdaef28ef392f4e67c662ff6
|
||||
export OPENSSL_ENABLE_SHA1_SIGNATURES=1
|
||||
%endif
|
||||
|
||||
CheckEolTargetFramework=false VERBOSE=1 ./build.sh \
|
||||
%if %{without bootstrap}
|
||||
--with-sdk previously-built-dotnet \
|
||||
%endif
|
||||
-- \
|
||||
|
@ -524,12 +495,13 @@ ls artifacts/%{runtime_arch}/Release
|
|||
tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/
|
||||
|
||||
# See https://github.com/dotnet/source-build/issues/2579
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -iname testhost.x86 -delete
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -iname vstest.console -delete
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'testhost.x86' -delete
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'vstest.console' -delete
|
||||
|
||||
# Install managed symbols
|
||||
# Disabled until https://github.com/dotnet/source-build/issues/2623 is sorted out
|
||||
# tar xf artifacts/%%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-*%%{runtime_version}*.tar.gz \
|
||||
# Install managed symbols: disabled because they don't contain sources
|
||||
# but point to the paths the sources would have been at in the build
|
||||
# servers. The end user experience is pretty bad atm.
|
||||
# tar xf artifacts/%%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%%{runtime_id}-%%{runtime_version}.tar.gz \
|
||||
# -C %%{buildroot}/%%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%%{runtime_version}/
|
||||
|
||||
# Fix executable permissions on files
|
||||
|
@ -588,8 +560,12 @@ test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/
|
|||
echo "Testing build results for debug symbols..."
|
||||
%{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/
|
||||
|
||||
|
||||
# Self-check
|
||||
%if 0%{?fedora} > 35
|
||||
# lttng in Fedora > 35 is incompatible with .NET
|
||||
export COMPlus_LTTng=0
|
||||
%endif
|
||||
|
||||
%{buildroot}%{_libdir}/dotnet/dotnet --info
|
||||
%{buildroot}%{_libdir}/dotnet/dotnet --version
|
||||
|
||||
|
@ -601,7 +577,6 @@ rm %{buildroot}%{_libdir}/dotnet/dotnet
|
|||
# Provided by netstandard-targeting-pack-2.1 from another SRPM
|
||||
rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
|
||||
|
||||
|
||||
%files -n dotnet-hostfxr-6.0
|
||||
%dir %{_libdir}/dotnet/host/fxr
|
||||
%{_libdir}/dotnet/host/fxr/%{host_version}
|
||||
|
@ -634,125 +609,77 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Apr 02 2024 Omair Majid <omajid@redhat.com> - 6.0.129-1
|
||||
- Update to .NET SDK 6.0.129 and Runtime 6.0.29
|
||||
- Resolves: RHEL-31196
|
||||
|
||||
* Thu Feb 29 2024 Omair Majid <omajid@redhat.com> - 6.0.128-1
|
||||
- Update to .NET SDK 6.0.128 and Runtime 6.0.28
|
||||
- Resolves: RHEL-27538
|
||||
|
||||
* Thu Feb 01 2024 Omair Majid <omajid@redhat.com> - 6.0.127-1
|
||||
- Update to .NET SDK 6.0.127 and Runtime 6.0.27
|
||||
- Resolves: RHEL-23786
|
||||
|
||||
* Wed Dec 20 2023 Omair Majid <omajid@redhat.com> - 6.0.126-1
|
||||
- Update to .NET SDK 6.0.126 and Runtime 6.0.26
|
||||
- Resolves: RHEL-19804
|
||||
|
||||
* Thu Nov 02 2023 Omair Majid <omajid@redhat.com> - 6.0.125-1
|
||||
- Update to .NET SDK 6.0.125 and Runtime 6.0.25
|
||||
- Resolves: RHEL-15360
|
||||
|
||||
* 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
|
||||
- Update to .NET SDK 6.0.121 and Runtime 6.0.21
|
||||
- Resolves: RHBZ#2228566
|
||||
|
||||
* Tue Jul 11 2023 Omair Majid <omajid@redhat.com> - 6.0.120-2
|
||||
- Update to .NET SDK 6.0.120 and Runtime 6.0.20
|
||||
- Resolves: RHBZ#2219636
|
||||
|
||||
* Thu Jul 06 2023 Omair Majid <omajid@redhat.com> - 6.0.119-2
|
||||
- Update to .NET SDK 6.0.119 and Runtime 6.0.19
|
||||
- Resolves: RHBZ#2216218
|
||||
|
||||
* Thu Feb 16 2023 Omair Majid <omajid@redhat.com> - 6.0.114-2
|
||||
* Thu Feb 02 2023 Omair Majid <omajid@redhat.com> - 6.0.114-1
|
||||
- Update to .NET SDK 6.0.114 and Runtime 6.0.14
|
||||
- Resolves: RHBZ#2166765
|
||||
- Resolves: RHBZ#2166770
|
||||
|
||||
* Wed Jan 11 2023 Omair Majid <omajid@redhat.com> - 6.0.113-2
|
||||
* Mon Dec 19 2022 Omair Majid <omajid@redhat.com> - 6.0.113-1
|
||||
- Update to .NET SDK 6.0.113 and Runtime 6.0.13
|
||||
- Resolves: RHBZ#2154456
|
||||
- Resolves: RHBZ#2154459
|
||||
|
||||
* Wed Dec 14 2022 Omair Majid <omajid@redhat.com> - 6.0.112-2
|
||||
* Fri Dec 02 2022 Omair Majid <omajid@redhat.com> - 6.0.112-1
|
||||
- Update to .NET SDK 6.0.112 and Runtime 6.0.12
|
||||
- Resolves: RHBZ#2150145
|
||||
- Resolves: RHBZ#2150148
|
||||
|
||||
* Fri Nov 18 2022 Omair Majid <omajid@redhat.com> - 6.0.111-3
|
||||
- Disable subpackages provided by another SRPM
|
||||
- Related: RHBZ#2138275
|
||||
|
||||
* Wed Nov 16 2022 Omair Majid <omajid@redhat.com> - 6.0.111-2
|
||||
* Wed Nov 09 2022 Omair Majid <omajid@redhat.com> - 6.0.111-1
|
||||
- Update to .NET SDK 6.0.111 and Runtime 6.0.11
|
||||
- Resolves: RHBZ#2138275
|
||||
- Resolves: RHBZ#2138278
|
||||
|
||||
* Tue Nov 08 2022 Omair Majid <omajid@redhat.com> - 6.0.110-2
|
||||
- Fix build with newer versions of clang
|
||||
- Related: RHBZ#2131326
|
||||
|
||||
* Fri Oct 28 2022 Omair Majid <omajid@redhat.com> - 6.0.110-1
|
||||
- Update to .NET SDK 6.0.110 and Runtime 6.0.10
|
||||
- Resolves: RHBZ#2131326
|
||||
|
||||
* Tue Sep 20 2022 Omair Majid <omajid@redhat.com> - 6.0.109-3
|
||||
- Disable packages now produced by another SRPM
|
||||
- Related: RHBZ#2123788
|
||||
|
||||
* Wed Sep 14 2022 Omair Majid <omajid@redhat.com> - 6.0.109-2
|
||||
- Update to .NET SDK 6.0.109 and Runtime 6.0.9
|
||||
- Resolves: RHBZ#2123788
|
||||
|
||||
* Tue Aug 09 2022 Omair Majid <omajid@redhat.com> - 6.0.108-1
|
||||
- Update to .NET SDK 6.0.108 and Runtime 6.0.8
|
||||
- Resolves: RHBZ#2112408
|
||||
- Resolves: RHBZ#2112409
|
||||
|
||||
* Thu Jul 21 2022 Omair Majid <omajid@redhat.com> - 6.0.107-2
|
||||
- Update to .NET SDK 6.0.107 and Runtime 6.0.7
|
||||
- Resolves: RHBZ#2103268
|
||||
- Resolves: RHBZ#2103269
|
||||
|
||||
* Thu Jun 23 2022 Omair Majid <omajid@redhat.com> - 6.0.106-1
|
||||
- Update to .NET SDK 6.0.106 and Runtime 6.0.6
|
||||
- Resolves: RHBZ#2093430
|
||||
- Resolves: RHBZ#2093431
|
||||
|
||||
* Mon May 16 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
|
||||
* Wed May 25 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
|
||||
- Update to .NET SDK 6.0.105 and Runtime 6.0.5
|
||||
- Resolves: RHBZ#2082265
|
||||
- Resolves: RHBZ#2082266
|
||||
|
||||
* Mon Apr 25 2022 Omair Majid <omajid@redhat.com> - 6.0.104-3
|
||||
* Sat Apr 30 2022 Omair Majid <omajid@redhat.com> - 6.0.104-1
|
||||
- Update to .NET SDK 6.0.104 and Runtime 6.0.4
|
||||
- Resolves: RHBZ#2072006
|
||||
- Resolves: RHBZ#2078604
|
||||
|
||||
* Thu Feb 17 2022 Omair Majid <omajid@redhat.com> - 6.0.102-1
|
||||
- Update to .NET SDK 6.0.102 and Runtime 6.0.2
|
||||
- Resolves: RHBZ#2030390
|
||||
- Resolves: RHBZ#2048256
|
||||
* Mon Apr 25 2022 Omair Majid <omajid@redhat.com> - 6.0.103-2
|
||||
- Update to .NET SDK 6.0.103 and Runtime 6.0.3
|
||||
- Resolves: RHBZ#2072015
|
||||
|
||||
* Fri Dec 10 2021 Omair Majid <omajid@redhat.com> - 6.0.100-1
|
||||
- Fix build against clang 13
|
||||
- Resolves: RHBZ#2003061
|
||||
- Resolves: RHBZ#2015536
|
||||
- Resolves: RHBZ#2014666
|
||||
|
||||
* Sun Oct 31 2021 Omair Majid <omajid@redhat.com> - 6.0.100-0.10
|
||||
* Tue Feb 15 2022 Omair Majid <omajid@redhat.com> - 6.0.102-3
|
||||
- Disable bootstrap
|
||||
- Related: RHBZ#2016373
|
||||
- Related: RHBZ#1986211
|
||||
|
||||
* Sat Oct 30 2021 Omair Majid <omajid@redhat.com> - 6.0.100-0.9
|
||||
- Fix msbuild to run on s390x
|
||||
- Related: RHBZ#2016373
|
||||
* Fri Feb 04 2022 Omair Majid <omajid@redhat.com> - 6.0.100-2
|
||||
- Rebuild and check SDK to avoid an incomplete SDK
|
||||
- Related: RHBZ#1986211
|
||||
|
||||
* Thu Oct 28 2021 Omair Majid <omajid@redhat.com> - 6.0.100-0.8
|
||||
- Update to .NET SDK 6.0.100 and Runtime 6.0.0
|
||||
- Related: RHBZ#2016373
|
||||
* Wed Nov 10 2021 Omair Majid <omajid@redhat.com> - 6.0.100-1
|
||||
- Update to .NET 6
|
||||
- Resolves: RHBZ#1986211
|
||||
|
||||
* Fri Oct 22 2021 Omair Majid <omajid@redhat.com> - 6.0.0-0.7.rc2
|
||||
- Update to .NET 6 RC2
|
||||
|
||||
* Wed Oct 27 2021 Adam Kimball <akimball@redhat.com> - 6.0.0-0.7.rc2
|
||||
- Update to .NET SDK 6.0.100-rc.2 and Runtime 6.0.0-rc.2
|
||||
- Resolves: RHBZ#2016373
|
||||
|
||||
* Fri Oct 08 2021 Omair Majid <omajid@redhat.com> - 6.0.0-0.6.28be3e9a006d90d8c6e87d4353b77882829df718
|
||||
- Enable building on arm64
|
||||
- Related: RHBZ#1986017
|
||||
|
|
Loading…
Reference in New Issue