From b534288b60b158dfc9849b3123d67be81ea927b6 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 18:04:46 +0000 Subject: [PATCH] import UBI dotnet8.0-8.0.116-1.el10_0 --- .fmf/version | 1 - .gitignore | 63 +----------- README.md | 140 ------------------------- build-arm64-bootstrap-tarball | 56 ---------- build-dotnet-tarball | 186 ---------------------------------- copr-build | 13 --- dotnet-8.0.16.tar.gz.sig | 17 ++++ dotnet7.0.rpmlintrc | 35 ------- dotnet8.0.spec | 183 +++++++++++++++++---------------- gating.yaml | 23 ----- release.json | 12 +-- rpminspect.yaml | 20 ---- sources | 3 +- tests/ci.fmf | 45 -------- update-release | 143 -------------------------- 15 files changed, 123 insertions(+), 817 deletions(-) delete mode 100644 .fmf/version delete mode 100644 README.md delete mode 100755 build-arm64-bootstrap-tarball delete mode 100755 build-dotnet-tarball delete mode 100755 copr-build create mode 100644 dotnet-8.0.16.tar.gz.sig delete mode 100644 dotnet7.0.rpmlintrc delete mode 100644 gating.yaml delete mode 100644 rpminspect.yaml delete mode 100644 tests/ci.fmf delete mode 100755 update-release 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 0cb2c3b..43a96bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,62 +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 -/dotnet-v8.0.0.tar.gz -/dotnet-v8.0.1.tar.gz -/dotnet-v8.0.2.tar.gz -/dotnet-8.0.3.tar.gz -/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 -/dotnet-8.0.8.tar.gz.sig -/dotnet-8.0.10.tar.gz -/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 -/dotnet-8.0.13.tar.gz -/dotnet-8.0.13.tar.gz.sig -/dotnet-8.0.14.tar.gz -/dotnet-8.0.14.tar.gz.sig -/dotnet-8.0.15.tar.gz -/dotnet-8.0.15.tar.gz.sig +dotnet-8.0.16.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/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-8.0.16.tar.gz.sig b/dotnet-8.0.16.tar.gz.sig new file mode 100644 index 0000000..32bf69a --- /dev/null +++ b/dotnet-8.0.16.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: BSN Pgp v1.0.0.0 + +iQIcBAABCAAGBQJoE75DAAoJEP2/U8JNtIcuzP4QALyyYakoAZaSihNWJK4nwJ+H +JcNADrJNDxw1ugiGnNEDYPeS3wyFM5+f49AUlczYnQElU5J9mxFe0WqGgHw51NQH +2Y4rG+1peC36s60q0GGQPMr6x4h+EktGx7paQIRDT/k5QE0XLWV1r+MISodEMw/J +7SPOBT+1mQ/hzT8b8KNIa5oHWX34iyzgRZYC8Ui4zaUVSkBLwmAjl4TQN1mO8ydt +kOaCffVbemBIGT4JJDnDhe44ddeS+hhzD3Po7jDHlhpHWKTkiRZ0zkSzuKFXkwy7 +RUJATaGV9nsmO1jCfupOb4rOv78hjZek8J0AJth3iODAqW6BdrUde2hiJ2QpXS6t +BQc16bz/63N4TXUbSeo2KuRg6c4mHZj6Jth8Bcmuhm/xQHJLD/6iMdAoWmD9mct+ +h4EZ/kyTgpD59Ak/2jQGToc1coa2M+6dAXsYnTGCcln4EI4bqo79AuIu3R18dhhP +KmBBs4coLSdCqpMesFwmAJUKnbziscs+usCFigu71Oxwxfz7/pRESQ9rXKfxbndO +MJOcVecebYJlIFD6aQ7rH1id7B69Z/zY41IeNja6XuqOGvA57WHcnqPkq4wI7qvo +Lef6ejym6Ba0ItOdLpf6y+1g4hYQCSLUhlPrSnkIj5Q4oFjcXIlegEf1xSohuqN+ +ESPQd2IZU+pXo3aFOXu7 +=ugQv +-----END PGP SIGNATURE----- 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/dotnet8.0.spec b/dotnet8.0.spec index 19dcd5e..af01d9a 100644 --- a/dotnet8.0.spec +++ b/dotnet8.0.spec @@ -12,14 +12,15 @@ # dotnet-host and netstandard-targeting-pack-2.1 %global is_latest_dotnet 0 -%global host_version 8.0.15 -%global runtime_version 8.0.15 +%global host_version 8.0.16 +%global runtime_version 8.0.16 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 8.0.115 +%global sdk_version 8.0.116 %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 or Runtime version %global upstream_tag v%{runtime_version} %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') @@ -57,7 +58,7 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 2%{?dist} +Release: 1%{?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 @@ -77,7 +78,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#/dotnet-%{upstream_tag_without_v}.tar.gz.sig +Source1: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/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 @@ -112,9 +113,7 @@ BuildRequires: dotnet-sdk-%{dotnetver}-source-built-artifacts %endif BuildRequires: findutils BuildRequires: git -%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: glibc-langpack-en -%endif BuildRequires: gnupg2 BuildRequires: hostname BuildRequires: krb5-devel @@ -410,7 +409,10 @@ These are not meant for general use. %prep +%if %{without bootstrap} +# check gpg signatures only for non-bootstrap builds; bootstrap "sources" are hand-crafted %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%endif release_json_tag=$(grep tag %{SOURCE5} | cut -d: -f2 | sed -E 's/[," ]*//g') if [[ ${release_json_tag} != %{upstream_tag} ]]; then @@ -476,14 +478,8 @@ popd %endif -# tar -x --strip-components=1 -f %%{SOURCE10} -# tar -x --strip-components=1 -f %%{SOURCE11} - %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 @@ -530,6 +526,15 @@ CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -march=z13//') CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -mtune=z14//') %endif +%if 0%{?rhel} >= 10 +# Workaround for https://github.com/dotnet/runtime/issues/109611 +# FIXME: Remove this, and replace with upstream fix +CFLAGS=$(echo $CFLAGS | sed -e 's/-march=x86-64-v3 //') +CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-march=x86-64-v3 //') +LDFLAGS=$(echo $LDFLAGS | sed -e 's/-march=x86-64-v3 //') +%endif + + export EXTRA_CFLAGS="$CFLAGS" export EXTRA_CXXFLAGS="$CXXFLAGS" export EXTRA_LDFLAGS="$LDFLAGS" @@ -539,7 +544,36 @@ export EXTRA_LDFLAGS="$LDFLAGS" # suggested compile-time change doesn't work, unfortunately. export COMPlus_LTTng=0 -VERBOSE=1 ./build.sh \ +%ifarch ppc64le s390x +max_attempts=3 +%else +max_attempts=1 +%endif + +function retry_until_success { + local exit_code=1 + local tries=$1 + shift + set +e + while [[ $exit_code != 0 ]] && [[ $tries != 0 ]]; do + (( tries = tries - 1 )) + "$@" + exit_code=$? + done + set -e + return $exit_code +} + + +cat >dotnet-rpm-build.sh < dotnet.sh @@ -564,7 +604,7 @@ mkdir -p built-sdk tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C built-sdk/ # Convert hardlinks to actual copies. This takes up quite a bit of -# extra disk space, but works around RHEL issues in post-rpmbuild tools +# extra disk space, but works around issues in post-rpmbuild tools # when they encounter hardlinks. cp -r --preserve=mode,ownership,timestamps built-sdk/* %{buildroot}%{_libdir}/dotnet/ ls %{buildroot}%{_libdir}/dotnet @@ -663,6 +703,7 @@ 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 @@ -739,109 +780,81 @@ export COMPlus_LTTng=0 %changelog +* Fri May 02 2025 Omair Majid - 8.0.116-1 +- Update to .NET SDK 8.0.116 and Runtime 8.0.16 +- Resolves: RHEL-89449 + * Wed Apr 09 2025 Omair Majid - 8.0.115-2 - Update to .NET SDK 8.0.115 and Runtime 8.0.15 -- Resolves: RHEL-85276 +- Resolves: RHEL-85275 * Tue Mar 11 2025 Omair Majid - 8.0.114-2 - Update to .NET SDK 8.0.114 and Runtime 8.0.14 -- Resolves: RHEL-81641 +- Resolves: RHEL-81643 * Mon Feb 17 2025 Omair Majid - 8.0.113-2 - Update to .NET SDK 8.0.113 and Runtime 8.0.13 -- Resolves: RHEL-76899 +- Resolves: RHEL-76900 * Thu Jan 16 2025 Omair Majid - 8.0.112-2 - Update to .NET SDK 8.0.112 and Runtime 8.0.12 -- Resolves: RHEL-71555 +- Resolves: RHEL-71553 -* Thu Nov 14 2024 Omair Majid - 8.0.111-2 -- Update to .NET SDK 8.0.111 and Runtime 8.0.11 -- Resolves: RHEL-65367 +* Tue Oct 29 2024 Troy Dawson - 8.0.110-4 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Fri Oct 18 2024 Omair Majid - 8.0.110-3 +* Mon Oct 21 2024 Omair Majid - 8.0.110-3 - Disable packages provided by another .NET version -- Related: RHEL-60801 +- Related: RHEL-60795 -* Tue Oct 15 2024 Omair Majid - 8.0.110-2 +* Wed Oct 16 2024 Omair Majid - 8.0.110-2 - Update to .NET SDK 8.0.110 and Runtime 8.0.10 -- Resolves: RHEL-60801 +- Resolves: RHEL-60795 -* Wed Aug 14 2024 Omair Majid - 8.0.108-2 +* Mon Aug 19 2024 Omair Majid - 8.0.108-2 - Update to .NET SDK 8.0.108 and Runtime 8.0.8 -- Resolves: RHEL-52387 +- Resolves: RHEL-52434 -* Wed Jul 10 2024 Omair Majid - 8.0.107-3 -- Fix ownership of some missed directories -- Resolves: RHEL-47079 - -* Tue Jul 09 2024 Omair Majid - 8.0.107-2 +* Wed Aug 07 2024 Omair Majid - 8.0.107-5 - Update to .NET SDK 8.0.107 and Runtime 8.0.7 -- Resolves: RHEL-45323 +- Related: RHEL-25950 +- Related: RHEL-45214 -* Wed May 15 2024 Omair Majid - 8.0.105-2 -- Update to .NET SDK 8.0.105 and Runtime 8.0.5 -- Resolves: RHEL-35315 +* Wed Jul 31 2024 Omair Majid - 8.0.101-5 +- Fix build +- Resolves: RHEL-25950 +- Resolves: RHEL-45214 -* Tue Apr 09 2024 Omair Majid - 8.0.104-2 -- Update to .NET SDK 8.0.104 and Runtime 8.0.4 -- Resolves: RHEL-31208 +* Mon Jun 24 2024 Troy Dawson - 8.0.101-5 +- Bump release for June 2024 mass rebuild -* Sun Mar 31 2024 Tom Deseyn - 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 +* Fri Jan 26 2024 Omair Majid - 8.0.101-4 +- Rebuild to add new -dbg subpackages -* Tue Mar 19 2024 Omair Majid - 8.0.103-2 -- Update to .NET SDK 8.0.103 and Runtime 8.0.3 -- Resolves: RHEL-27553 +* Wed Jan 24 2024 Fedora Release Engineering - 8.0.101-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Tue Feb 20 2024 Tom Deseyn - 8.0.102-3 -- Backport MSBuild locale fix -- Resolves: RHEL-23936 +* Fri Jan 19 2024 Fedora Release Engineering - 8.0.101-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Wed Feb 14 2024 Omair Majid - 8.0.102-2 -- Update to .NET SDK 8.0.102 and Runtime 8.0.2 -- Resolves: RHEL-23804 - -* Mon Jan 29 2024 Omair Majid - 8.0.101-3 -- Add -dbg subpackages for symbol files -- Resolves: RHEL-23070 - -* Mon Jan 15 2024 Omair Majid - 8.0.101-2 +* Tue Jan 09 2024 Omair Majid - 8.0.101-1 - Update to .NET SDK 8.0.101 and Runtime 8.0.1 -- Resolves: RHEL-19803 -* Wed Nov 15 2023 Omair Majid - 8.0.100-3 +* Tue Dec 12 2023 Omair Majid - 8.0.100-2 +- Enable gpg signature verification + +* Sat Dec 09 2023 Omair Majid - 8.0.100-1 - Update to .NET SDK 8.0.100 and Runtime 8.0.0 -- Resolves: RHEL-15352 -* Mon Oct 16 2023 Omair Majid - 8.0.100~rc.2-0.1 -- Update to .NET 8 RC 2 -- Resolves: RHEL-13790 +* Fri Dec 08 2023 Omair Majid - 8.0.100~rc.2-0.1 +- Update to .NET SDK 8.0.100 RC 2 and Runtime 8.0.0 RC 2 -* Thu Sep 28 2023 Omair Majid - 8.0.100~rc.1-0.4 -- Disable bootstrap -- Related: RHEL-4074 - -* 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 -- Add patches to fix mono and arm64 issues -- Include libmono-*.a files in the SDK -- Fix CI configuration -- Related: RHEL-4074 +* Fri Dec 08 2023 Omair Majid - 8.0.100~rc.1-0.2 +- Add various fixes from CentOS Stream 9 * 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 - -* Tue Aug 22 2023 Omair Majid - 8.0.100~preview.7-0.2 -- Add patch to work around TypeLoadException in Mono -- Related: RHBZ#2224124 * 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/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 index 430124b..c89fc7b 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.15", + "release": "8.0.16", "channel": "8.0", - "tag": "v8.0.15", - "sdkVersion": "8.0.115", - "runtimeVersion": "8.0.15", - "aspNetCoreVersion": "8.0.15", + "tag": "v8.0.16", + "sdkVersion": "8.0.116", + "runtimeVersion": "8.0.16", + "aspNetCoreVersion": "8.0.16", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "4d246579080efa41c77ddfa9ec8e133d7cf52666" + "sourceVersion": "82276892487288f85142cb1641df2b05dc9b937e" } 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/sources b/sources index bbfe0cd..2cae4e6 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (dotnet-8.0.15.tar.gz) = 8f4888d7b8433c30d01e22a15289626464c92817259cf914d60c589f15f3a680ae4b19f512ec552e05caa132774aed0b8f17e91a8442be74eabf5e161b145584 -SHA512 (dotnet-8.0.15.tar.gz.sig) = 21e08ef5fdc2aa265c178558c992c36810407d5c4349a291694a69e0167f53976879379492aeaec718644a6bf6cffef6026a1a72fd765f15f1ba0eb5b0c47b44 +SHA512 (dotnet-8.0.16.tar.gz) = 6e83def1b60e3bc4888f5a8702c9e6b5420a7ff7229009e8fb2b8697b9a2c7cd750896e69b23d1f803f3c44af8fd7b4fbcaaed4fbc9a82e3bf1818e3a59ec939 diff --git a/tests/ci.fmf b/tests/ci.fmf deleted file mode 100644 index fba8384..0000000 --- a/tests/ci.fmf +++ /dev/null @@ -1,45 +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 - - dnf remove -yq 'dotnet*' - - set -x; if command -v dotnet ; then exit 1; fi - - set -x; if [ -d /usr/lib64/dotnet ]; then exit 1; fi - - set -x; if man dotnet; then exit 1; fi diff --git a/update-release b/update-release deleted file mode 100755 index bc40977..0000000 --- a/update-release +++ /dev/null @@ -1,143 +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] [--release-json release-json] [--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 - ;; - --release-json) - release_json="$2" - shift; - shift; - ;; - --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" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then - tag=v${sdk_version} -else - tag=v${runtime_version} -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" - - -if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then - if [[ -f "dotnet-${tag}.tar.gz" ]]; then - echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball" - else - 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 - cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then - cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then - cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" - elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then - cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" - fi - fi - - ./build-dotnet-tarball "${tag}" - fi -else - if [[ -f "dotnet-${tag}.tar.gz" ]]; then - echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball" - elif [[ -n ${user_provided_tarball_name} ]]; then - tag_without_v=${tag#v} - cp -a "${user_provided_tarball_name}" dotnet-${tag_without_v}.tar.gz - cp -a "${user_provided_tarball_name}.sig" dotnet-${tag_without_v}.tar.gz.sig - cp -a "${release_json}" release.json - else - rm -f release.json - spectool -g "$spec_file" - fi -fi - -comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}" -commit_message="$comment -" -for bug_id in "${bug_ids[@]}"; do - if [[ "$bug_id" =~ ^[[:digit:]]+$ ]]; then - comment="$comment -- Resolves: RHBZ#$bug_id" - commit_message="$commit_message -Resolves: RHBZ#$bug_id" - else - comment="$comment -- Resolves: $bug_id" - commit_message="$commit_message -Resolves: $bug_id" - fi -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" - -echo "Done updating sources. Commit message in ./git-commit-message"