Compare commits

...

No commits in common. "c8s" and "c9s" have entirely different histories.
c8s ... c9s

7 changed files with 112 additions and 82 deletions

4
.gitignore vendored
View File

@ -42,6 +42,8 @@
/dotnet-8.0.3.tar.gz.sig
/dotnet-8.0.4.tar.gz
/dotnet-8.0.4.tar.gz.sig
/dotnet-8.0.5.tar.gz
/dotnet-8.0.5.tar.gz.sig
/dotnet-8.0.7.tar.gz
/dotnet-8.0.7.tar.gz.sig
/dotnet-8.0.8.tar.gz
@ -50,3 +52,5 @@
/dotnet-8.0.10.tar.gz.sig
/dotnet-8.0.11.tar.gz
/dotnet-8.0.11.tar.gz.sig
/dotnet-8.0.12.tar.gz
/dotnet-8.0.12.tar.gz.sig

View File

@ -1,20 +0,0 @@
Allow builders to override failing on pdb mismatch
--- a/build.proj
+++ b/build.proj
@@ -114,6 +114,7 @@
<SdkSymbolsTarball>$(OutputPath)dotnet-symbols-sdk-$(MicrosoftSourceBuildIntermediateInstallerVersion)-$(TargetRid).tar.gz</SdkSymbolsTarball>
<SdkLayout>$(ArtifactsTmpDir)Sdk</SdkLayout>
<SdkTarball>%(SdkTarballItem.Identity)</SdkTarball>
+ <FailOnMissingPDBs Condition="'$(FailOnMissingPDBs)' == ''">true</FailOnMissingPDBs>
</PropertyGroup>
<MakeDir Directories="$(SdkLayout)" />
@@ -123,7 +124,7 @@
<CreateSdkSymbolsLayout SdkLayoutPath="$(SdkLayout)"
AllSymbolsPath="$(UnifiedSymbolsLayout)"
SdkSymbolsLayoutPath="$(SdkSymbolsLayout)"
- FailOnMissingPDBs="true" />
+ FailOnMissingPDBs="$(FailOnMissingPDBs)" />
<Exec Command="tar --numeric-owner -czf $(SdkSymbolsTarball) *"
WorkingDirectory="$(SdkSymbolsLayout)" />

View File

