Compare commits
No commits in common. "c8-beta" and "c8" have entirely different histories.
|
@ -1 +1 @@
|
||||||
c2015d0972371ab8995d18246d1f5b76299f3be3 SOURCES/dotnet-v7.0.103.tar.gz
|
040f6560a72c73dc628cb79f8166d8fc94ac8362 SOURCES/dotnet-v7.0.119.tar.gz
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
SOURCES/dotnet-v7.0.103.tar.gz
|
SOURCES/dotnet-v7.0.119.tar.gz
|
||||||
|
|
|
@ -0,0 +1,142 @@
|
||||||
|
From f55ebb4597a1a931edee16283fc43a4ff33d1029 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Omair Majid <omajid@redhat.com>
|
||||||
|
Date: Fri, 2 Feb 2024 12:23:28 -0500
|
||||||
|
Subject: [PATCH] Revert "Disable implicit rejection for RSA PKCS#1 (#95217)"
|
||||||
|
|
||||||
|
This reverts commit a314c5b3580a9fe25c59d917ff0b7594efc6f81f.
|
||||||
|
|
||||||
|
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/95217#issuecomment-1842799362
|
||||||
|
---
|
||||||
|
.../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 55a044d62a6..e72d42e87d2 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
|
||||||
|
@@ -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/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h b/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
|
||||||
|
index 7d5ec84cc7d..efc0d470602 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
|
||||||
|
@@ -276,10 +276,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) \
|
||||||
|
@@ -334,7 +332,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) \
|
||||||
|
@@ -761,10 +758,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
|
||||||
|
@@ -818,7 +813,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
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
%bcond_with bootstrap
|
# We dont' use %%bootstrap since that doesn't work in CentOS Koji
|
||||||
|
%bcond_with bootstrap_dotnet
|
||||||
|
|
||||||
# LTO triggers a compilation error for a source level issue. Given that LTO should not
|
# LTO triggers a compilation error for a source level issue. Given that LTO should not
|
||||||
# change the validity of any given source and the nature of the error (undefined enum), I
|
# change the validity of any given source and the nature of the error (undefined enum), I
|
||||||
|
@ -6,10 +7,10 @@
|
||||||
# until that's done, disable LTO. This has to happen before setting the flags below.
|
# until that's done, disable LTO. This has to happen before setting the flags below.
|
||||||
%define _lto_cflags %{nil}
|
%define _lto_cflags %{nil}
|
||||||
|
|
||||||
%global host_version 7.0.3
|
%global host_version 7.0.19
|
||||||
%global runtime_version 7.0.3
|
%global runtime_version 7.0.19
|
||||||
%global aspnetcore_runtime_version %{runtime_version}
|
%global aspnetcore_runtime_version %{runtime_version}
|
||||||
%global sdk_version 7.0.103
|
%global sdk_version 7.0.119
|
||||||
%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
%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 %{runtime_version}
|
||||||
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
|
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
|
||||||
|
@ -56,16 +57,17 @@ 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
|
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/
|
URL: https://github.com/dotnet/
|
||||||
|
|
||||||
%if %{with bootstrap}
|
%if %{with bootstrap_dotnet}
|
||||||
|
%global bootstrap_sdk_version 7.0.109
|
||||||
# The source is generated on a RHEL box via:
|
# The source is generated on a RHEL box via:
|
||||||
# ./build-dotnet-tarball --bootstrap %%{upstream_tag}
|
# ./build-dotnet-tarball --bootstrap %%{upstream_tag}
|
||||||
Source0: dotnet-%{upstream_tag}-x64-bootstrap.tar.xz
|
Source0: dotnet-%{upstream_tag}-x64-bootstrap.tar.xz
|
||||||
# Generated via ./build-arm64-bootstrap-tarball
|
# Generated via ./build-arm64-bootstrap-tarball
|
||||||
Source1: dotnet-arm64-prebuilts-2022-10-12.tar.gz
|
Source1: dotnet-prebuilts-%{bootstrap_sdk_version}-arm64.tar.gz
|
||||||
# Generated manually, same pattern as the arm64 tarball
|
# Generated manually, same pattern as the arm64 tarball
|
||||||
Source2: dotnet-ppc64le-prebuilts-2022-10-21.tar.gz
|
Source2: dotnet-prebuilts-%{bootstrap_sdk_version}-ppc64le.tar.gz
|
||||||
# Generated manually, same pattern as the arm64 tarball
|
# Generated manually, same pattern as the arm64 tarball
|
||||||
Source3: dotnet-s390x-prebuilts-2022-10-12.tar.gz
|
Source3: dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz
|
||||||
%else
|
%else
|
||||||
# The source is generated on a RHEL box via:
|
# The source is generated on a RHEL box via:
|
||||||
# ./build-dotnet-tarball %%{upstream_tag}
|
# ./build-dotnet-tarball %%{upstream_tag}
|
||||||
|
@ -77,7 +79,8 @@ Source11: dotnet.sh.in
|
||||||
|
|
||||||
# Disable apphost; there's no net6.0 apphost for ppc64le
|
# Disable apphost; there's no net6.0 apphost for ppc64le
|
||||||
Patch1: roslyn-analyzers-ppc64le-apphost.patch
|
Patch1: roslyn-analyzers-ppc64le-apphost.patch
|
||||||
|
# https://github.com/dotnet/runtime/pull/95217#issuecomment-1842799362
|
||||||
|
Patch2: runtime-re-enable-implicit-rejection.patch
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||||
|
@ -90,7 +93,7 @@ ExclusiveArch: x86_64
|
||||||
BuildRequires: clang
|
BuildRequires: clang
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
%if %{without bootstrap}
|
%if %{without bootstrap_dotnet}
|
||||||
BuildRequires: dotnet-sdk-7.0
|
BuildRequires: dotnet-sdk-7.0
|
||||||
BuildRequires: dotnet-sdk-7.0-source-built-artifacts
|
BuildRequires: dotnet-sdk-7.0-source-built-artifacts
|
||||||
%endif
|
%endif
|
||||||
|
@ -324,7 +327,7 @@ applications using the .NET SDK.
|
||||||
%dotnet_targeting_pack dotnet-apphost-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Host.%{runtime_id}
|
%dotnet_targeting_pack dotnet-apphost-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Host.%{runtime_id}
|
||||||
%dotnet_targeting_pack dotnet-targeting-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Ref
|
%dotnet_targeting_pack dotnet-targeting-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Ref
|
||||||
%dotnet_targeting_pack aspnetcore-targeting-pack-7.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 7.0 Microsoft.AspNetCore.App.Ref
|
%dotnet_targeting_pack aspnetcore-targeting-pack-7.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 7.0 Microsoft.AspNetCore.App.Ref
|
||||||
%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
|
#%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
|
||||||
|
|
||||||
|
|
||||||
%package -n dotnet-sdk-7.0-source-built-artifacts
|
%package -n dotnet-sdk-7.0-source-built-artifacts
|
||||||
|
@ -340,7 +343,7 @@ These are not meant for general use.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%if %{without bootstrap}
|
%if %{without bootstrap_dotnet}
|
||||||
%setup -q -n dotnet-%{upstream_tag}
|
%setup -q -n dotnet-%{upstream_tag}
|
||||||
|
|
||||||
# Remove all prebuilts
|
# Remove all prebuilts
|
||||||
|
@ -399,6 +402,7 @@ popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
# Fix bad hardcoded path in build
|
# Fix bad hardcoded path in build
|
||||||
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
|
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
|
||||||
|
@ -411,7 +415,7 @@ sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_L
|
||||||
%build
|
%build
|
||||||
cat /etc/os-release
|
cat /etc/os-release
|
||||||
|
|
||||||
%if %{without bootstrap}
|
%if %{without bootstrap_dotnet}
|
||||||
# We need to create a copy because we will mutate this
|
# We need to create a copy because we will mutate this
|
||||||
cp -a %{_libdir}/dotnet previously-built-dotnet
|
cp -a %{_libdir}/dotnet previously-built-dotnet
|
||||||
find previously-built-dotnet
|
find previously-built-dotnet
|
||||||
|
@ -466,7 +470,7 @@ export OPENSSL_ENABLE_SHA1_SIGNATURES=1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
VERBOSE=1 ./build.sh \
|
VERBOSE=1 ./build.sh \
|
||||||
%if %{without bootstrap}
|
%if %{without bootstrap_dotnet}
|
||||||
--with-sdk previously-built-dotnet \
|
--with-sdk previously-built-dotnet \
|
||||||
%endif
|
%endif
|
||||||
%ifarch %{mono_archs}
|
%ifarch %{mono_archs}
|
||||||
|
@ -516,30 +520,35 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {}
|
||||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \;
|
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \;
|
||||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \;
|
find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \;
|
||||||
|
|
||||||
install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
|
# Provided by dotnet-host from another SRPM
|
||||||
install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
|
#install -dm 0755 %%{buildroot}%%{_sysconfdir}/profile.d/
|
||||||
|
#install dotnet.sh %%{buildroot}%%{_sysconfdir}/profile.d/
|
||||||
|
|
||||||
install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
|
# Provided by dotnet-host from another SRPM
|
||||||
|
#install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions
|
||||||
# dynamic completion needs the file to be named the same as the base command
|
# dynamic completion needs the file to be named the same as the base command
|
||||||
install src/sdk/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
|
#install src/sdk/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet
|
||||||
|
|
||||||
# TODO: the zsh completion script needs to be ported to use #compdef
|
# TODO: the zsh completion script needs to be ported to use #compdef
|
||||||
#install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
|
#install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
|
||||||
#install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
|
#install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
|
||||||
|
|
||||||
install -dm 0755 %{buildroot}%{_bindir}
|
# Provided by dotnet-host from another SRPM
|
||||||
ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
|
#install -dm 0755 %%{buildroot}%%{_bindir}
|
||||||
|
#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/
|
||||||
|
|
||||||
for section in 1 7; do
|
# Provided by dotnet-host from another SRPM
|
||||||
install -dm 0755 %{buildroot}%{_mandir}/man${section}/
|
#for section in 1 7; do
|
||||||
find -iname 'dotnet*'.${section} -type f -exec cp {} %{buildroot}%{_mandir}/man${section}/ \;
|
# install -dm 0755 %%{buildroot}%%{_mandir}/man${section}/
|
||||||
done
|
# find -iname 'dotnet*'.${section} -type f -exec cp {} %%{buildroot}%%{_mandir}/man${section}/ \;
|
||||||
|
#done
|
||||||
|
|
||||||
install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet
|
# Provided by dotnet-host from another SRPM
|
||||||
echo "%{_libdir}/dotnet" >> install_location
|
#install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet
|
||||||
install install_location %{buildroot}%{_sysconfdir}/dotnet/
|
#echo "%%{_libdir}/dotnet" >> install_location
|
||||||
echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch}
|
#install install_location %%{buildroot}%%{_sysconfdir}/dotnet/
|
||||||
install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/
|
#echo "%%{_libdir}/dotnet" >> install_location_%%{runtime_arch}
|
||||||
|
#install install_location_%%{runtime_arch} %%{buildroot}%%{_sysconfdir}/dotnet/
|
||||||
|
|
||||||
install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts
|
install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts
|
||||||
install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/
|
install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/
|
||||||
|
@ -556,7 +565,7 @@ echo "Testing build results for debug symbols..."
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
# Self-check
|
||||||
%if 0%{?fedora} > 35
|
%if 0%{?fedora} > 35
|
||||||
# lttng in Fedora > 35 is incompatible with .NET
|
# lttng in Fedora > 35 is incompatible with .NET
|
||||||
export COMPlus_LTTng=0
|
export COMPlus_LTTng=0
|
||||||
|
@ -565,27 +574,14 @@ export COMPlus_LTTng=0
|
||||||
%{buildroot}%{_libdir}/dotnet/dotnet --info
|
%{buildroot}%{_libdir}/dotnet/dotnet --info
|
||||||
%{buildroot}%{_libdir}/dotnet/dotnet --version
|
%{buildroot}%{_libdir}/dotnet/dotnet --version
|
||||||
|
|
||||||
|
# Provided by dotnet-host from another SRPM
|
||||||
|
rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt
|
||||||
|
rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt
|
||||||
|
rm %{buildroot}%{_libdir}/dotnet/dotnet
|
||||||
|
|
||||||
%if 0%{?rhel} <= 8
|
# Provided by netstandard-targeting-pack-2.1 from another SRPM
|
||||||
%files -n dotnet
|
rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
|
||||||
# empty package useful for dependencies
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files -n dotnet-host
|
|
||||||
%dir %{_libdir}/dotnet
|
|
||||||
%{_libdir}/dotnet/dotnet
|
|
||||||
%dir %{_libdir}/dotnet/host
|
|
||||||
%dir %{_libdir}/dotnet/host/fxr
|
|
||||||
%{_bindir}/dotnet
|
|
||||||
%license %{_libdir}/dotnet/LICENSE.txt
|
|
||||||
%license %{_libdir}/dotnet/ThirdPartyNotices.txt
|
|
||||||
%doc %{_mandir}/man1/dotnet*.1.gz
|
|
||||||
%doc %{_mandir}/man7/dotnet*.7.gz
|
|
||||||
%config(noreplace) %{_sysconfdir}/profile.d/dotnet.sh
|
|
||||||
%config(noreplace) %{_sysconfdir}/dotnet
|
|
||||||
%dir %{_datadir}/bash-completion
|
|
||||||
%dir %{_datadir}/bash-completion/completions
|
|
||||||
%{_datadir}/bash-completion/completions/dotnet
|
|
||||||
|
|
||||||
%files -n dotnet-hostfxr-7.0
|
%files -n dotnet-hostfxr-7.0
|
||||||
%dir %{_libdir}/dotnet/host/fxr
|
%dir %{_libdir}/dotnet/host/fxr
|
||||||
|
@ -619,6 +615,66 @@ export COMPlus_LTTng=0
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 14 2024 Omair Majid <omajid@redhat.com> - 7.0.119-1
|
||||||
|
- Update to .NET SDK 7.0.119 and Runtime 7.0.19
|
||||||
|
- Resolves: RHEL-35313
|
||||||
|
|
||||||
|
* Tue Apr 09 2024 Omair Majid <omajid@redhat.com> - 7.0.118-2
|
||||||
|
- Update to .NET SDK 7.0.118 and Runtime 7.0.18
|
||||||
|
- Resolves: RHEL-31199
|
||||||
|
|
||||||
|
* Tue Mar 19 2024 Omair Majid <omajid@redhat.com> - 7.0.117-2
|
||||||
|
- Update to .NET SDK 7.0.117 and Runtime 7.0.17
|
||||||
|
- Resolves: RHEL-27547
|
||||||
|
|
||||||
|
* Wed Feb 14 2024 Omair Majid <omajid@redhat.com> - 7.0.116-2
|
||||||
|
- Update to .NET SDK 7.0.116 and Runtime 7.0.16
|
||||||
|
- Resolves: RHEL-23789
|
||||||
|
|
||||||
|
* Mon Jan 15 2024 Omair Majid <omajid@redhat.com> - 7.0.115-2
|
||||||
|
- Update to .NET SDK 7.0.115 and Runtime 7.0.15
|
||||||
|
- Resolves: RHEL-19799
|
||||||
|
|
||||||
|
* Fri Dec 22 2023 Omair Majid <omajid@redhat.com> - 7.0.114-2
|
||||||
|
- Update to .NET SDK 7.0.114 and Runtime 7.0.14
|
||||||
|
- Resolves: RHEL-15350
|
||||||
|
|
||||||
|
* Tue Oct 24 2023 Omair Majid <omajid@redhat.com> - 7.0.113-2
|
||||||
|
- Update to .NET SDK 7.0.113 and Runtime 7.0.13
|
||||||
|
- Resolves: RHEL-14474
|
||||||
|
|
||||||
|
* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 7.0.112-2
|
||||||
|
- Update to .NET SDK 7.0.112 and Runtime 7.0.12
|
||||||
|
- Resolves: RHEL-11704
|
||||||
|
|
||||||
|
* Tue Sep 12 2023 Omair Majid <omajid@redhat.com> - 7.0.111-2
|
||||||
|
- Update to .NET SDK 7.0.111 and Runtime 7.0.11
|
||||||
|
- Resolves: RHEL-2001
|
||||||
|
|
||||||
|
* Wed Aug 23 2023 Omair Majid <omajid@redhat.com> - 7.0.110-4
|
||||||
|
- Disable bootstrap
|
||||||
|
- Related: RHBZ#2228570
|
||||||
|
|
||||||
|
* Tue Aug 22 2023 Omair Majid <omajid@redhat.com> - 7.0.110-3
|
||||||
|
- Enable bootstrap
|
||||||
|
- Related: RHBZ#2228570
|
||||||
|
|
||||||
|
* Wed Aug 09 2023 Omair Majid <omajid@redhat.com> - 7.0.110-2
|
||||||
|
- Update to .NET SDK 7.0.110 and Runtime 7.0.10
|
||||||
|
- Resolves: RHBZ#2228570
|
||||||
|
|
||||||
|
* Tue Jul 11 2023 Omair Majid <omajid@redhat.com> - 7.0.109-2
|
||||||
|
- Update to .NET SDK 7.0.109 and Runtime 7.0.9
|
||||||
|
- Resolves: RHBZ#2219631
|
||||||
|
|
||||||
|
* Wed Jul 05 2023 Omair Majid <omajid@redhat.com> - 7.0.108-2
|
||||||
|
- Update to .NET SDK 7.0.108 and Runtime 7.0.8
|
||||||
|
- Resolves: RHBZ#2216223
|
||||||
|
|
||||||
|
* Thu Mar 02 2023 Omair Majid <omajid@redhat.com> - 7.0.104-1
|
||||||
|
- Update to .NET SDK 7.0.104 and Runtime 7.0.4
|
||||||
|
- Resolves: RHBZ#2175026
|
||||||
|
|
||||||
* Thu Feb 02 2023 Omair Majid <omajid@redhat.com> - 7.0.103-1
|
* Thu Feb 02 2023 Omair Majid <omajid@redhat.com> - 7.0.103-1
|
||||||
- Update to .NET SDK 7.0.103 and Runtime 7.0.3
|
- Update to .NET SDK 7.0.103 and Runtime 7.0.3
|
||||||
- Resolves: RHBZ#2166775
|
- Resolves: RHBZ#2166775
|
||||||
|
|
Loading…
Reference in New Issue