17 changed files with 825 additions and 57 deletions
--- a/.dotnet7.0.metadata
+++ b/.dotnet7.0.metadata
@ -1 +0,0 @@
-c2015d0972371ab8995d18246d1f5b76299f3be3 SOURCES/dotnet-v7.0.103.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,27 @@
-SOURCES/dotnet-v7.0.103.tar.gz
+/dotnet-arm64-prebuilts-2022-08-17.tar.gz
+/dotnet-fd587269d0a1fa669d547f3a2e74f5d9353b6dcf-x64-bootstrap.tar.xz
+/dotnet-s390x-prebuilts-2021-10-29.tar.gz
+/dotnet-v7.0.100-rc.1.22431.12-x64-bootstrap.tar.xz
+/dotnet-arm64-prebuilts-2022-09-17.tar.gz
+/dotnet-s390x-prebuilts-2022-08-24.tar.gz
+/dotnet-v7.0.100-rc.2.22477.23-x64-bootstrap.tar.xz
+/dotnet-arm64-prebuilts-2022-10-12.tar.gz
+/dotnet-s390x-prebuilts-2022-10-12.tar.gz
+/dotnet-ppc64le-prebuilts-2022-10-21.tar.gz
+/dotnet-v7.0.100.tar.gz
+/dotnet-v7.0.101.tar.gz
+/dotnet-v7.0.102.tar.gz
+/dotnet-v7.0.103.tar.gz
+/dotnet-v7.0.104.tar.gz
+/dotnet-v7.0.105.tar.gz
+/dotnet-v7.0.107.tar.gz
+/dotnet-v7.0.109.tar.gz
+/dotnet-v7.0.110.tar.gz
+/dotnet-v7.0.111.tar.gz
+/dotnet-v7.0.112.tar.gz
+/dotnet-v7.0.113.tar.gz
+/dotnet-v7.0.114.tar.gz
+/dotnet-v7.0.115.tar.gz
+/dotnet-v7.0.116.tar.gz
+/dotnet-v7.0.117.tar.gz
+/dotnet-v7.0.118.tar.gz
--- a/68
+++ b/68
@ -0,0 +1,68 @@
+#!/bin/bash
+
+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")
+
+version=${2:-$(jq -r  '.tools.dotnet' "$bootstrap_dir"/global.json)}
+
+date=$(date +%F)
+
+mkdir -p "dotnet-arm64-prebuilts-$date"
+
+pushd "dotnet-arm64-prebuilts-$date"
+
+# Binaries can be at one of several different URLs:
+wget https://dotnetcli.azureedge.net/dotnet/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz
+#wget https://dotnetbuilds.azureedge.net/public/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz
+
+for archive in "$bootstrap_dir"/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
+
+# For arm64, we have forced a newer 7.0 SDK, which needs newer bits
+nappo download microsoft.windowsdesktop.app.ref 6.0.9
+nappo download microsoft.netcore.app.host.linux-arm64 6.0.9
+nappo download microsoft.netcore.app.ref 6.0.9
+nappo download microsoft.aspnetcore.app.ref 6.0.9
+
+nappo download Microsoft.AspNetCore.App.Runtime.linux-arm64 7.0.0-rc.1.22427.2
+nappo download Microsoft.NETCore.App.Host.linux-arm64  7.0.0-rc.1.22426.10
+nappo download Microsoft.NETCore.App.Runtime.linux-arm64 7.0.0-rc.1.22426.10
+nappo download runtime.linux-arm64.Microsoft.NETCore.DotNetHost 7.0.0-rc.1.22426.10
+nappo download runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy 7.0.0-rc.1.22426.10
+nappo download runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver 7.0.0-rc.1.22426.10
+nappo download runtime.linux-arm64.Microsoft.NETCore.ILAsm 7.0.0-rc.1.22426.10
+nappo download runtime.linux-arm64.Microsoft.NETCore.ILDAsm 7.0.0-rc.1.22426.10
+nappo download Microsoft.NETCore.App.Crossgen2.linux-arm64 7.0.0-rc.1.22426.10
+
+popd
+
+tar czf "dotnet-arm64-prebuilts-$date.tar.gz" "dotnet-arm64-prebuilts-$date"
--- a/183
+++ b/183
@ -0,0 +1,183 @@
+#!/bin/bash
+
+# Usage:
+#   build-dotnet-tarball [--bootstrap] <tag-from-installer>
+#
+# Creates a source archive from a tag (or commit) at github.com/dotnet/installer
+#
+# Clone dotnet/installer, check out the tag (if any), and build the
+# source-tarball.
+
+set -euo pipefail
+IFS=$'\n\t'
+
+function print_usage {
+    echo "Usage:"
+    echo "$0 [--bootstrap] <tag-from-installer>"
+    echo
+    echo "Creates a source archive from a tag at https://github.com/dotnet/installer"
+    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*
+}
+
+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
+    temp_dir=$(mktemp -d -p "$(pwd)")
+    pushd "${temp_dir}"
+    mkdir installer
+    pushd installer
+    git init
+    git remote add origin https://github.com/dotnet/installer
+    git fetch --depth 1 origin "${tag}"
+    git checkout FETCH_HEAD
+    git submodule update --init --recursive
+    clean_dotnet_cache
+    ./build.sh /p:ArcadeBuildTarball=true
+    popd
+
+    popd
+
+    mv "${temp_dir}"/installer/artifacts/packages/Debug/Shipping/dotnet-sdk-source-7*.tar.gz \
+        "${unmodified_tarball_name}.tar.gz"
+
+    rm -rf "${temp_dir}"
+fi
+
+rm -rf "${tarball_name}"
+mkdir "${tarball_name}"
+pushd "${tarball_name}"
+tar xf ../"${unmodified_tarball_name}.tar.gz"
+
+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.
+
+# Binaries for gradle
+rm -r src/aspnetcore/src/SignalR/clients/java/signalr/gradle*
+
+# https://github.com/dotnet/aspnetcore/issues/34785
+find src/aspnetcore/src -type d -name samples -print0 | xargs -0 rm -r
+
+# Unnecessary crypto implementation: IDEA
+rm -r src/runtime/src/tests/JIT/Performance/CodeQuality/Bytemark/
+
+# https://github.com/NuGet/Home/issues/11094
+rm -r src/nuget-client/test/EndToEnd
+
+# https://github.com/microsoft/ApplicationInsights-dotnet/issues/2670
+rm -r src/source-build-externals/src/application-insights/LOGGING/test/Shared/CustomTelemetryChannel.cs
+
+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
--- a/SOURCES/check-debug-symbols.py
+++ b/SOURCES/check-debug-symbols.py
--- a/SOURCES/dotnet.sh.in
+++ b/SOURCES/dotnet.sh.in
--- a/dotnet7.0.rpmlintrc
+++ b/dotnet7.0.rpmlintrc
@ -0,0 +1,35 @@
+# 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")
+
--- a/SPECS/dotnet7.0.spec
+++ b/SPECS/dotnet7.0.spec
@ -6,10 +6,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}