@ -1,4 +1,4 @@
%bcond_with bootstrap_dotnet
%bcond_with bootstrap
# 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
@ -12,15 +12,14 @@
# dotnet-host and netstandard-targeting-pack-2.1
%global is_latest_dotnet 0
%global host_version 8.0.11
%global runtime_version 8.0.11
%global host_version 8.0.12
%global runtime_version 8.0.12
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 8.0.111
%global sdk_version 8.0.112
%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 }')
# upstream can produce releases with a different tag than the SDK version
%global upstream_tag v%{runtime_version}
%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
@ -64,7 +63,7 @@ License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APS
URL: https://github.com/dotnet/
%if %{with bootstrap_dotnet}
%if %{with bootstrap}
%global bootstrap_sdk_version 8.0.100-rc.1.23410.12
%global tarball_name dotnet-%{upstream_tag}-x64-bootstrap
# The source is generated on a Fedora box via:
@ -78,7 +77,7 @@ Source2: dotnet-prebuilts-%{bootstrap_sdk_version}-ppc64le.tar.gz
Source3: dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz
%else
Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz
Source1: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz.sig#/dotnet-%{upstream_tag_without_v}.tar.gz.sig
Source1: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz.sig
Source2: https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc
%endif
Source5: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json
@ -90,12 +89,15 @@ Source21: dotnet.sh.in
Patch1: roslyn-analyzers-ppc64le-apphost.patch
# https://github.com/dotnet/source-build/discussions/3481
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
Patch3: runtime-re-enable-implicit-rejection.patch
# https://github.com/dotnet/msbuild/pull/9449
Patch5: msbuild-9449-exec-stop-setting-a-locale.patch
Patch4: msbuild-9449-exec-stop-setting-a-locale.patch
# We disable checking the signature of the last certificate in a chain if the certificate is supposedly self-signed.
# A side effect of not checking the self-signature of such a certificate is that disabled or unsupported message
# digests used for the signature are not treated as fatal errors.
# https://issues.redhat.com/browse/RHEL-25254
Patch5: runtime-openssl-sha1.patch
ExclusiveArch: aarch64 ppc64le s390x x86_64
@ -104,7 +106,7 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64
BuildRequires: clang
BuildRequires: cmake
BuildRequires: coreutils
%if %{without bootstrap_dotnet}
%if %{without bootstrap}
BuildRequires: dotnet-sdk-%{dotnetver}
BuildRequires: dotnet-sdk-%{dotnetver}-source-built-artifacts
%endif
@ -416,7 +418,7 @@ if [[ ${release_json_tag} != %{upstream_tag} ]]; then
exit 1
fi
%if %{without bootstrap_dotnet}
%if %{without bootstrap}
%setup -q -n dotnet-%{upstream_tag_without_v}
# Remove all prebuilts
@ -479,6 +481,9 @@ popd
%autopatch -p1 -M 999
# Fix bad hardcoded path in build
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
%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
@ -487,7 +492,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
find previously-built-dotnet
@ -534,9 +539,8 @@ export EXTRA_LDFLAGS="$LDFLAGS"
# suggested compile-time change doesn't work, unfortunately.
export COMPlus_LTTng=0
VERBOSE=1 timeout 5h \
./build.sh \
%if %{without bootstrap_dotnet}
VERBOSE=1 ./build.sh \
%if %{without bootstrap}
--with-sdk previously-built-dotnet \
%endif
%ifarch %{mono_archs}
@ -544,9 +548,6 @@ VERBOSE=1 timeout 5h \
%endif
--release-manifest %{SOURCE5} \
-- \
%ifarch s390x
/p:FailOnMissingPDBs=false \
%endif
/p:MinimalConsoleLogOutput=false \
/p:ContinueOnPrebuiltBaselineError=true \
/v:n \
@ -662,7 +663,6 @@ rm %{buildroot}%{_libdir}/dotnet/dotnet
rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%endif
%check
%if 0%{?fedora} > 35
# lttng in Fedora > 35 is incompatible with .NET
@ -675,12 +675,12 @@ export COMPlus_LTTng=0
%endif
%if %{is_latest_dotnet}
%if ( 0%{?fedora} && 0%{?fedora} < 38 ) || ( 0%{?rhel} && 0%{?rhel} < 9 )
%files -n dotnet
# empty package useful for dependencies
%endif
%if %{is_latest_dotnet}
%files -n dotnet-host
%dir %{_libdir}/dotnet
%{_libdir}/dotnet/dotnet
@ -739,87 +739,97 @@ export COMPlus_LTTng=0
%changelog
* Thu Jan 16 2025 Omair Majid <omajid@redhat.com> - 8.0.112-2
- Update to .NET SDK 8.0.112 and Runtime 8.0.12
- Resolves: RHEL-71555
* Thu Nov 14 2024 Omair Majid <omajid@redhat.com> - 8.0.111-2
- Update to .NET SDK 8.0.111 and Runtime 8.0.11
- Resolves: RHEL-65366
- Resolves: RHEL-65367
* Fri Oct 18 2024 Omair Majid <omajid@redhat.com> - 8.0.110-3
- Disable packages provided by another .NET version
- Related: RHEL-60801
* Tue Oct 15 2024 Omair Majid <omajid@redhat.com> - 8.0.110-2
- Update to .NET SDK 8.0.110 and Runtime 8.0.10
- Resolves: RHEL-60794
- Resolves: RHEL-60801
* Wed Aug 14 2024 Omair Majid <omajid@redhat.com> - 8.0.108-2
- Update to .NET SDK 8.0.108 and Runtime 8.0.8
- Resolves: RHEL-52388
- Resolves: RHEL-52387
* Wed Jul 10 2024 Omair Majid <omajid@redhat.com> - 8.0.107-3
- Fix ownership of some missed directories
- Resolves: RHEL-47081
- Resolves: RHEL-47079
* Tue Jul 09 2024 Omair Majid <omajid@redhat.com> - 8.0.107-2
- Update to .NET SDK 8.0.107 and Runtime 8.0.7
- Resolves: RHEL-45322
- Resolves: RHEL-45323
* Wed May 15 2024 Omair Majid <omajid@redhat.com> - 8.0.105-2
- Update to .NET SDK 8.0.105 and Runtime 8.0.5
- Resolves: RHEL-35315
* Tue Apr 09 2024 Omair Majid <omajid@redhat.com> - 8.0.104-2
- Update to .NET SDK 8.0.104 and Runtime 8.0.4
- Resolves: RHEL-31204
- Resolves: RHEL-31208
* Sun Mar 31 2024 Tom Deseyn <tom.deseyn@gmail.com> - 8.0.103-3
- We disable checking the signature of the last certificate in a chain if the certificate is supposedly self-signed.
A side effect of not checking the self-signature of such a certificate is that disabled or unsupported message
digests used for the signature are not treated as fatal errors.
- Resolves: RHEL-28344
* Tue Mar 19 2024 Omair Majid <omajid@redhat.com> - 8.0.103-2
- Update to .NET SDK 8.0.103 and Runtime 8.0.3
- Resolves: RHEL-27551
- Resolves: RHEL-27553
* Tue Feb 20 2024 Tom Deseyn <tom.deseyn@gmail.com> - 8.0.102-3
- Backport MSBuild locale fix
- Resolves: RHEL-23937
- Resolves: RHEL-23936
* Wed Feb 14 2024 Omair Majid <omajid@redhat.com> - 8.0.102-2
- Update to .NET SDK 8.0.102 and Runtime 8.0.2
- Resolves: RHEL-23802
- Resolves: RHEL-23804
* Mon Jan 29 2024 Omair Majid <omajid@redhat.com> - 8.0.101-4
* Mon Jan 29 2024 Omair Majid <omajid@redhat.com> - 8.0.101-3
- Add -dbg subpackages for symbol files
- Resolves: RHEL-23071
* Thu Jan 18 2024 Omair Majid <omajid@redhat.com> - 8.0.101-3
- Stop enforcing pdb checking on s390x
- Related: RHEL-19800
- Resolves: RHEL-23070
* Mon Jan 15 2024 Omair Majid <omajid@redhat.com> - 8.0.101-2
- Update to .NET SDK 8.0.101 and Runtime 8.0.1
- Resolves: RHEL-19800
- Resolves: RHEL-19803
* Wed Nov 15 2023 Omair Majid <omajid@redhat.com> - 8.0.100-3
- Update to .NET SDK 8.0.100 and Runtime 8.0.0
- Resolves: RHEL-15353
* Wed Oct 25 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.2-0.2
- Fix runtime package version
- Related: RHEL-13838
- Resolves: RHEL-15352
* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.2-0.1
- Update to .NET 8 RC 2
- Resolves: RHEL-13838
* Fri Sep 29 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.5
- Disable bootstrap
- Related: RHEL-2958
- Resolves: RHEL-13790
* Thu Sep 28 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.4
- Backport additional patches to fix s390x issues
- Related: RHEL-2958
- Disable bootstrap
- Related: RHEL-4074
* Tue Sep 19 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.3
* Wed Sep 27 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.3
- Add backported patches for additional s390x issues
- Related: RHEL-4074
* Mon Sep 18 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.2
- Add patches to fix mono and arm64 issues
- Include libmono-*.a files in the SDK
- Fix CI configuration
- Related: RHEL-2958
- Related: RHEL-4074
* Fri Sep 15 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.1-0.1
- Update to .NET SDK 8.0.100 RC 1 and Runtime 8.0.0 RC 1
- Related: RHEL-2958
- Resolves: RHEL-4074
* Tue Aug 22 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.7-0.2
- Add patch to work around TypeLoadException in Mono
- Related: RHBZ#2228550
- Related: RHBZ#2224124
* Fri Aug 11 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.7-0.1
- Update to .NET SDK 8.0.100 Preview 7 and Runtime 8.0.0 Preview 7

