diff --git a/.dotnet8.0.metadata b/.dotnet8.0.metadata new file mode 100644 index 0000000..9ee3548 --- /dev/null +++ b/.dotnet8.0.metadata @@ -0,0 +1 @@ +a3656c594207a2f92901d5ecc7c9a3bae6524e40 SOURCES/dotnet-v8.0.0.tar.gz diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index f11619d..dee4901 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1 @@ -/dotnet-v3.1.101-SDK.tar.gz -/dotnet-v3.1.102-SDK.tar.gz -/dotnet-v3.1.103.2-SDK.tar.gz -/dotnet-v5.0.102-SDK-arm64-bootstrap.tar.gz -/dotnet-v5.0.102-SDK-x64-bootstrap.tar.gz -/dotnet-v5.0.102-SDK.tar.gz -/dotnet-v5.0.103-SDK.tar.gz -/dotnet-v5.0.104-SDK.tar.gz -/dotnet-v5.0.202-SDK.tar.gz -/dotnet-v5.0.203-SDK.tar.gz -/dotnet-v5.0.204-SDK.tar.gz -/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c-x64-bootstrap.tar.xz -/dotnet-arm64-prebuilts-2021-10-29.tar.gz -/dotnet-s390x-prebuilts-2021-10-29.tar.gz -/dotnet-9e8b04bbff820c93c142f99a507a46b976f5c14c.tar.gz -/dotnet-v6.0.101.tar.gz -/dotnet-v6.0.102.tar.gz -/dotnet-v6.0.103.tar.gz -/dotnet-v6.0.104.tar.gz -/dotnet-v6.0.105.tar.gz -/dotnet-v7.0.100-rc.2.22477.23-x64-bootstrap.tar.xz -/dotnet-arm64-prebuilts-2022-10-12.tar.gz -/dotnet-ppc64le-prebuilts-2022-10-21.tar.gz -/dotnet-s390x-prebuilts-2022-10-12.tar.gz -/dotnet-v7.0.100.tar.gz -/dotnet-v7.0.101.tar.gz -/dotnet-v7.0.102.tar.gz -/dotnet-v8.0.0-preview.7.23375.6-x64-bootstrap.tar.xz -/dotnet-prebuilts-8.0.100-preview.6.23330.14-arm64.tar.gz -/dotnet-prebuilts-8.0.100-preview.6.23330.14-ppc64le.tar.gz -/dotnet-prebuilts-8.0.100-preview.6.23330.14-s390x.tar.gz -/dotnet-v8.0.0-rc.1.23419.4-x64-bootstrap.tar.xz -/dotnet-prebuilts-8.0.100-rc.1.23410.12-arm64.tar.gz -/dotnet-prebuilts-8.0.100-rc.1.23410.12-ppc64le.tar.gz -/dotnet-prebuilts-8.0.100-rc.1.23410.12-s390x.tar.gz -/dotnet-v8.0.0-rc.1.23419.4.tar.gz -/dotnet-v8.0.0-rc.2.23479.6.tar.gz +SOURCES/dotnet-v8.0.0.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 42d2203..0000000 --- a/README.md +++ /dev/null @@ -1,140 +0,0 @@ -# dotnet8.0 - -This is the work in progress .NET 8.0 package for Fedora. - -Builds for Fedora, CentOS Stream and RHEL are available from -https://copr.fedorainfracloud.org/coprs/g/dotnet-sig/dotnet-preview/ - -This package is maintained by the Fedora DotNet SIG (Special Interest -Group). You can find out more about the DotNet SIG at: - -- https://fedoraproject.org/wiki/SIGs/DotNet -- https://fedoraproject.org/wiki/DotNet -- https://lists.fedoraproject.org/archives/list/dotnet-sig@lists.fedoraproject.org/ - -Please report any issues [using -bugzilla](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=dotnet7.0). - -# Specification - -This package follows [package naming and contents suggested by -upstream](https://docs.microsoft.com/en-us/dotnet/core/build/distribution-packaging), -with one exception. It installs dotnet to `/usr/lib64/dotnet` (aka -`%{_libdir}`). - -# Contributing - -The steps below are for the final package. Please only contribute to this -pre-release version this if you know what you are doing. Original instructions -follow. - -## General Changes - -1. Fork the repo. - -2. Checkout the forked repository. - - - `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet7.0.git` - - `cd dotnet7.0` - -3. Make your changes. Don't forget to add a changelog. - -4. Do local builds. - - - `fedpkg local` - -5. Fix any errors that come up and rebuild until it works locally. - -6. Do builds in koji. - - - `fedpkg scratch-build --srpm` - -8. Commit the changes to the git repo. - - - `git add` any new patches - - `git remove` any now-unnecessary patches - - `git commit -a` - - `git push` - -9. Create a pull request with your changes. - -10. Once the tests in the pull-request pass, and reviewers are happy, do a real - build. - - - `fedpkg build` - -11. For non-rawhide releases, file updates using bodhi to ship the just-built - package out to users. - - - https://bodhi.fedoraproject.org/updates/new - - OR - - - `fedpkg update` - -## Updating to an new upstream release - -1. Fork the repo. - -2. Checkout the forked repository. - - - `git clone ssh://$USER@pkgs.fedoraproject.org/forks/$USER/rpms/dotnet7.0.git` - - `cd dotnet7.0` - -3. Build the new upstream source tarball. Update the versions in the - spec file. Add a changelog. This is generally automated by the - following. - - - `./update-release ` - - If this fails because of compiler errors, you might have to figure - out a fix, then add the patch in `build-dotnet-tarball` script - rather than the spec file. - -4. Do local builds. - - - `fedpkg local` - -5. Fix any errors that come up and rebuild until it works locally. Any - patches that are needed at this point should be added to the spec file. - -6. Do builds in koji. - - - `fedpkg scratch-build --srpm` - -7. Upload the source archive to the Fedora look-aside cache. - - - `fedpkg new-sources path-to-generated-dotnet-source-tarball.tar.gz` - -8. Commit the changes to the git repo. - - - `git add` any new patches - - `git remove` any now-unnecessary patches - - `git commit -a` - - `git push` - -9. Create a pull request with your changes. - -10. Once the tests in the pull-request pass, and reviewers are happy, do a real - build. - - - `fedpkg build` - -11. For non-rawhide releases, file updates using bodhi to ship the just-built - package out to users. - - - https://bodhi.fedoraproject.org/updates/new - - OR - - - `fedpkg update` - -# Testing - -This package uses CI tests as defined in `tests/test.yml`. Creating a -pull-request or running a build will fire off tests and flag any issues. We have -enabled gating (via `gating.yaml`) on the tests. That prevents a build -that fails any test from being released until the failures are waived. - -The tests themselves are contained in this external repository: -https://github.com/redhat-developer/dotnet-regular-tests/ diff --git a/check-debug-symbols.py b/SOURCES/check-debug-symbols.py similarity index 100% rename from check-debug-symbols.py rename to SOURCES/check-debug-symbols.py diff --git a/dotnet.sh.in b/SOURCES/dotnet.sh.in similarity index 100% rename from dotnet.sh.in rename to SOURCES/dotnet.sh.in diff --git a/SOURCES/release.json b/SOURCES/release.json new file mode 100644 index 0000000..bd833ad --- /dev/null +++ b/SOURCES/release.json @@ -0,0 +1,9 @@ +{ + "release": "8.0.0", + "channel": "8.0", + "tag": "v8.0.0", + "sdkVersion": "8.0.100", + "runtimeVersion": "8.0.0", + "sourceRepository": "https://github.com/dotnet/dotnet", + "sourceVersion": "40e7f014ff784457efffa58074549735e30772ae" +} diff --git a/roslyn-analyzers-ppc64le-apphost.patch b/SOURCES/roslyn-analyzers-ppc64le-apphost.patch similarity index 100% rename from roslyn-analyzers-ppc64le-apphost.patch rename to SOURCES/roslyn-analyzers-ppc64le-apphost.patch diff --git a/vstest-intent-net8.0.patch b/SOURCES/vstest-intent-net8.0.patch similarity index 100% rename from vstest-intent-net8.0.patch rename to SOURCES/vstest-intent-net8.0.patch diff --git a/dotnet8.0.spec b/SPECS/dotnet8.0.spec similarity index 95% rename from dotnet8.0.spec rename to SPECS/dotnet8.0.spec index 27bb34c..3101ec9 100644 --- a/dotnet8.0.spec +++ b/SPECS/dotnet8.0.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_with bootstrap_dotnet # 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 @@ -8,22 +8,22 @@ %global dotnetver 8.0 -%global host_version 8.0.0-rc.2.23479.6 -%global runtime_version 8.0.0-rc.2.23479.6 -%global aspnetcore_runtime_version 8.0.0-rc.2.23480.2 -%global sdk_version 8.0.100-rc.2.23502.1 +%global host_version 8.0.0 +%global runtime_version 8.0.0 +%global aspnetcore_runtime_version 8.0.0 +%global sdk_version 8.0.100 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') -%global templates_version 8.0.0-rc.2.23480.2 +%global templates_version 8.0.0 #%%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 v8.0.0-rc.2.23479.6 +%global upstream_tag v8.0.0 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') -%global host_rpm_version 8.0.0~rc.2 -%global runtime_rpm_version 8.0.0~rc.2 -%global aspnetcore_runtime_rpm_version 8.0.0~rc.2 -%global sdk_rpm_version 8.0.100~rc.2 +%global host_rpm_version %{host_version} +%global runtime_rpm_version %{runtime_version} +%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version} +%global sdk_rpm_version %{sdk_version} %if 0%{?fedora} || 0%{?rhel} < 8 %global use_bundled_libunwind 0 @@ -54,13 +54,13 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 0.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 URL: https://github.com/dotnet/ -%if %{with bootstrap} +%if %{with bootstrap_dotnet} %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: @@ -90,25 +90,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 -# https://github.com/dotnet/runtime/pull/92274 -Patch3: runtime-92274-webcil-s390x.patch -# https://github.com/dotnet/runtime/pull/92920 -Patch4: runtime-92920-multiple-ssl-dirs.patch -# https://github.com/dotnet/source-build/issues/3673 -Patch5: dotnet-3673-rc2-version-mismatch.patch -%if 0%{?fedora} || 0%{?rhel} >= 8 ExclusiveArch: aarch64 ppc64le s390x x86_64 -%else -ExclusiveArch: x86_64 -%endif BuildRequires: clang BuildRequires: cmake BuildRequires: coreutils -%if %{without bootstrap} +%if %{without bootstrap_dotnet} BuildRequires: dotnet-sdk-%{dotnetver} BuildRequires: dotnet-sdk-%{dotnetver}-source-built-artifacts %endif @@ -379,7 +369,7 @@ if [[ ${release_json_tag} != %{upstream_tag} ]]; then exit 1 fi -%if %{without bootstrap} +%if %{without bootstrap_dotnet} %setup -q -n dotnet-%{upstream_tag_without_v} # Remove all prebuilts @@ -442,9 +432,6 @@ 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 @@ -453,7 +440,7 @@ sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_L %build cat /etc/os-release -%if %{without bootstrap} +%if %{without bootstrap_dotnet} # We need to create a copy because we will mutate this cp -a %{_libdir}/dotnet previously-built-dotnet find previously-built-dotnet @@ -501,7 +488,7 @@ export EXTRA_LDFLAGS="$LDFLAGS" export COMPlus_LTTng=0 VERBOSE=1 ./build.sh \ -%if %{without bootstrap} +%if %{without bootstrap_dotnet} --with-sdk previously-built-dotnet \ %endif %ifarch %{mono_archs} @@ -541,9 +528,12 @@ if [[ $(find %{buildroot}%{_libdir}/dotnet -name '*.pem' -print | wc -l) != 1 ]] exit 2 fi -# Install managed symbols -tar xf artifacts/%{runtime_arch}/Release/dotnet-runtime-symbols-%{runtime_id}-%{runtime_version}.tar.gz \ - -C %{buildroot}%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/ +# 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 \ + -C %{buildroot}%{_libdir}/dotnet/ +pushd %{buildroot}%{_libdir}/dotnet/ +find host/ metadata/ packs/ sdk/ sdk-manifests/ templates/ -iname '*.pdb' +popd # Fix executable permissions on files find %{buildroot}%{_libdir}/dotnet/ -type f -name 'apphost' -exec chmod +x {} \; @@ -665,31 +655,43 @@ export COMPlus_LTTng=0 %changelog +* Mon Nov 06 2023 Omair Majid - 8.0.100-2 +- Add more symbol files +- Related: RHEL-15863 + +* Mon Nov 06 2023 Omair Majid - 8.0.100-1 +- Update to .NET 8 +- Resolves: RHEL-15863 + +* Wed Oct 25 2023 Omair Majid - 8.0.100~rc.2-0.2 +- Fix runtime package version +- Related: RHEL-13838 + * Mon Oct 16 2023 Omair Majid - 8.0.100~rc.2-0.1 - Update to .NET 8 RC 2 -- Resolves: RHEL-13790 +- Resolves: RHEL-13838 + +* Fri Sep 29 2023 Omair Majid - 8.0.100~rc.1-0.5 +- Disable bootstrap +- Related: RHEL-2958 * Thu Sep 28 2023 Omair Majid - 8.0.100~rc.1-0.4 -- Disable bootstrap -- Related: RHEL-4074 +- Backport additional patches to fix s390x issues +- Related: RHEL-2958 -* Wed Sep 27 2023 Omair Majid - 8.0.100~rc.1-0.3 -- Add backported patches for additional s390x issues -- Related: RHEL-4074 - -* Mon Sep 18 2023 Omair Majid - 8.0.100~rc.1-0.2 +* Tue Sep 19 2023 Omair Majid - 8.0.100~rc.1-0.3 - Add patches to fix mono and arm64 issues - Include libmono-*.a files in the SDK - Fix CI configuration -- Related: RHEL-4074 +- Related: RHEL-2958 * Fri Sep 15 2023 Omair Majid - 8.0.100~rc.1-0.1 - Update to .NET SDK 8.0.100 RC 1 and Runtime 8.0.0 RC 1 -- Resolves: RHEL-4074 +- Related: RHEL-2958 * Tue Aug 22 2023 Omair Majid - 8.0.100~preview.7-0.2 - Add patch to work around TypeLoadException in Mono -- Related: RHBZ#2224124 +- Related: RHBZ#2228550 * Fri Aug 11 2023 Omair Majid - 8.0.100~preview.7-0.1 - Update to .NET SDK 8.0.100 Preview 7 and Runtime 8.0.0 Preview 7 diff --git a/build-arm64-bootstrap-tarball b/build-arm64-bootstrap-tarball deleted file mode 100755 index 27631ef..0000000 --- a/build-arm64-bootstrap-tarball +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -# Usage: -# ./build-arm64-bootstrap-tarball [SDK-version] - -set -euo pipefail - -set -x - -function parse-nuget-name-version-from-file() { - package=$1 - filename=${package##*/} - - version_suffix=$(echo "$filename" | grep -Eo '\.[[:digit:]]+.*\.nupkg') - version=$(echo "$version_suffix" | sed -Ee 's/^\.//' -e 's/\.nupkg$//') - name=${filename:0:(${#filename}-${#version_suffix})} - - echo "$name" "$version" -} - -bootstrap_dir=$(readlink -f "$1") - -sdk_version=${2:-$(jq -r '.tools.dotnet' "$bootstrap_dir"/global.json)} - -mkdir -p "dotnet-prebuilts-${sdk_version}-arm64" - -pushd "dotnet-prebuilts-${sdk_version}-arm64" - -# Binaries can be at one of several different URLs: -# GA releases: -if ! wget "https://dotnetcli.azureedge.net/dotnet/Sdk/${sdk_version}/dotnet-sdk-${sdk_version}-linux-arm64.tar.gz" ; then - # Preview releases: - wget "https://dotnetbuilds.azureedge.net/public/Sdk/${sdk_version}/dotnet-sdk-${sdk_version}-linux-arm64.tar.gz" -fi - -for archive in "$bootstrap_dir"/prereqs/packages/archive/*.tar.gz; do - mapfile -t linux_x64_packages < <(tar tf "$archive" | grep linux-x64) - - for package in "${linux_x64_packages[@]}"; do - if [[ "$package" = *'.Intermediate.'* ]]; then - continue; - fi - - read -r name version < <(parse-nuget-name-version-from-file "$package") - - arm_name=${name/linux-x64/linux-arm64} - - # https://gist.github.com/omajid/c04b6025de49d0b7b18ab4a7e789484e - nappo download --verbose "$arm_name" "$version" - - done -done - -popd - -tar czf "dotnet-prebuilts-${sdk_version}-arm64.tar.gz" "dotnet-prebuilts-${sdk_version}-arm64" diff --git a/build-dotnet-tarball b/build-dotnet-tarball deleted file mode 100755 index 67ac1cf..0000000 --- a/build-dotnet-tarball +++ /dev/null @@ -1,186 +0,0 @@ -#!/bin/bash - -# Usage: -# build-dotnet-tarball [--bootstrap] -# -# Creates a source archive from a tag (or commit) at -# https://github.com/dotnet/dotnet -# -# Clone dotnet/dotnet, check out the tag, and build a source-tarball. -# Can also use a full git commit identifier instead of tag (not an -# abbreviated 8 character commit identifier though). - -set -euo pipefail -IFS=$'\n\t' - -function print_usage { - echo "Usage:" - echo "$0 [--bootstrap] " - echo - echo "Creates a source archive from a tag at https://github.com/dotnet/dotnet" - echo "" - echo " --bootstrap build a source tarball usable for bootstrapping .NET" -} - -function clean_dotnet_cache { - rm -rf ~/.aspnet ~/.dotnet/ ~/.nuget/ ~/.local/share/NuGet ~/.templateengine - rm -rf /tmp/NuGet /tmp/NuGetScratch /tmp/.NETCore* /tmp/.NETStandard* /tmp/.dotnet /tmp/dotnet.* /tmp/clr-debug-pipe* /tmp/Razor-Server /tmp/CoreFxPipe* /tmp/VBCSCompiler /tmp/.NETFramework* - rm -rf ~/.npm/ -} - -function check_bootstrap_environment { - if rpm -qa | grep dotnet ; then - echo "error: dotnet is installed. Not a good idea for bootstrapping." - exit 1 - fi - if [ -d /usr/lib/dotnet ] || [ -d /usr/lib64/dotnet ] || [ -d /usr/share/dotnet ] ; then - echo "error: one of /usr/lib/dotnet /usr/lib64/dotnet or /usr/share/dotnet/ exists. Not a good idea for bootstrapping." - exit 1 - fi - if command -v dotnet ; then - echo "error: dotnet is in $PATH. Not a good idea for bootstrapping." - exit 1 - fi -} - -function runtime_id { - - source /etc/os-release - case "${ID}" in - # Remove the RHEL minor version - rhel) rid_version=${VERSION_ID%.*} ;; - - *) rid_version=${VERSION_ID} ;; - esac - - echo "${ID}.${rid_version}-${arch}" -} - -build_bootstrap=false - -declare -A archmap -archmap=( - ["aarch64"]="arm64" - ["amd64"]="x64" - ["armv8l"]="arm" - ["i386"]="x86" - ["i686"]="x86" - ["ppc64le"]="ppc64le" - ["s390x"]="s390x" - ["x86_64"]="x64" -) - -arch=${archmap["$(uname -m)"]} - - -positional_args=() -while [[ "$#" -gt 0 ]]; do - arg="${1}" - case "${arg}" in - --bootstrap) - check_bootstrap_environment - build_bootstrap=true - shift - ;; - -h|--help) - print_usage - exit 0 - ;; - *) - positional_args+=("$1") - shift - ;; - esac -done - - -tag=${positional_args[0]:-} -if [[ -z ${tag} ]]; then - echo "error: missing tag to build" - exit 1 -fi - -set -x - -dir_name="dotnet-${tag}" -unmodified_tarball_name="${dir_name}-original" -tarball_name="${dir_name}" -tarball_suffix=.tar.gz - -if [[ ${build_bootstrap} == true ]]; then - unmodified_tarball_name="${unmodified_tarball_name}-${arch}-bootstrap" - tarball_name="${tarball_name}-${arch}-bootstrap" - tarball_suffix=.tar.xz -fi - -if [ -f "${tarball_name}${tarball_suffix}" ]; then - echo "error: ${tarball_name}${tarball_suffix} already exists" - exit 1 -fi - -if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then - wget https://github.com/dotnet/dotnet/archive/refs/tags/${tag}.tar.gz - mv "${tag}.tar.gz" "${unmodified_tarball_name}.tar.gz" - - #temp_dir=$(mktemp -d -p "$(pwd)" -t temp-build-dotnet-tarball-XXXXXXXXXX) - #pushd "${temp_dir}" - #mkdir dotnet - #pushd dotnet - #git init - #git remote add origin https://github.com/dotnet/dotnet - #git fetch --depth 1 origin "${tag}" - #git checkout FETCH_HEAD - #git submodule update --init --recursive - #clean_dotnet_cache - #./eng/pack-sources.sh -o "$(readlink -f ../../"${unmodified_tarball_name}.tar.gz")" - #popd - #popd - - #rm -rf "${temp_dir}" - -fi - -tar tf "${unmodified_tarball_name}".tar.gz > .tarball_file_list -extracted_tarball_root=$(head -1 .tarball_file_list | cut -d/ -f 1) -if [[ "$extracted_tarball_root" == "."* ]]; then - echo "error: can't find main directory in the dotnet tarball" - exit 1 -fi -if [[ $(grep -cv "^${extracted_tarball_root}/" .tarball_file_list) -gt 0 ]]; then - echo "error: tarball doesn't have a single main directory" - exit 1 -fi -rm .tarball_file_list - -rm -rf "${tarball_name}" -rm -rf "${extracted_tarball_root}" -tar xf "${unmodified_tarball_name}.tar.gz" -mv "${extracted_tarball_root}" "${tarball_name}" - -pushd "${tarball_name}" - -if [[ ${build_bootstrap} == true ]]; then - ./prep.sh --bootstrap -else - find . -type f -iname '*.tar.gz' -delete - rm -rf .dotnet -fi - -# Remove files with funny licenses and crypto implementations and -# other not-very-useful artifacts. We MUST NOT ship any files that -# have unapproved licenses and unexpected cryptographic -# implementations. -# -# We use rm -r (no -f) to make sure the operation fails if the files -# are not at the expected locations. If the files are not at the -# expected location, we need to find the new location of the files and -# delete them, or verify that upstream has already removed the files. - -popd - -# if [[ ${build_bootstrap} == true ]]; then -# tar -I 'xz -9 -T 0' -cf "${tarball_name}${tarball_suffix}" "${tarball_name}" -# else -# tar -czf "${tarball_name}${tarball_suffix}" "${tarball_name}" -# fi -tar -czf "${tarball_name}${tarball_suffix}" "${tarball_name}" diff --git a/copr-build b/copr-build deleted file mode 100755 index 2ee2805..0000000 --- a/copr-build +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -set -x - -fedpkg --release f37 srpm 2>&1 | tee fedpkg.output - -srpm_name=$(grep 'Wrote: ' fedpkg.output | cut -d' ' -f 2) - -ls -alh "${srpm_name}" - -copr-cli --debug build @dotnet-sig/dotnet-preview "${srpm_name}" --timeout 36000 diff --git a/dotnet-3673-rc2-version-mismatch.patch b/dotnet-3673-rc2-version-mismatch.patch deleted file mode 100644 index d277252..0000000 --- a/dotnet-3673-rc2-version-mismatch.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Tue, 24 Oct 2023 16:20:26 -0500 -Subject: [PATCH] Use correct runtime package version - ---- - prereqs/git-info/AllRepoVersions.props | 2 +- - prereqs/git-info/runtime.props | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/prereqs/git-info/AllRepoVersions.props b/prereqs/git-info/AllRepoVersions.props -index 79a789e1cd..a3f3ccf094 100644 ---- a/prereqs/git-info/AllRepoVersions.props -+++ b/prereqs/git-info/AllRepoVersions.props -@@ -32,7 +32,7 @@ - bdd9c5ba66b00beebdc3516acc5e29b83efd89af - 4.8.0-3.23471.11 - 0b25e38ad32a69cd83ae246104b32449203cc71c -- 8.0.0-rc.2.23475.17 -+ 8.0.0-rc.2.23479.6 - 67e671f384bee6937630b52b02cc78e69b27e280 - 8.0.100-rc.2.23480.5 - 6dbf3aaa0fc9664df86462f5c70b99800934fccd -diff --git a/prereqs/git-info/runtime.props b/prereqs/git-info/runtime.props -index 546469c3a0..20c2bf8840 100644 ---- a/prereqs/git-info/runtime.props -+++ b/prereqs/git-info/runtime.props -@@ -2,8 +2,8 @@ - - - 0b25e38ad32a69cd83ae246104b32449203cc71c -- 20230925.17 -- 8.0.0-rc.2.23475.17 -+ 20230929.6 -+ 8.0.0-rc.2.23479.6 - rc.2 - false - diff --git a/dotnet7.0.rpmlintrc b/dotnet7.0.rpmlintrc deleted file mode 100644 index 1396c43..0000000 --- a/dotnet7.0.rpmlintrc +++ /dev/null @@ -1,35 +0,0 @@ -# Tarball is generated, no upstream URL -addFilter("W:.*invalid-url Source0: dotnet-.*tar.gz") - -# macOS is the correct name -addFilter("W: spelling-error %description -l en_US macOS ->.*") -# The name of the nuget package includes NETCore -addFilter("W: spelling-error .* NETCore -> Net Core.*") - -# Upstream really has no README or documentation files. They suggest using online resources. -addFilter("W: no-documentation") - -# This is a script that we run; it's expected to have execute permissions -addFilter("W: strange-permission check-debug-symbols.py") - -# libicu is a required dependency, but it's used via a dlopen() -addFilter("E: explicit-lib-dependency libicu") - -# There's no devel package for us to place .h files -addFilter("W: devel-file-in-non-devel-package /usr/lib64/dotnet/.*\.h") -addFilter("W: devel-file-in-non-devel-package /usr/lib64/dotnet/.*\.a") - -# These paths are non-standard, so we need $ORIGIN to find these libraries -addFilter("E: binary-or-shlib-defines-rpath /usr/lib64/dotnet/.*\['\$ORIGIN/netcoredeps'\]") -addFilter("E: binary-or-shlib-defines-rpath /usr/lib64/dotnet/.*\['\$ORIGIN'\]") - -# We put dll files in /usr/lib/dotnet, but rpmlint somehow doesn't see it as a binary? -addFilter("W: only-non-binary-in-usr-lib") - -# We use a number of zero-length files, including _._ -addFilter("E: zero-length /usr/lib64/dotnet/.*/_\._") - -# Upstream uses hidden files, even though we ask them not to, as much as possible -addFilter("W: hidden-file-or-dir /usr/lib64/dotnet/.*/\.version") -addFilter("W: hidden-file-or-dir /usr/lib64/dotnet/.*/\.toolsetversion") - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index b7ab3d1..0000000 --- a/gating.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_testing -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} ---- !Policy -product_versions: - - rhel-* -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.other-archs.functional} diff --git a/release.json b/release.json deleted file mode 100644 index c2cfe24..0000000 --- a/release.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "release": "8.0.0-rc.2", - "channel": "8.0", - "tag": "v8.0.0-rc.2.23479.6", - "sdkVersion": "8.0.100-rc.2.23502.2", - "runtimeVersion": "8.0.0-rc.2.23479.6", - "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "1e872358329855089d8d14cec1f06d5b075824b5" -} diff --git a/rpminspect.yaml b/rpminspect.yaml deleted file mode 100644 index 9293249..0000000 --- a/rpminspect.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -inspections: - # We patch upstream a lot, no need to reject patches - patches: off -badfuncs: - allowed: - # The Mono runtime (used on s390x, for example), uses inet_addr for - # debugging (such as sending the control flow graph to a remote process). - # See runtime/src/mono/mono/mini/cfgdump.c. This isn't part of any - # standard networking facility; networking APIs are implemented/used in - # libSystem*so. - /usr/lib64/dotnet/shared/Microsoft.NETCore.App/*/libcoreclr.so: - - inet_addr - /usr/lib64/dotnet/packs/Microsoft.NETCore.App.Runtime.*/*/runtimes/*/native/libcoreclr.so: - - inet_addr -runpath: - # Upstream explicitly sets $ORIGIN/netcoredeps as an RPATH - # See https://github.com/dotnet/core/blob/main/Documentation/self-contained-linux-apps.md - allowed_origin_paths: - - /netcoredeps diff --git a/runtime-92274-webcil-s390x.patch b/runtime-92274-webcil-s390x.patch deleted file mode 100644 index 1a39223..0000000 --- a/runtime-92274-webcil-s390x.patch +++ /dev/null @@ -1,260 +0,0 @@ -From 72f310a6c3dccbabf9edc29677b51ed78c87cc67 Mon Sep 17 00:00:00 2001 -From: Sanjam Panda -Date: Tue, 19 Sep 2023 15:16:02 +0200 -Subject: [PATCH 1/3] [wasm] Endian fix for Webcil - -'dotnet new blazorwasm' command failed on s390x and was throwing a not implemented exception - -The issue was with with the WebCil writer and reader, specific endianness conversions relating to the webcil payload were not implemented for big endian machines. - -We considered fixing the generic implementation, but there were only two structures in use: WebcilHeader and WebcilSectionHeader, so it was easier to handle them explicitly. ---- - .../Microsoft.NET.WebAssembly.Webcil.csproj | 1 + - .../WebcilConverter.cs | 35 +++++++++++++----- - .../WebcilReader.cs | 37 +++++++++++++++---- - 3 files changed, 57 insertions(+), 16 deletions(-) - -diff --git a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj -index c35eb57e80686..d09ae4a569a59 100644 ---- a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj -+++ b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj -@@ -16,6 +16,7 @@ - - - -+ - - - -diff --git a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs -index a38af7270a2da..7b882c42d579e 100644 ---- a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs -+++ b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs -@@ -2,6 +2,7 @@ - // The .NET Foundation licenses this file to you under the MIT license. - - using System; -+using System.Buffers.Binary; - using System.IO; - using System.Collections.Immutable; - using System.Reflection.PortableExecutable; -@@ -181,9 +182,6 @@ private static void WriteHeader(Stream s, WebcilHeader header) - - private static void WriteSectionHeaders(Stream s, ImmutableArray sectionsHeaders) - { -- // FIXME: fixup endianness -- if (!BitConverter.IsLittleEndian) -- throw new NotImplementedException(); - foreach (var sectionHeader in sectionsHeaders) - { - WriteSectionHeader(s, sectionHeader); -@@ -192,16 +190,38 @@ private static void WriteSectionHeaders(Stream s, ImmutableArray(Stream s, T structure) - where T : unmanaged - { -- // FIXME: fixup endianness -- if (!BitConverter.IsLittleEndian) -- throw new NotImplementedException(); - unsafe - { - byte* p = (byte*)&structure; -@@ -212,9 +232,6 @@ private static void WriteStructure(Stream s, T structure) - private static void WriteStructure(Stream s, T structure) - where T : unmanaged - { -- // FIXME: fixup endianness -- if (!BitConverter.IsLittleEndian) -- throw new NotImplementedException(); - int size = Marshal.SizeOf(); - byte[] buffer = new byte[size]; - IntPtr ptr = IntPtr.Zero; -diff --git a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilReader.cs b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilReader.cs -index 4f42f82798664..ac4f9d86095a9 100644 ---- a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilReader.cs -+++ b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilReader.cs -@@ -6,7 +6,7 @@ - using System.IO; - using System.Reflection; - using System.Runtime.InteropServices; -- -+using System.Buffers.Binary; - using System.Reflection.Metadata; - using System.Reflection.PortableExecutable; - -@@ -63,14 +63,20 @@ private unsafe bool ReadHeader() - { - return false; - } -- if (!BitConverter.IsLittleEndian) -- { -- throw new NotImplementedException("TODO: implement big endian support"); -- } - fixed (byte* p = buffer) - { - header = *(WebcilHeader*)p; - } -+ if (!BitConverter.IsLittleEndian) -+ { -+ header.version_major = BinaryPrimitives.ReverseEndianness(header.version_major); -+ header.version_minor = BinaryPrimitives.ReverseEndianness(header.version_minor); -+ header.coff_sections = BinaryPrimitives.ReverseEndianness(header.coff_sections); -+ header.pe_cli_header_rva = BinaryPrimitives.ReverseEndianness(header.pe_cli_header_rva); -+ header.pe_cli_header_size = BinaryPrimitives.ReverseEndianness(header.pe_cli_header_size); -+ header.pe_debug_rva = BinaryPrimitives.ReverseEndianness(header.pe_debug_rva); -+ header.pe_debug_rva = BinaryPrimitives.ReverseEndianness(header.pe_debug_size); -+ } - if (header.id[0] != 'W' || header.id[1] != 'b' - || header.id[2] != 'I' || header.id[3] != 'L' - || header.version_major != Internal.Constants.WC_VERSION_MAJOR -@@ -346,6 +352,7 @@ private long TranslateRVA(uint rva) - - private unsafe ImmutableArray ReadSections() - { -+ WebcilSectionHeader secheader; - var sections = ImmutableArray.CreateBuilder(_header.coff_sections); - var buffer = new byte[Marshal.SizeOf()]; - _stream.Seek(SectionDirectoryOffset + _webcilInWasmOffset, SeekOrigin.Begin); -@@ -357,8 +364,24 @@ private unsafe ImmutableArray ReadSections() - } - fixed (byte* p = buffer) - { -- // FIXME endianness -- sections.Add(*(WebcilSectionHeader*)p); -+ secheader = (*(WebcilSectionHeader*)p); -+ } -+ if (!BitConverter.IsLittleEndian) -+ { -+ sections.Add -+ ( -+ new WebcilSectionHeader -+ ( -+ virtualSize: BinaryPrimitives.ReverseEndianness(secheader.VirtualSize), -+ virtualAddress: BinaryPrimitives.ReverseEndianness(secheader.VirtualAddress), -+ sizeOfRawData: BinaryPrimitives.ReverseEndianness(secheader.SizeOfRawData), -+ pointerToRawData: BinaryPrimitives.ReverseEndianness(secheader.PointerToRawData) -+ ) -+ ); -+ } -+ else -+ { -+ sections.Add(secheader); - } - } - return sections.MoveToImmutable(); - -From 0c78184347335db183a38cf6bd26e2fe69160931 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Aleksey=20Kliger=20=28=CE=BBgeek=29?= -Date: Thu, 21 Sep 2023 14:31:12 -0400 -Subject: [PATCH 2/3] Fix infinite recursion - ---- - .../WebcilConverter.cs | 25 ++++++++----------- - 1 file changed, 10 insertions(+), 15 deletions(-) - -diff --git a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs -index 7b882c42d579e..fc95eded5bc33 100644 ---- a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs -+++ b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs -@@ -177,6 +177,16 @@ public unsafe void GatherInfo(PEReader peReader, out WCFileInfo wcInfo, out PEFi - - private static void WriteHeader(Stream s, WebcilHeader header) - { -+ if (!BitConverter.IsLittleEndian) -+ { -+ webcilHeader.version_major = BinaryPrimitives.ReverseEndianness(webcilHeader.version_major); -+ webcilHeader.version_minor = BinaryPrimitives.ReverseEndianness(webcilHeader.version_minor); -+ webcilHeader.coff_sections = BinaryPrimitives.ReverseEndianness(webcilHeader.coff_sections); -+ webcilHeader.pe_cli_header_rva = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_cli_header_rva); -+ webcilHeader.pe_cli_header_size = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_cli_header_size); -+ webcilHeader.pe_debug_rva = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_debug_rva); -+ webcilHeader.pe_debug_size = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_debug_size); -+ } - WriteStructure(s, header); - } - -@@ -203,21 +213,6 @@ private static void WriteSectionHeader(Stream s, WebcilSectionHeader sectionHead - WriteStructure(s, sectionHeader); - } - -- private static void WriteStructure(Stream s, WebcilHeader webcilHeader) -- { -- if (!BitConverter.IsLittleEndian) -- { -- webcilHeader.version_major = BinaryPrimitives.ReverseEndianness(webcilHeader.version_major); -- webcilHeader.version_minor = BinaryPrimitives.ReverseEndianness(webcilHeader.version_minor); -- webcilHeader.coff_sections = BinaryPrimitives.ReverseEndianness(webcilHeader.coff_sections); -- webcilHeader.pe_cli_header_rva = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_cli_header_rva); -- webcilHeader.pe_cli_header_size = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_cli_header_size); -- webcilHeader.pe_debug_rva = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_debug_rva); -- webcilHeader.pe_debug_size = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_debug_size); -- } -- WriteStructure(s, webcilHeader); -- } -- - #if NETCOREAPP2_1_OR_GREATER - private static void WriteStructure(Stream s, T structure) - where T : unmanaged - -From cecf4f09f0c52340c753811098f0f2d9593049aa Mon Sep 17 00:00:00 2001 -From: Aleksey Kliger -Date: Thu, 21 Sep 2023 14:36:20 -0400 -Subject: [PATCH 3/3] rename var - ---- - src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs -index fc95eded5bc33..13c34bde4b8ea 100644 ---- a/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs -+++ b/src/runtime/src/tasks/Microsoft.NET.WebAssembly.Webcil/WebcilConverter.cs -@@ -175,7 +175,7 @@ public unsafe void GatherInfo(PEReader peReader, out WCFileInfo wcInfo, out PEFi - SectionStart: firstWCSection); - } - -- private static void WriteHeader(Stream s, WebcilHeader header) -+ private static void WriteHeader(Stream s, WebcilHeader webcilHeader) - { - if (!BitConverter.IsLittleEndian) - { -@@ -187,7 +187,7 @@ private static void WriteHeader(Stream s, WebcilHeader header) - webcilHeader.pe_debug_rva = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_debug_rva); - webcilHeader.pe_debug_size = BinaryPrimitives.ReverseEndianness(webcilHeader.pe_debug_size); - } -- WriteStructure(s, header); -+ WriteStructure(s, webcilHeader); - } - - private static void WriteSectionHeaders(Stream s, ImmutableArray sectionsHeaders) diff --git a/runtime-92920-multiple-ssl-dirs.patch b/runtime-92920-multiple-ssl-dirs.patch deleted file mode 100644 index 8ea9c77..0000000 --- a/runtime-92920-multiple-ssl-dirs.patch +++ /dev/null @@ -1,416 +0,0 @@ -From 9aec1e3b0b9ddc02b81bd115399f8951288b261b Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Wed, 11 Oct 2023 18:32:20 +0200 -Subject: [PATCH] Support specifying multiple directories through SSL_CERT_DIR - -Co-authored-by: Jeremy Barton -Co-authored-by: Kevin Jones ---- - .../OpenSslCachedSystemStoreProvider.cs | 232 +++++++++--------- - .../X509Certificates/X509StoreTests.Unix.cs | 42 +++- - 2 files changed, 157 insertions(+), 117 deletions(-) - -diff --git a/src/runtime/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/OpenSslCachedSystemStoreProvider.cs b/src/runtime/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/OpenSslCachedSystemStoreProvider.cs -index 4c9643c01e2..e66b3d1ad11 100644 ---- a/src/runtime/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/OpenSslCachedSystemStoreProvider.cs -+++ b/src/runtime/src/libraries/System.Security.Cryptography/src/System/Security/Cryptography/X509Certificates/OpenSslCachedSystemStoreProvider.cs -@@ -21,14 +21,14 @@ internal sealed class OpenSslCachedSystemStoreProvider : IStorePal - private static readonly TimeSpan s_lastWriteRecheckInterval = TimeSpan.FromSeconds(5); - private static readonly TimeSpan s_assumeInvalidInterval = TimeSpan.FromMinutes(5); - private static readonly Stopwatch s_recheckStopwatch = new Stopwatch(); -- private static DirectoryInfo? s_rootStoreDirectoryInfo = SafeOpenRootDirectoryInfo(); -+ private static string[]? s_rootStoreDirectories; - private static bool s_defaultRootDir; -- private static readonly FileInfo? s_rootStoreFileInfo = SafeOpenRootFileInfo(); -+ private static string? s_rootStoreFile; -+ private static DateTime[]? s_directoryLastWrite; -+ private static DateTime s_fileLastWrite; - - // Use non-Value-Tuple so that it's an atomic update. - private static Tuple? s_nativeCollections; -- private static DateTime s_directoryCertsLastWrite; -- private static DateTime s_fileCertsLastWrite; - - private readonly bool _isRoot; - -@@ -93,18 +93,11 @@ public void Remove(ICertificatePal cert) - { - lock (s_recheckStopwatch) - { -- FileInfo? fileInfo = s_rootStoreFileInfo; -- DirectoryInfo? dirInfo = s_rootStoreDirectoryInfo; -- -- fileInfo?.Refresh(); -- dirInfo?.Refresh(); -- - if (ret == null || - elapsed > s_assumeInvalidInterval || -- (fileInfo != null && fileInfo.Exists && ContentWriteTime(fileInfo) != s_fileCertsLastWrite) || -- (dirInfo != null && dirInfo.Exists && ContentWriteTime(dirInfo) != s_directoryCertsLastWrite)) -+ LastWriteTimesHaveChanged()) - { -- ret = LoadMachineStores(dirInfo, fileInfo); -+ ret = LoadMachineStores(); - } - } - } -@@ -113,9 +106,37 @@ public void Remove(ICertificatePal cert) - return ret; - } - -- private static Tuple LoadMachineStores( -- DirectoryInfo? rootStorePath, -- FileInfo? rootStoreFile) -+ private static bool LastWriteTimesHaveChanged() -+ { -+ Debug.Assert( -+ Monitor.IsEntered(s_recheckStopwatch), -+ "LastWriteTimesHaveChanged assumes a lock(s_recheckStopwatch)"); -+ -+ if (s_rootStoreFile != null) -+ { -+ _ = TryStatFile(s_rootStoreFile, out DateTime lastModified); -+ if (lastModified != s_fileLastWrite) -+ { -+ return true; -+ } -+ } -+ -+ if (s_rootStoreDirectories != null && s_directoryLastWrite != null) -+ { -+ for (int i = 0; i < s_rootStoreDirectories.Length; i++) -+ { -+ _ = TryStatDirectory(s_rootStoreDirectories[i], out DateTime lastModified); -+ if (lastModified != s_directoryLastWrite[i]) -+ { -+ return true; -+ } -+ } -+ } -+ -+ return false; -+ } -+ -+ private static Tuple LoadMachineStores() - { - Debug.Assert( - Monitor.IsEntered(s_recheckStopwatch), -@@ -126,61 +147,76 @@ public void Remove(ICertificatePal cert) - SafeX509StackHandle intermedStore = Interop.Crypto.NewX509Stack(); - Interop.Crypto.CheckValidOpenSslHandle(intermedStore); - -- DateTime newFileTime = default; -- DateTime newDirTime = default; -- - var uniqueRootCerts = new HashSet(); - var uniqueIntermediateCerts = new HashSet(); - bool firstLoad = (s_nativeCollections == null); - -- if (rootStoreFile != null && rootStoreFile.Exists) -+ if (firstLoad) - { -- newFileTime = ContentWriteTime(rootStoreFile); -- ProcessFile(rootStoreFile); -+ s_rootStoreDirectories = GetRootStoreDirectories(out s_defaultRootDir); -+ s_directoryLastWrite = new DateTime[s_rootStoreDirectories.Length]; -+ s_rootStoreFile = GetRootStoreFile(); -+ } -+ else -+ { -+ Debug.Assert(s_rootStoreDirectories is not null); -+ Debug.Assert(s_directoryLastWrite is not null); -+ } -+ -+ if (s_rootStoreFile != null) -+ { -+ ProcessFile(s_rootStoreFile, out s_fileLastWrite); - } - - bool hasStoreData = false; - -- if (rootStorePath != null && rootStorePath.Exists) -+ for (int i = 0; i < s_rootStoreDirectories.Length; i++) - { -- newDirTime = ContentWriteTime(rootStorePath); -- hasStoreData = ProcessDir(rootStorePath); -+ hasStoreData = ProcessDir(s_rootStoreDirectories[i], out s_directoryLastWrite[i]); - } - - if (firstLoad && !hasStoreData && s_defaultRootDir) - { -- DirectoryInfo etcSslCerts = new DirectoryInfo("/etc/ssl/certs"); -- -- if (etcSslCerts.Exists) -+ const string DefaultCertDir = "/etc/ssl/certs"; -+ hasStoreData = ProcessDir(DefaultCertDir, out DateTime lastModified); -+ if (hasStoreData) - { -- DateTime tmpTime = ContentWriteTime(etcSslCerts); -- hasStoreData = ProcessDir(etcSslCerts); -- -- if (hasStoreData) -- { -- newDirTime = tmpTime; -- s_rootStoreDirectoryInfo = etcSslCerts; -- } -+ s_rootStoreDirectories = new[] { DefaultCertDir }; -+ s_directoryLastWrite = new[] { lastModified }; - } - } - -- bool ProcessDir(DirectoryInfo dir) -+ bool ProcessDir(string dir, out DateTime lastModified) - { -+ if (!TryStatDirectory(dir, out lastModified)) -+ { -+ return false; -+ } -+ - bool hasStoreData = false; - -- foreach (FileInfo file in dir.EnumerateFiles()) -+ foreach (string file in Directory.EnumerateFiles(dir)) - { -- hasStoreData |= ProcessFile(file); -+ hasStoreData |= ProcessFile(file, out _, skipStat: true); - } - - return hasStoreData; - } - -- bool ProcessFile(FileInfo file) -+ bool ProcessFile(string file, out DateTime lastModified, bool skipStat = false) - { - bool readData = false; - -- using (SafeBioHandle fileBio = Interop.Crypto.BioNewFile(file.FullName, "rb")) -+ if (skipStat) -+ { -+ lastModified = default; -+ } -+ else if (!TryStatFile(file, out lastModified)) -+ { -+ return false; -+ } -+ -+ using (SafeBioHandle fileBio = Interop.Crypto.BioNewFile(file, "rb")) - { - // The handle may be invalid, for example when we don't have read permission for the file. - if (fileBio.IsInvalid) -@@ -274,114 +310,78 @@ bool ProcessFile(FileInfo file) - // on every call. - - Volatile.Write(ref s_nativeCollections, newCollections); -- s_directoryCertsLastWrite = newDirTime; -- s_fileCertsLastWrite = newFileTime; - s_recheckStopwatch.Restart(); - return newCollections; - } - -- private static FileInfo? SafeOpenRootFileInfo() -+ private static string? GetRootStoreFile() - { - string? rootFile = Interop.Crypto.GetX509RootStoreFile(); - - if (!string.IsNullOrEmpty(rootFile)) - { -- try -- { -- return new FileInfo(rootFile); -- } -- catch (ArgumentException) -- { -- // If SSL_CERT_FILE is set to the empty string, or anything else which gives -- // "The path is not of a legal form", then the GetX509RootStoreFile value is ignored. -- } -+ return Path.GetFullPath(rootFile); - } - - return null; - } - -- private static DirectoryInfo? SafeOpenRootDirectoryInfo() -+ private static string[] GetRootStoreDirectories(out bool isDefault) - { -- string? rootDirectory = Interop.Crypto.GetX509RootStorePath(out s_defaultRootDir); -+ string rootDirectory = Interop.Crypto.GetX509RootStorePath(out isDefault) ?? ""; - -- if (!string.IsNullOrEmpty(rootDirectory)) -- { -- try -- { -- return new DirectoryInfo(rootDirectory); -- } -- catch (ArgumentException) -- { -- // If SSL_CERT_DIR is set to the empty string, or anything else which gives -- // "The path is not of a legal form", then the GetX509RootStoreFile value is ignored. -- } -- } -- -- return null; -- } -- -- private static DateTime ContentWriteTime(FileInfo info) -- { -- string path = info.FullName; -- string? target = Interop.Sys.ReadLink(path); -- -- if (string.IsNullOrEmpty(target)) -- { -- return info.LastWriteTimeUtc; -- } -+ string[] directories = rootDirectory.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries); - -- if (target[0] != '/') -+ for (int i = 0; i < directories.Length; i++) - { -- target = Path.Join(info.Directory?.FullName, target); -+ directories[i] = Path.GetFullPath(directories[i]); - } - -- try -+ // Remove duplicates. -+ if (directories.Length > 1) - { -- var targetInfo = new FileInfo(target); -- -- if (targetInfo.Exists) -+ var set = new HashSet(directories, StringComparer.Ordinal); -+ if (set.Count != directories.Length) - { -- return targetInfo.LastWriteTimeUtc; -+ // Preserve the original order. -+ string[] directoriesTrimmed = new string[set.Count]; -+ int j = 0; -+ for (int i = 0; i < directories.Length; i++) -+ { -+ string directory = directories[i]; -+ if (set.Remove(directory)) -+ { -+ directoriesTrimmed[j++] = directory; -+ } -+ } -+ Debug.Assert(set.Count == 0); -+ directories = directoriesTrimmed; - } - } -- catch (ArgumentException) -- { -- // If we can't load information about the link path, just treat it as not a link. -- } - -- return info.LastWriteTimeUtc; -+ return directories; - } - -- private static DateTime ContentWriteTime(DirectoryInfo info) -- { -- string path = info.FullName; -- string? target = Interop.Sys.ReadLink(path); -- -- if (string.IsNullOrEmpty(target)) -- { -- return info.LastWriteTimeUtc; -- } -+ private static bool TryStatFile(string path, out DateTime lastModified) -+ => TryStat(path, Interop.Sys.FileTypes.S_IFREG, out lastModified); - -- if (target[0] != '/') -- { -- target = Path.Join(info.Parent?.FullName, target); -- } -+ private static bool TryStatDirectory(string path, out DateTime lastModified) -+ => TryStat(path, Interop.Sys.FileTypes.S_IFDIR, out lastModified); - -- try -- { -- var targetInfo = new DirectoryInfo(target); -+ private static bool TryStat(string path, int fileType, out DateTime lastModified) -+ { -+ lastModified = default; - -- if (targetInfo.Exists) -- { -- return targetInfo.LastWriteTimeUtc; -- } -- } -- catch (ArgumentException) -+ Interop.Sys.FileStatus status; -+ // Use Stat to follow links. -+ if (Interop.Sys.Stat(path, out status) < 0 || -+ (status.Mode & Interop.Sys.FileTypes.S_IFMT) != fileType) - { -- // If we can't load information about the link path, just treat it as not a link. -+ return false; - } - -- return info.LastWriteTimeUtc; -+ lastModified = DateTime.UnixEpoch + TimeSpan.FromTicks(status.MTime * TimeSpan.TicksPerSecond + status.MTimeNsec / TimeSpan.NanosecondsPerTick); -+ return true; - } - } - } -diff --git a/src/runtime/src/libraries/System.Security.Cryptography/tests/X509Certificates/X509StoreTests.Unix.cs b/src/runtime/src/libraries/System.Security.Cryptography/tests/X509Certificates/X509StoreTests.Unix.cs -index 0efb6c12028..f460d6b9bd6 100644 ---- a/src/runtime/src/libraries/System.Security.Cryptography/tests/X509Certificates/X509StoreTests.Unix.cs -+++ b/src/runtime/src/libraries/System.Security.Cryptography/tests/X509Certificates/X509StoreTests.Unix.cs -@@ -10,7 +10,6 @@ namespace System.Security.Cryptography.X509Certificates.Tests - { - public partial class X509StoreTests - { -- - [ConditionalFact(nameof(NotRunningAsRootAndRemoteExecutorSupported))] // root can read '2.pem' - [PlatformSpecific(TestPlatforms.Linux)] // Windows/OSX doesn't use SSL_CERT_{DIR,FILE}. - private void X509Store_MachineStoreLoadSkipsInvalidFiles() -@@ -50,6 +49,47 @@ private void X509Store_MachineStoreLoadSkipsInvalidFiles() - }, new RemoteInvokeOptions { StartInfo = psi }).Dispose(); - } - -+ [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))] -+ [PlatformSpecific(TestPlatforms.Linux)] // Windows/OSX doesn't use SSL_CERT_{DIR,FILE}. -+ private void X509Store_MachineStoreLoadsMutipleSslCertDirectories() -+ { -+ // Create 3 certificates and place them in two directories that will be passed -+ // using SSL_CERT_DIR. -+ string sslCertDir1 = GetTestFilePath(); -+ Directory.CreateDirectory(sslCertDir1); -+ File.WriteAllBytes(Path.Combine(sslCertDir1, "1.pem"), TestData.SelfSigned1PemBytes); -+ File.WriteAllBytes(Path.Combine(sslCertDir1, "2.pem"), TestData.SelfSigned2PemBytes); -+ string sslCertDir2 = GetTestFilePath(); -+ Directory.CreateDirectory(sslCertDir2); -+ File.WriteAllBytes(Path.Combine(sslCertDir2, "3.pem"), TestData.SelfSigned3PemBytes); -+ -+ // Add a non-existing directory after each valid directory to verify they are ignored. -+ string sslCertDir = string.Join(Path.PathSeparator, -+ new[] { -+ sslCertDir1, -+ sslCertDir2, -+ "", // empty string -+ sslCertDir2, // duplicate directory -+ "/invalid2", // path that does not exist -+ }); -+ -+ var psi = new ProcessStartInfo(); -+ psi.Environment.Add("SSL_CERT_DIR", sslCertDir); -+ // Set SSL_CERT_FILE to avoid loading the default bundle file. -+ psi.Environment.Add("SSL_CERT_FILE", "/nonexisting"); -+ RemoteExecutor.Invoke(() => -+ { -+ Assert.NotNull(Environment.GetEnvironmentVariable("SSL_CERT_DIR")); -+ using (var store = new X509Store(StoreName.Root, StoreLocation.LocalMachine)) -+ { -+ store.Open(OpenFlags.OpenExistingOnly); -+ -+ // Check nr of certificates in store. -+ Assert.Equal(3, store.Certificates.Count); -+ } -+ }, new RemoteInvokeOptions { StartInfo = psi }).Dispose(); -+ } -+ - public static bool NotRunningAsRootAndRemoteExecutorSupported => !Environment.IsPrivilegedProcess && RemoteExecutor.IsSupported; - } - } --- -2.41.0 - diff --git a/sources b/sources deleted file mode 100644 index 4876193..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (dotnet-v8.0.0-rc.2.23479.6.tar.gz) = 604220e91cfb3b0909b5127ed6b53b0a661f6258dd87068e5eb2f589729fb7b634ce934967e821075f027e0d2e12d15595a2fff57099efba036f760c6eb79493 diff --git a/tests/ci.fmf b/tests/ci.fmf deleted file mode 100644 index 2550a34..0000000 --- a/tests/ci.fmf +++ /dev/null @@ -1,41 +0,0 @@ -summary: Basic smoke test -provision: - disk: 20 - memory: 5120 -prepare: - how: install - package: - - aspnetcore-runtime-8.0 - - babeltrace - - bash-completion - - bc - - binutils - - dotnet-runtime-8.0 - - dotnet-sdk-8.0 - - expect - - file - - findutils - - gcc-c++ - - git - - jq - - libstdc++-devel - - lldb - - lttng-ust - - npm - - postgresql-odbc - - postgresql-server - - procps-ng - - python3 - - strace - - util-linux - - wget - - which - - zlib-devel -execute: - script: - - dotnet --info - - wget --no-verbose https://github.com/redhat-developer/dotnet-bunny/releases/latest/download/turkey.tar.gz - - tar xf turkey.tar.gz - - dotnet turkey/Turkey.dll --version - - git clone "https://github.com/redhat-developer/dotnet-regular-tests.git" - - dotnet turkey/Turkey.dll -l="$TMT_TEST_DATA" dotnet-regular-tests --timeout=1200 diff --git a/update-release b/update-release deleted file mode 100755 index 0308773..0000000 --- a/update-release +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/bash - -# Usage: -# ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--larger-rpm-release] - -set -euo pipefail -IFS=$'\n\t' - -print_usage() { - echo " Usage:" - echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--larger-rpm-release]" -} - -user_provided_tarball_name="" - -rpm_release=1 -positional_args=() -bug_ids=() -while [[ "$#" -gt 0 ]]; do - arg="$1" - case "${arg}" in - --bug) - bug_ids+=("$2") - shift; - shift; - ;; - -h|--help) - print_usage - exit 0 - ;; - --tarball) - user_provided_tarball_name="$2" - shift; - shift; - ;; - --larger-rpm-release) - rpm_release="2" - shift; - ;; - *) - positional_args+=("$1") - shift - ;; - esac -done - -spec_files=( ./*.spec ) -spec_file="${spec_files[0]}" - -sdk_version=${positional_args[0]:-} -if [[ -z ${sdk_version} ]]; then - echo "error: missing sdk version" - exit 1 -fi - -runtime_version=${positional_args[1]:-} -if [[ -z ${runtime_version} ]]; then - echo "error: missing runtime version" - exit 1 -fi - -host_version="$runtime_version" - -if [[ "$runtime_version" == "3.1"* ]]; then - tag=v${sdk_version}-SDK -elif [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]]; then - tag=v${sdk_version} -else - tag=v${runtime_version} -fi - -if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then - echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball" -else - if [[ -n "${user_provided_tarball_name}" ]]; then - mv "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then - mv "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then - mv "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then - mv "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" - fi -fi - -if [[ ! -f "dotnet-${tag}.tar.gz" ]]; then - ./build-dotnet-tarball "${tag}" -fi - -set -x - -sed -i -E "s|^%global host_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global host_version ${host_version}|" "$spec_file" -sed -i -E "s|^%global runtime_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global runtime_version ${runtime_version}|" "$spec_file" -sed -i -E "s|^%global sdk_version [[:digit:]]\.[[:digit:]]\.[[:digit:]][[:digit:]][[:digit:]]|%global sdk_version ${sdk_version}|" "$spec_file" - -comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}" -commit_message="$comment -" -for bug_id in "${bug_ids[@]}"; do - comment="$comment -- Resolves: RHBZ#$bug_id" - commit_message="$commit_message -Resolves: RHBZ#$bug_id" -done - -echo "$commit_message" > git-commit-message - -rpmdev-bumpspec --comment="$comment" "$spec_file" - -# Reset release in 'Release' tag -sed -i -E 's|^Release: [[:digit:]]+%|Release: '"$rpm_release"'%|' "$spec_file" -# Reset Release in changelog comment -# See https://stackoverflow.com/questions/18620153/find-matching-text-and-replace-next-line -sed -i -E '/^%changelog$/!b;n;s/-[[:digit:]]+$/-'"$rpm_release"'/' "$spec_file" - -release_json_url=$(spectool -l --sources ./dotnet8.0.spec | grep release.json | cut -d' ' -f2) -rm "$(basename "$release_json_url")" -wget "$release_json_url"