-%global host_version 7.0.3
-%global runtime_version 7.0.3
+%global host_version 7.0.18
+%global runtime_version 7.0.18
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 7.0.103
+%global sdk_version 7.0.118
 %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 }')
@ -51,7 +51,7 @@

 Name:           dotnet7.0
 Version:        %{sdk_rpm_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
@ -77,7 +77,8 @@ Source11:       dotnet.sh.in

 # Disable apphost; there's no net6.0 apphost for ppc64le
 Patch1:         roslyn-analyzers-ppc64le-apphost.patch
-
+# https://github.com/dotnet/runtime/pull/95216#issuecomment-1842799314
+Patch2:         runtime-re-enable-implicit-rejection.patch


 %if 0%{?fedora} || 0%{?rhel} >= 8
@ -324,7 +325,7 @@ applications using the .NET SDK.
 %dotnet_targeting_pack dotnet-apphost-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Host.%{runtime_id}
 %dotnet_targeting_pack dotnet-targeting-pack-7.0 %{runtime_rpm_version} Microsoft.NETCore.App 7.0 Microsoft.NETCore.App.Ref
 %dotnet_targeting_pack aspnetcore-targeting-pack-7.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 7.0 Microsoft.AspNetCore.App.Ref
-%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
+#%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref


 %package -n dotnet-sdk-7.0-source-built-artifacts
@ -399,6 +400,7 @@ popd
 %endif

 %patch1 -p1
+%patch2 -p1

 # Fix bad hardcoded path in build
 sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
@ -516,30 +518,35 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {}
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \;

-install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
-install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}%%{_sysconfdir}/profile.d/
+#install dotnet.sh %%{buildroot}%%{_sysconfdir}/profile.d/