View File

@ -1,10 +1,10 @@
{
"release": "8.0.11",
"release": "8.0.12",
"channel": "8.0",
"tag": "v8.0.11",
"sdkVersion": "8.0.111",
"runtimeVersion": "8.0.11",
"aspNetCoreVersion": "8.0.11",
"tag": "v8.0.12",
"sdkVersion": "8.0.112",
"runtimeVersion": "8.0.12",
"aspNetCoreVersion": "8.0.12",
"sourceRepository": "https://github.com/dotnet/dotnet",
"sourceVersion": "d5f3d652f9266d600777f626a9650a273419859b"
"sourceVersion": "ab5d79b36d4f8a16f9f91f53fd6504b354c977b1"
}

View File

@ -0,0 +1,34 @@
From d7805229ffe6906cd0832c0482b963caf4b4fd82 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Wed, 28 Feb 2024 14:08:15 +0100
Subject: [PATCH] Allow certificate validation with SHA-1 signatures.
RHEL OpenSSL builds disable SHA-1 signatures. This causes certificate
validation to fail when using the X509_V_FLAG_CHECK_SS_SIGNATURE flag
with a chain where the last certificate uses a SHA-1 signature.
This removes X509_V_FLAG_CHECK_SS_SIGNATURE flag to have the default
OpenSSL behavior for certificate validation.
---
.../libs/System.Security.Cryptography.Native/pal_x509.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_x509.c b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_x509.c
index 04c6ba06cd..2cd3413dae 100644
--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_x509.c
+++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_x509.c
@@ -272,11 +272,6 @@ int32_t CryptoNative_X509StoreCtxInit(X509_STORE_CTX* ctx, X509_STORE* store, X5
int32_t val = X509_STORE_CTX_init(ctx, store, x509, extraStore);
- if (val != 0)
- {
- X509_STORE_CTX_set_flags(ctx, X509_V_FLAG_CHECK_SS_SIGNATURE);
- }
-
return val;
}
--
2.43.2

