import UBI dotnet8.0-8.0.102-2.el8_9
This commit is contained in:
parent
389e528655
commit
3d4ffc0279
@ -1 +1 @@
|
||||
63afe4d4947ec5eac76f5f39090da96d72020427 SOURCES/dotnet-v8.0.1.tar.gz
|
||||
94c84fca4115a65111a3ce808564a7273c565022 SOURCES/dotnet-v8.0.2.tar.gz
|
||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/dotnet-v8.0.1.tar.gz
|
||||
SOURCES/dotnet-v8.0.2.tar.gz
|
||||
|
104
SOURCES/msbuild-9449-exec-stop-setting-a-locale.patch
Normal file
104
SOURCES/msbuild-9449-exec-stop-setting-a-locale.patch
Normal file
@ -0,0 +1,104 @@
|
||||
From 68fa6537305beda5cb059c898349f37bda285ca7 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Deseyn <tom.deseyn@gmail.com>
|
||||
Date: Thu, 1 Feb 2024 09:23:16 +0100
|
||||
Subject: [PATCH 1/1] Exec: stop setting a locale on Unix.
|
||||
|
||||
This backports a fix that is part of Microsoft's upcoming
|
||||
8.0.2xx SDK to the 8.0.1xx SDK that we package.
|
||||
|
||||
This fix stops MSBuild Exec from printing warnings and/or
|
||||
failing in bash envionments where the glibc en_US locale
|
||||
is not available (which is common in container images).
|
||||
|
||||
The backport includes the changewave opt-out that allows
|
||||
users to revert back to the previous behavior by setting
|
||||
the MSBUILDDISABLEFEATURESFROMVERSION envvar to the
|
||||
version where the feature is introduced ("17.10").
|
||||
---
|
||||
src/msbuild/src/Framework/ChangeWaves.cs | 3 +-
|
||||
src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs | 36 +++++++++++++++++++
|
||||
src/msbuild/src/Tasks/Exec.cs | 7 +++-
|
||||
3 files changed, 44 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/msbuild/src/Framework/ChangeWaves.cs b/src/msbuild/src/Framework/ChangeWaves.cs
|
||||
index 0050723798..1f925324ac 100644
|
||||
--- a/src/msbuild/src/Framework/ChangeWaves.cs
|
||||
+++ b/src/msbuild/src/Framework/ChangeWaves.cs
|
||||
@@ -27,7 +27,8 @@ namespace Microsoft.Build.Framework
|
||||
internal static readonly Version Wave17_4 = new Version(17, 4);
|
||||
internal static readonly Version Wave17_6 = new Version(17, 6);
|
||||
internal static readonly Version Wave17_8 = new Version(17, 8);
|
||||
- internal static readonly Version[] AllWaves = { Wave17_4, Wave17_6, Wave17_8 };
|
||||
+ internal static readonly Version Wave17_10 = new Version(17, 10);
|
||||
+ internal static readonly Version[] AllWaves = { Wave17_4, Wave17_6, Wave17_8, Wave17_10 };
|
||||
|
||||
/// <summary>
|
||||
/// Special value indicating that all features behind all Change Waves should be enabled.
|
||||
diff --git a/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs b/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs
|
||||
index cb468a6cce..c0598e4978 100644
|
||||
--- a/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs
|
||||
+++ b/src/msbuild/src/Tasks.UnitTests/Exec_Tests.cs
|
||||
@@ -69,6 +69,42 @@ namespace Microsoft.Build.UnitTests
|
||||
}
|
||||
}
|
||||
|
||||
+ [UnixOnlyTheory]
|
||||
+ [InlineData(true)]
|
||||
+ [InlineData(false)]
|
||||
+ public void ExecSetsLocaleOnUnix(bool enableChangeWave)
|
||||
+ {
|
||||
+ using (var env = TestEnvironment.Create())
|
||||
+ {
|
||||
+ env.SetEnvironmentVariable("LANG", null);
|
||||
+ env.SetEnvironmentVariable("LC_ALL", null);
|
||||
+
|
||||
+ if (enableChangeWave)
|
||||
+ {
|
||||
+ ChangeWaves.ResetStateForTests();
|
||||
+ // Important: use the version here
|
||||
+ env.SetEnvironmentVariable("MSBUILDDISABLEFEATURESFROMVERSION", ChangeWaves.Wave17_10.ToString());
|
||||
+ BuildEnvironmentHelper.ResetInstance_ForUnitTestsOnly();
|
||||
+ }
|
||||
+
|
||||
+ Exec exec = PrepareExec("echo LANG=$LANG; echo LC_ALL=$LC_ALL;");
|
||||
+ bool result = exec.Execute();
|
||||
+ Assert.True(result);
|
||||
+
|
||||
+ MockEngine engine = (MockEngine)exec.BuildEngine;
|
||||
+ if (enableChangeWave)
|
||||
+ {
|
||||
+ engine.AssertLogContains("LANG=en_US.UTF-8");
|
||||
+ engine.AssertLogContains("LC_ALL=en_US.UTF-8");
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ engine.AssertLogDoesntContain("LANG=en_US.UTF-8");
|
||||
+ engine.AssertLogDoesntContain("LC_ALL=en_US.UTF-8");
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/// <summary>
|
||||
/// Ensures that calling the Exec task does not leave any extra TEMP files
|
||||
/// lying around.
|
||||
diff --git a/src/msbuild/src/Tasks/Exec.cs b/src/msbuild/src/Tasks/Exec.cs
|
||||
index dbf4be1fc5..9faaa68887 100644
|
||||
--- a/src/msbuild/src/Tasks/Exec.cs
|
||||
+++ b/src/msbuild/src/Tasks/Exec.cs
|
||||
@@ -591,7 +591,12 @@ namespace Microsoft.Build.Tasks
|
||||
{
|
||||
commandLine.AppendSwitch("-c");
|
||||
commandLine.AppendTextUnquoted(" \"");
|
||||
- commandLine.AppendTextUnquoted("export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; . ");
|
||||
+ bool setLocale = !ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_10);
|
||||
+ if (setLocale)
|
||||
+ {
|
||||
+ commandLine.AppendTextUnquoted("export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; ");
|
||||
+ }
|
||||
+ commandLine.AppendTextUnquoted(". ");
|
||||
commandLine.AppendFileNameIfNotNull(batchFileForCommandLine);
|
||||
commandLine.AppendTextUnquoted("\"");
|
||||
}
|
||||
--
|
||||
2.43.0
|
||||
|
@ -1,9 +1,9 @@
|
||||
{
|
||||
"release": "8.0.1",
|
||||
"release": "8.0.2",
|
||||
"channel": "8.0",
|
||||
"tag": "v8.0.1",
|
||||
"sdkVersion": "8.0.101",
|
||||
"runtimeVersion": "8.0.1",
|
||||
"tag": "8.0.2",
|
||||
"sdkVersion": "8.0.102",
|
||||
"runtimeVersion": "8.0.2",
|
||||
"sourceRepository": "https://github.com/dotnet/dotnet",
|
||||
"sourceVersion": "b27976e5a6850466ee5b4ce24f91ee93bef645f7"
|
||||
"sourceVersion": "d396b0c4d3e51c2d8d679b2f7233912bc5bfc2fa"
|
||||
}
|
||||
|
169
SOURCES/runtime-re-enable-implicit-rejection.patch
Normal file
169
SOURCES/runtime-re-enable-implicit-rejection.patch
Normal file
@ -0,0 +1,169 @@
|
||||
From 5fdc289903bd3a77d455583650b00297da0cae8f Mon Sep 17 00:00:00 2001
|
||||
From: Omair Majid <omajid@redhat.com>
|
||||
Date: Fri, 2 Feb 2024 15:51:23 -0500
|
||||
Subject: [PATCH] Revert "Disable implicit rejection for RSA PKCS#1 (#95216)"
|
||||
|
||||
This reverts commit a5fc8ff9b03ffb2fdb81dad524ad1a20a0714995.
|
||||
|
||||
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/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs b/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
|
||||
index 39f3ebc82ec..5b97f468a42 100644
|
||||
--- a/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
|
||||
+++ b/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
|
||||
@@ -353,10 +353,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)
|
||||
@@ -716,26 +725,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));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
public static IEnumerable<object[]> OaepPaddingModes
|
||||
{
|
||||
get
|
||||
@@ -757,23 +746,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/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h b/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
|
||||
index 0748e305d5c..cf10d2f7949 100644
|
||||
--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
|
||||
+++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
|
||||
@@ -296,10 +296,8 @@ int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md, size_t len);
|
||||
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) \
|
||||
@@ -355,7 +353,6 @@ int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md, size_t len);
|
||||
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) \
|
||||
@@ -797,10 +794,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
|
||||
@@ -855,7 +850,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/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
|
||||
index 043bf9f9d1e..c9ccdf33e3a 100644
|
||||
--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
|
||||
+++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
|
||||
@@ -67,19 +67,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
|
||||
|
@ -8,10 +8,10 @@
|
||||
|
||||
%global dotnetver 8.0
|
||||
|
||||
%global host_version 8.0.1
|
||||
%global runtime_version 8.0.1
|
||||
%global host_version 8.0.2
|
||||
%global runtime_version 8.0.2
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 8.0.101
|
||||
%global sdk_version 8.0.102
|
||||
%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 }')
|
||||
@ -54,7 +54,7 @@
|
||||
|
||||
Name: dotnet%{dotnetver}
|
||||
Version: %{sdk_rpm_version}
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: .NET Runtime and SDK
|
||||
License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib
|
||||
|
||||
@ -92,6 +92,10 @@ Patch1: roslyn-analyzers-ppc64le-apphost.patch
|
||||
Patch2: vstest-intent-net8.0.patch
|
||||
# We are failing to build 8.0.101 on s390x due to pdb errors that are under investigation
|
||||
Patch3: dotnet-missing-pdbs-okay.patch
|
||||
# https://github.com/dotnet/runtime/pull/95216#issuecomment-1842799314
|
||||
Patch4: runtime-re-enable-implicit-rejection.patch
|
||||
# https://github.com/dotnet/msbuild/pull/9449
|
||||
Patch5: msbuild-9449-exec-stop-setting-a-locale.patch
|
||||
|
||||
|
||||
ExclusiveArch: aarch64 ppc64le s390x x86_64
|
||||
@ -262,6 +266,18 @@ It particularly focuses on creating console applications, web
|
||||
applications and micro-services.
|
||||
|
||||
|
||||
%package -n dotnet-runtime-dbg-%{dotnetver}
|
||||
|
||||
Version: %{runtime_rpm_version}
|
||||
Summary: Managed debug symbols NET %{dotnetver} runtime
|
||||
|
||||
Requires: dotnet-runtime-%{dotnetver}%{?_isa} = %{runtime_rpm_version}-%{release}
|
||||
|
||||
%description -n dotnet-runtime-dbg-%{dotnetver}
|
||||
This package contains the managed symbol (pdb) files useful to debug the
|
||||
managed parts of the .NET runtime itself.
|
||||
|
||||
|
||||
%package -n aspnetcore-runtime-%{dotnetver}
|
||||
|
||||
Version: %{aspnetcore_runtime_rpm_version}
|
||||
@ -281,6 +297,18 @@ It particularly focuses on creating console applications, web
|
||||
applications and micro-services.
|
||||
|
||||
|
||||
%package -n aspnetcore-runtime-dbg-%{dotnetver}
|
||||
|
||||
Version: %{aspnetcore_runtime_rpm_version}
|
||||
Summary: Managed debug symbols for the ASP.NET Core %{dotnetver} runtime
|
||||
|
||||
Requires: aspnetcore-runtime-%{dotnetver}%{?_isa} = %{aspnetcore_runtime_rpm_version}-%{release}
|
||||
|
||||
%description -n aspnetcore-runtime-dbg-%{dotnetver}
|
||||
This package contains the managed symbol (pdb) files useful to debug the
|
||||
managed parts of the ASP.NET Core runtime itself.
|
||||
|
||||
|
||||
%package -n dotnet-templates-%{dotnetver}
|
||||
|
||||
Version: %{sdk_rpm_version}
|
||||
@ -328,6 +356,18 @@ It particularly focuses on creating console applications, web
|
||||
applications and micro-services.
|
||||
|
||||
|
||||
%package -n dotnet-sdk-dbg-%{dotnetver}
|
||||
|
||||
Version: %{sdk_rpm_version}
|
||||
Summary: Managed debug symbols for the .NET %{dotnetver} Software Development Kit
|
||||
|
||||
Requires: dotnet-sdk-%{dotnetver}%{?_isa} = %{sdk_rpm_version}-%{release}
|
||||
|
||||
%description -n dotnet-sdk-dbg-%{dotnetver}
|
||||
This package contains the managed symbol (pdb) files useful to debug the .NET
|
||||
Software Development Kit (SDK) itself.
|
||||
|
||||
|
||||
%global dotnet_targeting_pack() %{expand:
|
||||
%package -n %{1}
|
||||
|
||||
@ -366,13 +406,13 @@ These are not meant for general use.
|
||||
|
||||
%prep
|
||||
release_json_tag=$(grep tag %{SOURCE5} | cut -d: -f2 | sed -E 's/[," ]*//g')
|
||||
if [[ ${release_json_tag} != %{upstream_tag} ]]; then
|
||||
if [[ ${release_json_tag} != %{upstream_tag_without_v} ]]; then
|
||||
echo "error: tag in release.json doesn't match tag in spec file"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
%if %{without bootstrap_dotnet}
|
||||
%setup -q -n dotnet-%{upstream_tag_without_v}
|
||||
%setup -q -c -n dotnet-%{upstream_tag_without_v}
|
||||
|
||||
# Remove all prebuilts
|
||||
find -iname '*.dll' -type f -delete
|
||||
@ -533,12 +573,10 @@ if [[ $(find %{buildroot}%{_libdir}/dotnet -name '*.pem' -print | wc -l) != 1 ]]
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# Install managed symbols, then delete all symbols outside of shared frameworks
|
||||
tar xf artifacts/%{runtime_arch}/Release/dotnet-symbols-sdk-%{sdk_version}*%{runtime_id}.tar.gz \
|
||||
# Install managed symbols
|
||||
tar xf artifacts/%{runtime_arch}/Release/dotnet-symbols-sdk-%{sdk_version}*-%{runtime_id}.tar.gz \
|
||||
-C %{buildroot}%{_libdir}/dotnet/
|
||||
pushd %{buildroot}%{_libdir}/dotnet/
|
||||
find host/ metadata/ packs/ sdk/ sdk-manifests/ templates/ -iname '*.pdb'
|
||||
popd
|
||||
find %{buildroot}%{_libdir}/dotnet/packs -iname '*.pdb' -delete
|
||||
|
||||
# Fix executable permissions on files
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'apphost' -exec chmod +x {} \;
|
||||
@ -594,6 +632,14 @@ echo "Testing build results for debug symbols..."
|
||||
%{SOURCE20} -v %{buildroot}%{_libdir}/dotnet/
|
||||
|
||||
|
||||
find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.NETCore.App -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-runtime-non-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.NETCore.App -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-runtime-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.AspNetCore.App -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' > aspnetcore-runtime-non-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/shared/Microsoft.AspNetCore.App -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > aspnetcore-runtime-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/sdk -type d | tail -n +2 | sed -E 's|%{buildroot}||' | sed -E 's|^|%dir |' > dotnet-sdk-non-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/sdk -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' >> dotnet-sdk-non-dbg-files
|
||||
find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-sdk-dbg-files
|
||||
|
||||
|
||||
%check
|
||||
%if 0%{?fedora} > 35
|
||||
@ -630,23 +676,26 @@ export COMPlus_LTTng=0
|
||||
%dir %{_libdir}/dotnet/host/fxr
|
||||
%{_libdir}/dotnet/host/fxr/%{host_version}
|
||||
|
||||
%files -n dotnet-runtime-%{dotnetver}
|
||||
%files -n dotnet-runtime-%{dotnetver} -f dotnet-runtime-non-dbg-files
|
||||
%dir %{_libdir}/dotnet/shared
|
||||
%dir %{_libdir}/dotnet/shared/Microsoft.NETCore.App
|
||||
%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}
|
||||
%dir %{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}
|
||||
|
||||
%files -n aspnetcore-runtime-%{dotnetver}
|
||||
%files -n dotnet-runtime-dbg-%{dotnetver} -f dotnet-runtime-dbg-files
|
||||
|
||||
%files -n aspnetcore-runtime-%{dotnetver} -f aspnetcore-runtime-non-dbg-files
|
||||
%dir %{_libdir}/dotnet/shared
|
||||
%dir %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App
|
||||
%{_libdir}/dotnet/shared/Microsoft.AspNetCore.App/%{aspnetcore_runtime_version}
|
||||
%dir %{_libdir}/dotnet/shared/Microsoft.AspNetCore.App/%{aspnetcore_runtime_version}
|
||||
|
||||
%files -n aspnetcore-runtime-dbg-%{dotnetver} -f aspnetcore-runtime-dbg-files
|
||||
|
||||
%files -n dotnet-templates-%{dotnetver}
|
||||
%dir %{_libdir}/dotnet/templates
|
||||
%{_libdir}/dotnet/templates/%{templates_version}
|
||||
|
||||
%files -n dotnet-sdk-%{dotnetver}
|
||||
%files -n dotnet-sdk-%{dotnetver} -f dotnet-sdk-non-dbg-files
|
||||
%dir %{_libdir}/dotnet/sdk
|
||||
%{_libdir}/dotnet/sdk/%{sdk_version}
|
||||
%dir %{_libdir}/dotnet/sdk-manifests
|
||||
%{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version}*
|
||||
%{_libdir}/dotnet/metadata
|
||||
@ -654,12 +703,26 @@ export COMPlus_LTTng=0
|
||||
%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Runtime.%{runtime_id}/%{aspnetcore_runtime_version}
|
||||
%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Runtime.%{runtime_id}/%{runtime_version}
|
||||
|
||||
%files -n dotnet-sdk-dbg-%{dotnetver} -f dotnet-sdk-dbg-files
|
||||
|
||||
%files -n dotnet-sdk-%{dotnetver}-source-built-artifacts
|
||||
%dir %{_libdir}/dotnet
|
||||
%{_libdir}/dotnet/source-built-artifacts
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Feb 03 2024 Omair Majid <omajid@redhat.com> - 8.0.102-2
|
||||
- Don't set a locale when running msbuild Exec on Unix
|
||||
- Resolves: RHEL-23939
|
||||
|
||||
* Thu Feb 01 2024 Omair Majid <omajid@redhat.com> - 8.0.102-1
|
||||
- Update to .NET SDK 8.0.102 and Runtime 8.0.2
|
||||
- Resolves: RHEL-23803
|
||||
|
||||
* Tue Jan 30 2024 Omair Majid <omajid@redhat.com> - 8.0.101-2
|
||||
- Add -dbg subpackages for symbol files
|
||||
- Resolves: RHEL-23073
|
||||
|
||||
* Wed Dec 20 2023 Omair Majid <omajid@redhat.com> - 8.0.101-1
|
||||
- Update to .NET SDK 8.0.101 and Runtime 8.0.1
|
||||
- Resolves: RHEL-19806
|
||||
|
Loading…
Reference in New Issue
Block a user