-install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-install src/sdk/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
+#install src/sdk/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet

 # TODO: the zsh completion script needs to be ported to use #compdef
 #install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
 #install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet

-install -dm 0755 %{buildroot}%{_bindir}
-ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}%%{_bindir}
+#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/

-for section in 1 7; do
-    install -dm 0755 %{buildroot}%{_mandir}/man${section}/
-    find -iname 'dotnet*'.${section} -type f -exec cp {} %{buildroot}%{_mandir}/man${section}/ \;
-done
+# Provided by dotnet-host from another SRPM
+#for section in 1 7; do
+#    install -dm 0755 %%{buildroot}%%{_mandir}/man${section}/
+#    find -iname 'dotnet*'.${section} -type f -exec cp {} %%{buildroot}%%{_mandir}/man${section}/ \;
+#done

-install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet
-echo "%{_libdir}/dotnet" >> install_location
-install install_location %{buildroot}%{_sysconfdir}/dotnet/
-echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch}
-install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/
+# Provided by dotnet-host from another SRPM
+#install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet
+#echo "%%{_libdir}/dotnet" >> install_location
+#install install_location %%{buildroot}%%{_sysconfdir}/dotnet/
+#echo "%%{_libdir}/dotnet" >> install_location_%%{runtime_arch}
+#install install_location_%%{runtime_arch} %%{buildroot}%%{_sysconfdir}/dotnet/

 install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts
 install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/