View File

@ -1,2 +1,2 @@
SHA512 (dotnet-8.0.11.tar.gz) = 1bd689e560114d3cbe6a40d6608b0f5f493bef5e4d74f973c37d2e4bf88f999c769c12c390300f1d51094252a5791930c65547e1e4b8fa33387f995d296687f9
SHA512 (dotnet-8.0.11.tar.gz.sig) = 7faef7d2fc9728117425c489bc78014ac4017394946cfbb3699817e06ff1d18ada022bfcd1c5dd2898fdc41bc2b9ff3645b83e18f2d3653e3ae9008f0b296f8a
SHA512 (dotnet-8.0.12.tar.gz) = d770a6c37de5c657d306a070c4c02c8f96b52a89184d46b946154cfcf470390f7483f8e38ea3a662d8234bc9fe8d7a1d48bf4cd144e4d3ff29fd36d36889f3a5
SHA512 (dotnet-8.0.12.tar.gz.sig) = a52d08fad89dcb94442b51e6d8529ce0ada4c3f4a2ca7f64e6f9ca7d0dbbb35a47d6fc38e94b372341fdbaf41be622a66279928573252661c854b7f495a056e9

View File

@ -6,6 +6,7 @@ prepare:
how: install
package:
- aspnetcore-runtime-8.0
- babeltrace
- bash-completion
- bc
- binutils
@ -20,6 +21,7 @@ prepare:
- libstdc++-devel
- lldb
- lttng-ust
- npm
- postgresql-odbc
- postgresql-server
- procps-ng