@ -555,8 +562,7 @@ echo "Testing build results for debug symbols..."
 %{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/


-
-%check
+# Self-check
 %if 0%{?fedora} > 35
 # lttng in Fedora > 35 is incompatible with .NET
 export COMPlus_LTTng=0
@ -565,27 +571,14 @@ export COMPlus_LTTng=0
 %{buildroot}%{_libdir}/dotnet/dotnet --info
 %{buildroot}%{_libdir}/dotnet/dotnet --version

+# Provided by dotnet-host from another SRPM
+rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt
+rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt
+rm %{buildroot}%{_libdir}/dotnet/dotnet

-%if 0%{?rhel} <= 8
-%files -n dotnet
-# empty package useful for dependencies
-%endif
+# Provided by netstandard-targeting-pack-2.1 from another SRPM
+rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0

-%files -n dotnet-host
-%dir %{_libdir}/dotnet
-%{_libdir}/dotnet/dotnet
-%dir %{_libdir}/dotnet/host
-%dir %{_libdir}/dotnet/host/fxr
-%{_bindir}/dotnet
-%license %{_libdir}/dotnet/LICENSE.txt
-%license %{_libdir}/dotnet/ThirdPartyNotices.txt
-%doc %{_mandir}/man1/dotnet*.1.gz
-%doc %{_mandir}/man7/dotnet*.7.gz
-%config(noreplace) %{_sysconfdir}/profile.d/dotnet.sh
-%config(noreplace) %{_sysconfdir}/dotnet
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/dotnet

 %files -n dotnet-hostfxr-7.0
 %dir %{_libdir}/dotnet/host/fxr
@ -619,38 +612,98 @@ export COMPlus_LTTng=0


 %changelog
-* Thu Feb 02 2023 Omair Majid <omajid@redhat.com> - 7.0.103-1
+* Tue Apr 09 2024 Omair Majid <omajid@redhat.com> - 7.0.118-2
+- Update to .NET SDK 7.0.118 and Runtime 7.0.18
+- Resolves: RHEL-31203
+
+* Tue Mar 19 2024 Omair Majid <omajid@redhat.com> - 7.0.117-2
+- Update to .NET SDK 7.0.117 and Runtime 7.0.17
+- Resolves: RHEL-27545
+
+* Wed Feb 14 2024 Omair Majid <omajid@redhat.com> - 7.0.116-2
+- Update to .NET SDK 7.0.116 and Runtime 7.0.16
+- Resolves: RHEL-23790
+
+* Mon Jan 15 2024 Omair Majid <omajid@redhat.com> - 7.0.115-2
+- Update to .NET SDK 7.0.115 and Runtime 7.0.15
+- Resolves: RHEL-19802
+
+* Mon Dec 11 2023 Omair Majid <omajid@redhat.com> - 7.0.114-2
+- Update to .NET SDK 7.0.114 and Runtime 7.0.14
+- Resolves: RHEL-15351
+
+* Tue Oct 24 2023 Omair Majid <omajid@redhat.com> - 7.0.113-2
+- Update to .NET SDK 7.0.113 and Runtime 7.0.13
+- Resolves: RHEL-14467
+
+* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 7.0.112-2
+- Update to .NET SDK 7.0.112 and Runtime 7.0.12
+- Resolves: RHEL-11698
+
+* Tue Sep 12 2023 Omair Majid <omajid@redhat.com> - 7.0.111-2
+- Update to .NET SDK 7.0.111 and Runtime 7.0.11
+- Resolves: RHEL-2000
+
+* Wed Aug 09 2023 Omair Majid <omajid@redhat.com> - 7.0.110-2
+- Update to .NET SDK 7.0.110 and Runtime 7.0.10
+- Resolves: RHBZ#2228571
+
+* Tue Jul 11 2023 Omair Majid <omajid@redhat.com> - 7.0.109-2
+- Update to .NET SDK 7.0.109 and Runtime 7.0.9
+- Resolves: RHBZ#2219632
+
+* Tue Jun 13 2023 Andrew Slice <andrew.slice@redhat.com> - 7.0.107-2
+- Update to .NET SDK 7.0.107 and Runtime 7.0.7
+- Resolves: RHBZ#2211767
+
+* Wed Apr 12 2023 Omair Majid <omajid@redhat.com> - 7.0.105-2
+- Update to .NET SDK 7.0.105 and Runtime 7.0.5
+- Resolves: RHBZ#2183591
+
+* Tue Mar 28 2023 Omair Majid <omajid@redhat.com> - 7.0.104-2
+- Bump Release
+- Related: RHBZ#2175025
+
+* Mon Mar 20 2023 Omair Majid <omajid@redhat.com> - 7.0.104-1
+- Update to .NET SDK 7.0.104 and Runtime 7.0.4
+- Resolves: RHBZ#2175025
+
+* Fri Mar 10 2023 Omair Majid <omajid@redhat.com> - 7.0.103-1
 - Update to .NET SDK 7.0.103 and Runtime 7.0.3
- Resolves: RHBZ#2166775
+- Resolves: RHBZ#2166773

-* Mon Dec 19 2022 Omair Majid <omajid@redhat.com> - 7.0.102-1
+* Thu Mar 09 2023 Omair Majid <omajid@redhat.com> - 7.0.102-1
 - Update to .NET SDK 7.0.102 and Runtime 7.0.2
- Resolves: RHBZ#2154466
+- Resolves: RHBZ#2154465

-* Tue Dec 06 2022 Omair Majid <omajid@redhat.com> - 7.0.101-1
+* Wed Jan 11 2023 Omair Majid <omajid@redhat.com> - 7.0.101-2
 - Update to .NET SDK 7.0.101 and Runtime 7.0.1
- Resolves: RHBZ#2150151
+- Resolves: RHBZ#2150150

-* Wed Nov 02 2022 Omair Majid <omajid@redhat.com> - 7.0.100-1
- Update to .NET SDK 7.0.100 and Runtime 7.0.0
- Resolves: RHBZ#2137943
+* Wed Nov 09 2022 Omair Majid <omajid@redhat.com> - 7.0.100-1
+- Update to .NET 7 GA release
+- Resolves: RHBZ#2137944
+
+* Tue Oct 25 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.5.rc2
+- Add lldb as a build dependency
+- Related: RHBZ#2134641

 * Mon Oct 24 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.4.rc2
 - Enable ppc64le builds
- Related: RHBZ#2134642
+- Related: RHBZ#2134641

 * Thu Oct 13 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.3.rc2
 - Update to .NET 7 RC 2
- Resolves: RHBZ#2134642
+- Resolves: RHBZ#2134641

 * Sat Sep 17 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.2.rc1
 - Update to .NET 7 RC 1
 - Enable s390x builds
- Resolves: RHBZ#2123886
+- Resolves: RHBZ#2123884

 * Thu Aug 25 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.1
 - Initial .NET 7 package
- Resolves: RHBZ#2112096
+- Resolves: RHBZ#2112027

 * Wed May 11 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
 - Update to .NET SDK 6.0.105 and Runtime 6.0.5
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,21 @@
+--- !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}
+--- !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}
+--- !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}
--- a/SOURCES/roslyn-analyzers-ppc64le-apphost.patch
+++ b/SOURCES/roslyn-analyzers-ppc64le-apphost.patch
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,18 @@
+---
+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
+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
--- a/runtime-re-enable-implicit-rejection.patch
+++ b/runtime-re-enable-implicit-rejection.patch
@ -0,0 +1,169 @@
+From f55ebb4597a1a931edee16283fc43a4ff33d1029 Mon Sep 17 00:00:00 2001
+From: Omair Majid <omajid@redhat.com>
+Date: Fri, 2 Feb 2024 12:23:28 -0500
+Subject: [PATCH] Revert "Disable implicit rejection for RSA PKCS#1 (#95217)"
+
+This reverts commit a314c5b3580a9fe25c59d917ff0b7594efc6f81f.
+
+To quote Clemens Lang:
+
+> [Disabling implcit rejection] re-enables a Bleichenbacher timing oracle
+> attack against PKCS#1v1.5 decryption. See
+> https://people.redhat.com/~hkario/marvin/ for details and
+> https://github.com/dotnet/runtime/pull/95157#issuecomment-1842784399 for a
+> comment by the researcher who published the vulnerability and proposed the
+> change in OpenSSL.
+
+For more details, see:
+https://github.com/dotnet/runtime/pull/95217#issuecomment-1842799362
+---
+ .../RSA/EncryptDecrypt.cs                     | 49 ++++---------------
+ .../opensslshim.h                             |  6 ---
+ .../pal_evp_pkey_rsa.c                        | 13 -----
+ 3 files changed, 10 insertions(+), 58 deletions(-)
+
+diff --git a/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs b/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
+index 55a044d62a6..e72d42e87d2 100644
+--- a/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
+++ b/src/runtime/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/EncryptDecrypt.cs
+@@ -338,10 +338,19 @@ private void RsaCryptRoundtrip(RSAEncryptionPadding paddingMode, bool expectSucc
+             Assert.Equal(TestData.HelloBytes, output);
+         }
+ 
+-        [ConditionalFact(nameof(PlatformSupportsEmptyRSAEncryption))]
+        [ConditionalFact]
+         [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
+         public void RoundtripEmptyArray()
+         {
+            if (OperatingSystem.IsIOS() && !OperatingSystem.IsIOSVersionAtLeast(13, 6))
+            {
+                throw new SkipTestException("iOS prior to 13.6 does not reliably support RSA encryption of empty data.");
+            }
+            if (OperatingSystem.IsTvOS() && !OperatingSystem.IsTvOSVersionAtLeast(14, 0))
+            {
+                throw new SkipTestException("tvOS prior to 14.0 does not reliably support RSA encryption of empty data.");
+            }
+
+             using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params))
+             {
+                 void RoundtripEmpty(RSAEncryptionPadding paddingMode)
+@@ -692,26 +701,6 @@ public void NotSupportedValueMethods()
+             }
+         }
+ 
+-        [ConditionalTheory]
+-        [InlineData(new byte[] { 1, 2, 3, 4 })]
+-        [InlineData(new byte[0])]
+-        public void Decrypt_Pkcs1_ErrorsForInvalidPadding(byte[] data)
+-        {
+-            if (data.Length == 0 && !PlatformSupportsEmptyRSAEncryption)
+-            {
+-                throw new SkipTestException("Platform does not support RSA encryption of empty data.");
+-            }
+-
+-            using (RSA rsa = RSAFactory.Create(TestData.RSA2048Params))
+-            {
+-                byte[] encrypted = Encrypt(rsa, data, RSAEncryptionPadding.Pkcs1);
+-                encrypted[1] ^= 0xFF;
+-
+-                // PKCS#1, the data, and the key are all deterministic so this should always throw an exception.
+-                Assert.ThrowsAny<CryptographicException>(() => Decrypt(rsa, encrypted, RSAEncryptionPadding.Pkcs1));
+-            }
+-        }
+-
+         [Fact]
+         public void Decrypt_Pkcs1_BadPadding()
+         {
+@@ -726,23 +715,5 @@ public static IEnumerable<object[]> OaepPaddingModes
+                 }
+             }
+         }
+-
+-        public static bool PlatformSupportsEmptyRSAEncryption
+-        {
+-            get
+-            {
+-                if (OperatingSystem.IsIOS() && !OperatingSystem.IsIOSVersionAtLeast(13, 6))
+-                {
+-                    return false;
+-                }
+-
+-                if (OperatingSystem.IsTvOS() && !OperatingSystem.IsTvOSVersionAtLeast(14, 0))
+-                {
+-                    return false;
+-                }
+-
+-                return true;
+-            }
+-        }
+     }
+ }
+diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h b/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
+index 7d5ec84cc7d..efc0d470602 100644
+--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
+++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.h
+@@ -276,10 +276,8 @@ const EVP_CIPHER* EVP_chacha20_poly1305(void);
+     REQUIRED_FUNCTION(ERR_peek_error) \
+     REQUIRED_FUNCTION(ERR_peek_error_line) \
+     REQUIRED_FUNCTION(ERR_peek_last_error) \
+-    REQUIRED_FUNCTION(ERR_pop_to_mark) \
+     FALLBACK_FUNCTION(ERR_put_error) \
+     REQUIRED_FUNCTION(ERR_reason_error_string) \
+-    REQUIRED_FUNCTION(ERR_set_mark) \
+     LIGHTUP_FUNCTION(ERR_set_debug) \
+     LIGHTUP_FUNCTION(ERR_set_error) \
+     REQUIRED_FUNCTION(EVP_aes_128_cbc) \
+@@ -334,7 +332,6 @@ const EVP_CIPHER* EVP_chacha20_poly1305(void);
+     REQUIRED_FUNCTION(EVP_PKCS82PKEY) \
+     REQUIRED_FUNCTION(EVP_PKEY2PKCS8) \
+     REQUIRED_FUNCTION(EVP_PKEY_CTX_ctrl) \
+-    REQUIRED_FUNCTION(EVP_PKEY_CTX_ctrl_str) \
+     REQUIRED_FUNCTION(EVP_PKEY_CTX_free) \
+     REQUIRED_FUNCTION(EVP_PKEY_CTX_get0_pkey) \
+     REQUIRED_FUNCTION(EVP_PKEY_CTX_new) \
+@@ -761,10 +758,8 @@ FOR_ALL_OPENSSL_FUNCTIONS
+ #define ERR_peek_error_line ERR_peek_error_line_ptr
+ #define ERR_peek_last_error ERR_peek_last_error_ptr
+ #define ERR_put_error ERR_put_error_ptr
+-#define ERR_pop_to_mark ERR_pop_to_mark_ptr
+ #define ERR_reason_error_string ERR_reason_error_string_ptr
+ #define ERR_set_debug ERR_set_debug_ptr
+-#define ERR_set_mark ERR_set_mark_ptr
+ #define ERR_set_error ERR_set_error_ptr
+ #define EVP_aes_128_cbc EVP_aes_128_cbc_ptr
+ #define EVP_aes_128_cfb8 EVP_aes_128_cfb8_ptr
+@@ -818,7 +813,6 @@ FOR_ALL_OPENSSL_FUNCTIONS
+ #define EVP_PKCS82PKEY EVP_PKCS82PKEY_ptr
+ #define EVP_PKEY2PKCS8 EVP_PKEY2PKCS8_ptr
+ #define EVP_PKEY_CTX_ctrl EVP_PKEY_CTX_ctrl_ptr
+-#define EVP_PKEY_CTX_ctrl_str EVP_PKEY_CTX_ctrl_str_ptr
+ #define EVP_PKEY_CTX_free EVP_PKEY_CTX_free_ptr
+ #define EVP_PKEY_CTX_get0_pkey EVP_PKEY_CTX_get0_pkey_ptr
+ #define EVP_PKEY_CTX_new EVP_PKEY_CTX_new_ptr
+diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
+index 043bf9f9d1e..c9ccdf33e3a 100644
+--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
+++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c
+@@ -67,19 +67,6 @@ static bool ConfigureEncryption(EVP_PKEY_CTX* ctx, RsaPaddingMode padding, const
+         {
+             return false;
+         }
+-
+-        // OpenSSL 3.2 introduced a change where PKCS#1 RSA decryption does not fail for invalid padding.
+-        // If the padding is invalid, the decryption operation returns random data.
+-        // See https://github.com/openssl/openssl/pull/13817 for background.
+-        // Some Linux distributions backported this change to previous versions of OpenSSL.
+-        // Here we do a best-effort to set a flag to revert the behavior to failing if the padding is invalid.
+-        ERR_set_mark();
+-
+-        EVP_PKEY_CTX_ctrl_str(ctx, "rsa_pkcs1_implicit_rejection", "0");
+-
+-        // Undo any changes to the error queue that may have occured while configuring implicit rejection if the
+-        // current version does not support implicit rejection.
+-        ERR_pop_to_mark();
+     }
+     else
+     {
+-- 
+2.43.0
+
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (dotnet-v7.0.118.tar.gz) = 8205def9d6d3c201cb92f30fbf9ac8e9851b491cd20559defe66984636e6e56113c730697b522a57bb1d57750171c8d3d10a714742a73f3767365f98d64a6f58
--- a/tests/.fmf/version
+++ b/tests/.fmf/version
@ -0,0 +1 @@
+2
--- a/tests/provision.fmf
+++ b/tests/provision.fmf
@ -0,0 +1,6 @@
+---
+
+standard-inventory-qcow2:
+  qemu:
+    m: 5G
+
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,47 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    - container
+    - atomic
+    repositories:
+    - repo: "https://github.com/redhat-developer/dotnet-regular-tests.git"
+      dest: "dotnet-regular-tests"
+      version: "main"
+    tests:
+      - download_test_runner:
+          dir: ./
+          run: wget --no-verbose https://github.com/redhat-developer/dotnet-bunny/releases/latest/download/turkey.tar.gz && tar xf turkey.tar.gz
+      - print_test_runner_version:
+          dir: ./
+          run: dotnet turkey/Turkey.dll --version
+      - regular:
+          dir: ./
+          run: dotnet turkey/Turkey.dll -v -l={{ remote_artifacts }} dotnet-regular-tests --timeout=1500
+    required_packages:
+    - aspnetcore-runtime-7.0
+    - bash-completion
+    - bc
+    - binutils
+    - dotnet-runtime-7.0
+    - dotnet-sdk-7.0
+    - expect
+    - file
+    - findutils
+    - gcc-c++
+    - git
+    - jq
+    - libstdc++-devel
+    - lldb
+    - npm
+    - postgresql-odbc
+    - postgresql-server
+    - procps-ng
+    - python3
+    - strace
+    - util-linux
+    - wget
+    - which
+    - zlib-devel
--- a/141
+++ b/141
@ -0,0 +1,141 @@
+#!/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"
				`@ -1 +0,0 @@`
				`c2015d0972371ab8995d18246d1f5b76299f3be3 SOURCES/dotnet-v7.0.103.tar.gz`
				`@ -0,0 +1 @@`
				`SHA512 (dotnet-v7.0.118.tar.gz) = 8205def9d6d3c201cb92f30fbf9ac8e9851b491cd20559defe66984636e6e56113c730697b522a57bb1d57750171c8d3d10a714742a73f3767365f98d64a6f58`