community/fluidsynth/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Dominika Liberda <ja@sdomi.pl>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=fluidsynth
-pkgver=2.2.8
+pkgver=2.2.9
 pkgrel=0
 arch="all"
 url="https://www.fluidsynth.org/"
@@ -22,6 +22,7 @@ makedepends="
 	portaudio-dev
 	pulseaudio-dev
 	readline-dev
+	samurai
 	"
 source="https://github.com/fluidsynth/fluidsynth/archive/v$pkgver/fluidsynth-v$pkgver.tar.gz"
 subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
@@ -32,7 +33,7 @@ case "$CARCH" in
 esac
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DLIB_INSTALL_DIR=lib \
@@ -45,7 +46,7 @@ build() {
 check() {
 	# ctest can't currently be used https://github.com/FluidSynth/fluidsynth/issues/881
 
-	make -C build -k check
+	ninja -C build check
 }
 
 package() {
@@ -53,5 +54,5 @@ package() {
 }
 
 sha512sums="
-8173f2d368a214cf1eb7faae2f6326db43fb094ec9c83e652f953290c3f29c34ebd0b92cbb439bea8d814d3a7e4f9dc0c18c648df1d414989d5d8b4700c79535  fluidsynth-v2.2.8.tar.gz
+90f44f6d7a4ed504eea5e2d39d8da2e0072bef746f3d969e367f0bab36a4cff479a98e795dc8b6b58b565fb266c44a137a14e98c7e4c77d1be3b300b8c066600  fluidsynth-v2.2.9.tar.gz
 "

community/jgmenu/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Justin Berthault <justin.berthault@zaclys.net>
 pkgname=jgmenu
 pkgver=4.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple, independent X11 menu"
 url="https://github.com/johanmalm/jgmenu"
 arch="all"
@@ -16,14 +16,23 @@ makedepends="
 	librsvg-dev
 	libxrandr-dev
 	libxml2-dev
+	menu-cache-dev
 	pango-dev
+	xfce4-panel-dev
 	"
 checkdepends="perl"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-xfce4"
 source="$pkgname-$pkgver.tar.gz::https://github.com/johanmalm/jgmenu/archive/v$pkgver.tar.gz"
 
 build() {
-	./configure --prefix=/usr
+	export CFLAGS="$CFLAGS -flto=auto"
+
+	./configure \
+		--prefix=/usr \
+		--with-gtktheme \
+		--with-lx \
+		--with-pmenu \
+		--with-xfce4-panel-applet
 	make
 }
 
@@ -35,6 +44,12 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
+xfce4() {
+	pkgdesc="$pkgdesc (xfce4 panel integration)"
+
+	amove usr/lib/xfce4 usr/share/xfce4
+}
+
 sha512sums="
 bb0ca1927c77a1471f5f4566e54509756cd0a2426cf04e1e46687ff5309d86ce7992794fba86d253927fcb6014040891146f1296daa4eb55d71faddf01f596ed  jgmenu-4.4.0.tar.gz
 "

main/libxft/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxft
-pkgver=2.3.5
+pkgver=2.3.6
 pkgrel=0
 pkgdesc="FreeType-based font drawing library for X"
 url="http://xorg.freedesktop.org/"
@@ -29,5 +29,5 @@ package() {
 }
 
 sha512sums="
-e1e037dbc4f8bbf8204bdf99a199c82b5f1182875d28bd9f0a4ec2aec95b05de21e97029ec036b9a3f70f1d6e8a42f0052f4ab30809aee7411fa2e438899db9e  libXft-2.3.5.tar.xz
+732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90  libXft-2.3.6.tar.xz
 "

testing/dotnet31-build/APKBUILD

-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-#
-# Variables for dotnet build version 3.1
-# This APKBUILD is designed to be the same for version 5.0 and under
-# except for the variables in this first section
-#
-
-pkgname=dotnet31-build
-pkgver=3.1.418
-pkgrel=0
-
-# Tag of tarball generator. This may change from usual due to mistakes from upstream
-_installertag="v$pkgver-SDK"
-
-# Tag of SBRP builder for dotnet 3.1
-_sbrptag=045b2888ccfaf4c203c945a09b3f41f0e6393d1c
-
-# this should match what is sourced by source-build's ./prep.sh script
-# and, at the very least, the artifacts version sourced, as defined in
-# eng/Version.Details.xml by var PrivateSourceBuiltArtifactsPackageVersion
-# Sometimes, this needs updating by stage0 scripts, thus it is bumped from this
-# version to establish that we are moving away from upstream
-_bootstrapver=3.1.416-r0
-
-# Patches to be used. String before '_' refers to repo to patch
-# Look for patch notes within each patch for what they fix / where they come from
-# build_* patches applies directly to $builddir
-_patches="
-	application-insights_fix-net40-location.patch
-	build_darc-fix-alpine.patch
-	build_ignore-warnings.patch
-	build_musl-build.patch
-	cli_add-zsh-compdef-completion-script.patch
-	coreclr_fix-musl-123.patch
-	core-sdk_generate-layout-core-setup-blob-path-fix.patch
-	core-setup_clang13-no-werror.patch
-	core-setup_rid-plat-generation-on-alpine-fix.patch
-	corefx_add-alpine-316-rid.patch
-	corefx_clang13-no-werror.patch
-	corefx_fix-build-clang13.patch
-	references_sh-build-fix.patch
-	"
-# Custom prepare
-default_prepare() {
-	return
-}
-
-# Following for for dotnet builds version 5.0 and under
-_pkgver_macro=${pkgver%.*}
-_pkgver_prior=${pkgver%.*.*}
-_pkgver_name=${_pkgver_macro//[.0]}
-pkgdesc="The .NET $_pkgver_macro SDK"
-arch="x86_64"
-case $CARCH in
-	x86_64) _dotnet_arch=x64;;
-	aarch64) _dotnet_arch=arm64;;
-	armv7) _dotnet_arch=arm;;
-esac
-url=https://www.microsoft.com/net/core
-license="MIT"
-_bootstrappkg="bootstrap"
-makedepends="
-	bash
-	clang
-	cmake
-	dotnet$_pkgver_name-$_bootstrappkg=$_bootstrapver
-	dotnet$_pkgver_name-$_bootstrappkg-artifacts=$_bootstrapver
-	findutils
-	git
-	grep
-	icu-dev
-	inetutils-syslogd
-	krb5-dev
-	libgit2-dev
-	libintl
-	libunwind-dev
-	libxml2-dev
-	libxml2-utils
-	linux-headers
-	lldb-dev
-	llvm
-	llvm-dev
-	lttng-ust-dev
-	nodejs
-	openssl-dev
-	zlib-dev
-	"
-options="!check" # No test suite
-
-# packages artifacts if building bootstrap
-[ "$_bootstrappkg" = "stage0" ] && subpackages="$pkgname-artifacts"
-
-source="
-	source-build-$_installertag.tar.gz::https://github.com/dotnet/source-build/archive/refs/tags/$_installertag.tar.gz
-	source-build-reference-packages-$_sbrptag.tar.gz::https://github.com/dotnet/source-build-reference-packages/archive/$_sbrptag.tar.gz
-	$_patches
-	"
-builddir="$srcdir/source-build-${_installertag/v}"
-_sbrpdir="$srcdir"/source-build-reference-packages-$_sbrptag
-_artifactsdir="/usr/share/dotnet/artifacts/${_bootstrapver%-*}"
-_referencesdir="/usr/share/dotnet/artifacts/${_bootstrapver%-*}/SourceBuildReferencePackages"
-_cli_root="$srcdir"/bootstrap
-
-# Custom patch logics for dotnet version 5.0 and under
-_patch() {
-	local i failed=
-	if ! have_patches; then
-		return 0
-	fi
-	[ -d "$builddir" ] || { error "Is \$builddir set correctly?"; return 1; }
-	msg "Deploying patches"
-	for i in $source; do
-		case ${i%::*} in
-			build_*.patch)
-				echo "applying $i to sourcebuild"
-				patch ${patch_args:--p1} -i "$srcdir/$(filename_from_uri $i)" || failed="$failed $i"
-			;;
-			references_*.patch)
-				echo "applying $i to references"
-				cd "$_sbrpdir"
-				patch ${patch_args:--p1} -i "$srcdir/$(filename_from_uri $i)" || failed="$failed $i"
-			;;
-			*.patch)
-				local _package=$(echo $i | sed 's|_.*||')
-				local _patch=$(echo $i | sed "s|$_package\_||")
-				echo "deploying $_patch to $_package for application by sourcebuild"
-				[ -d patches/$_package ] || mkdir -p patches/$_package
-				cp "$srcdir"/"$i" patches/$_package/$_patch
-			;;
-		esac
-	done
-
-	if [ -z "$failed" ]; then
-		return 0
-	fi
-	error "The following patches failed to apply:"
-	for i in $failed; do
-		printf "  %s\n" "$i"
-	done
-}
-
-# aport for bootstrap is effectively a copy of this aport, except that it
-# builds using stage0 bits, which are sourced from Microsoft prebuilts.
-# Another major difference is that rather than package build artifacts
-# under $dotnet_path/build to be packages later, it send artifacts to
-# $dotnet_path/bootstrap, as this is the directory that is sourced by
-# _prepare_bootstrap for build.
-_update_bootstrap() {
-	msg "Updating bootstrap APKBUILD"
-	# Copy patches
-	rm ../dotnet$_pkgver_name-bootstrap/*.patch || true
-	for i in ../dotnet"$_pkgver_name"-build/*.patch; do
-		cp $i ${i/$_pkgver_name-build/$_pkgver_name-bootstrap}
-	done
-
-	# Generate bootstrap
-	{
-		echo -n "# "
-		echo "Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>"
-		echo "# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>"
-		echo
-		echo "#"
-		echo "# This is generated from dotnet$_pkgver_name-build's APKBUILD."
-		echo "# Any modifications to be done in that APKBUILD and propagated by"
-		echo -n "# executing 'abuild _update_bootstrap'"
-		sed \
-			-e "s/pkgname=dotnet$_pkgver_name-build/pkgname=dotnet$_pkgver_name-bootstrap/" \
-			-e "s/_bootstrappkg=\"bootstrap\"/_bootstrappkg=\"stage0\"/" \
-			-e "1,2d" \
-			../dotnet$_pkgver_name-build/APKBUILD
-	} > ../dotnet$_pkgver_name-bootstrap/APKBUILD
-}
-
-# dotnet relies on itself when building, we thus need a bootstrap runtime
-# that is copied to write-capable folder
-_prepare_bootstrap() {
-	msg "Settings up bootstrap"
-	cp -r /usr/share/dotnet/bootstrap/${_bootstrapver%-*} "$_cli_root"
-
-	# Corrupt libcoreclrtraceptprovider.so when lttng <=2.13.0
-	# is detected as tracing is broken on dotnet platform
-	# due to ABI changes
-	# See https://github.com/dotnet/runtime/issues/57784.
-	if [ -f "/usr/lib/liblttng-ust.so.1 " ]; then
-		rm "$_cli_root"/shared/Microsoft.NETCore.App/*/libcoreclrtraceptprovider.so
-	fi
-}
-
-# Build doesn't set all the right executable bits for the right file types
-_fix_executable() {
-	# add executable bit
-	find "$1" -type f \( \
-		-name 'apphost' -o \
-		-name 'singlefilehost' -o \
-		-name 'lib*so' \
-			\) \
-		-exec chmod +x '{}' \;
-
-	# remove executable bit
-	find "$1" -type f \( \
-		-name '*.a' -o \
-		-name '*.dll' -o \
-		-name '*.h' -o \
-		-name '*.json' -o \
-		-name '*.pdb' -o \
-		-name '*.props' -o \
-		-name '*.pubxml' -o \
-		-name '*.targets' -o \
-		-name '*.txt' -o \
-		-name '*.xml' \
-			\) \
-		-exec chmod -x '{}' \;
-}
-
-prepare() {
-	default_prepare
-
-	# source-build expects to be in a git repo
-	git init
-	git add ./*
-	git commit -m 'initial commit'
-	git remote add origin https://github.com/dotnet/source-build.git
-
-	_patch
-	_prepare_bootstrap
-
-	# by default build populates these folders using Artifacts and SBRP archives
-	# we are instead going to populate them from the prebuilt artifacts provided
-	# by dotnetx-bootstrap-artifacts
-	[ -f "$builddir/packages" ] || mkdir -p "$builddir"/packages
-	cp -r "$_artifactsdir" "$builddir"/packages/prebuilt
-	mv "$builddir"/packages/prebuilt/SourceBuildReferencePackages "$builddir"/packages/reference
-	# make sure archives wont be downloaded or aren't expected.
-	[ -d "$builddir"/packages/archive ] && rm -r "$builddir"/packages/archive
-
-	# by default, coreclr-tools is not sourced from dotnetx-bootstrap-artifacts, thus
-	# it'll be the wrong architecture. Below replaces default coreclr-tools with
-	# versions from artifacts, which have been built properly
-	mkdir -p "$builddir"/Tools/source-built
-	cp -r "$builddir"/packages/prebuilt/coreclr-tools "$builddir"/Tools/source-built/.
-}
-
-build() {
-	msg "Building $pkgname-$pkgver"
-
-	# logs args, else the output is forwarded to log files which isn't ideal in a
-	# pipeline environment
-	local args="
-		/v:minimal
-		/p:LogVerbosity=minimal
-		/p:MinimalConsoleLogOutput=true
-		"
-
-	# defaults args for build on Alpine
-	local args="$args
-		/p:SkipDownloadingPreviouslySourceBuiltPackages=true
-		/p:SkipDownloadingReferencePackages=true
-		/p:ContinueOnPrebuiltBaselineError=true
-		/p:SkipPrebuiltEnforcement=true
-		/p:UseSystemLibraries=true
-		/p:UseSystemLibunwind=true
-		"
-
-	./build.sh \
-		--with-sdk "$_cli_root" \
-		$args | tee -a build.log
-
-	# only build references when building with stage0
-	[ "$_bootstrappkg" = "bootstrap" ] && return
-
-	msg "Building source build reference packages"
-	cd "$_sbrpdir"
-	./build.sh \
-		--with-sdk "$_cli_root" \
-		--with-packages "$builddir"/artifacts/$_dotnet_arch/Release/Private.SourceBuilt.Artifacts.0.1.0-dev.tar.gz \
-		| tee -a build.log
-}
-
-package() {
-	local subdir=${pkgname/*-}
-	local targetdir="$pkgdir"/usr/share/dotnet/$subdir/$pkgver
-
-	# directory creation
-	install -dm 755 \
-		"$targetdir"/docs \
-		"$targetdir"/comp
-
-	# unpack build artifacts to subdir defined by pkgname. If bootstrap, unpacks
-	# to bootstrap, if build unpacks to build
-	tar -xzf "$builddir"/artifacts/$_dotnet_arch/Release/dotnet-sdk-$_pkgver_macro*.tar.gz -C "$targetdir"/ --no-same-owner
-
-	# assemble completions
-	install -m 755 "$builddir"/artifacts/src/cli.*/scripts/register-completions.bash "$targetdir"/comp/
-	install -m 755 "$builddir"/artifacts/src/cli.*/scripts/register-completions.zsh "$targetdir"/comp/
-
-	# assemble docs
-	find "$builddir" -iname 'dotnet*.1' -type f -exec cp '{}' "$targetdir"/docs/ \;
-
-	# some files either should or should not have executable bits
-	_fix_executable "$pkgdir"
-
-	# See https://github.com/dotnet/source-build/issues/2579
-	find "$pkgdir" -type f -name 'testhost.x86' -delete
-	find "$pkgdir" -type f -name 'vstest.console' -delete
-}
-
-# build relies on a plethora of nupkgs which are provided by this Artifacts file.
-# stage0 sources these from Microsoft, which then allows bootstrap to build
-# locally hosted versions. The following unpacks built tarball into directory
-# for use by future builds.
-artifacts() {
-	pkgdesc="Internal package for building .NET $_pkgver_macro Software Development Kit"
-
-	# directory creation
-	install -dm 755 \
-		"$subpkgdir"/usr/share/dotnet/artifacts/$pkgver/SourceBuildReferencePackages \
-		"$subpkgdir"/usr/share/licenses
-
-	# extract artifacts to artifacts dir for use by future dotnet builds
-	tar -xzf "$builddir"/artifacts/$_dotnet_arch/Release/Private.SourceBuilt.Artifacts.*.tar.gz -C "$subpkgdir"/usr/share/dotnet/artifacts/$pkgver/ --no-same-owner \
-		--exclude '*Intermediate*'
-
-	# pulls SBRP artifacts
-	install -m 644 "$_sbrpdir"/artifacts/reference-packages/* "$subpkgdir"/usr/share/dotnet/artifacts/$pkgver/SourceBuildReferencePackages/.
-}
-
-sha512sums="
-9da463732a077dcbc84deccd6b0f8a6c4472800e2f4affc24a5c9eb5f6983fc6adeac8e15eda180b9474b2f2c7fd5a4a73ed5d4e41e2a5abec49cff6bc79e4c0  source-build-v3.1.418-SDK.tar.gz
-9d7ae29c311cd9550389225cab891df359385e098aaccb8100c77832ea7b7b1f6a7984d811cb1f45bd323182149246c33f2016b4ee85d97ee9b29243acc644bc  source-build-reference-packages-045b2888ccfaf4c203c945a09b3f41f0e6393d1c.tar.gz
-1ef3cb59231b7462167f782cbfcacee4a7bc7d73ec635de4ea3f4510cc6d46c5548ce2ec2ce3d3943bf6d1c29cb288dc1c82f1b22fe1c61fb6013e2df728467e  application-insights_fix-net40-location.patch
-f945552c083828e80031bdae584514aa8e7eb64544cc1fc3ca658a4162303f2a1caf076f44bc567c34ed2cf4c42323eaaafae0719adf9855756af125a566e99b  build_darc-fix-alpine.patch
-bd28775f37c9d448eab52922d0b8e0a6a32a3e16f772337850c48bd886e0302f97423b7b58dbc010c30764772f0bc00115ace72422dd12f447a5282ae62da4b3  build_ignore-warnings.patch
-e2a63a9c262a95698eba5639a32eb8ba968a3d4c1fb70ea9890f3915e9923190a4aabed0ef74d64cb5199ee9d06c77736d36861ed8418ab8638552763c2c58b5  build_musl-build.patch
-55afa9c74be6f5a87f1ff5aa44caad094cf620eb4388f6407218acf3d58a878f5565a0e875e95c3dbe0efca1879c120ee4b8076c521bfc9d6069a652c4a4fdd8  cli_add-zsh-compdef-completion-script.patch
-16181c48f9851da9cebab8f988ca8da4afd25c23c4f60567ef1fdec6b99da9dc2f77f2eeac4dbb919ec73bb12c24bea316e0dcb46d2c4c96913d904a236ed0f6  coreclr_fix-musl-123.patch
-5dffe94647daebd0a56ffd63db7f7f64ac7c4b279aa7189396d792fe4143989a91ffdb86f687dea3caa2475ac2ad43b95abcddacd175fef392bd24b52c957964  core-sdk_generate-layout-core-setup-blob-path-fix.patch
-f485faa18ae5884c35c6f672f3aec174628239a6137835b8db0647eec35c6b0bab042aa34b1b84631845944e0b86386ab64667d5d287d4de098c22957eae6063  core-setup_clang13-no-werror.patch
-8f2de7774a62c846a3c5806a2a6fa651930f30dc91f06fac7a8dc9032cb1fb8bbff6bdd833fc0767effcd35751ee43a4ca059fced926f2cd9f970c88dd7271eb  core-setup_rid-plat-generation-on-alpine-fix.patch
-141dee507f9c2947997d940278edc908ea76272bc320189c0d24cd219f466f48c6b072655dca8f2d5d681ce93be547c28edc2e4852f3c12c729812c9616d74d1  corefx_add-alpine-316-rid.patch
-e1dc0bb0112d116812646098565465ce863c42545a4c047806a73fbaf41202adc16917c6755874093b32b68bce2dfaa07e27fa63c34f02f28cda721933f63acb  corefx_clang13-no-werror.patch
-44edb976e75239d0133ea92a98af23e93e0de02022192738448c554d59391f15bc2a50e7d059696a8caebb6a0233c389fd0edb21b129a4df6b173889b198b4c5  corefx_fix-build-clang13.patch
-441528c42256f30dda83854f78d53d2507b6e7a159aea4456c3872a8be3690f8f222709a6ec70503cd1875d7d8c2f43d7a54ef0c30761fbdfc3c2a394136f7fc  references_sh-build-fix.patch
-"

testing/dotnet31-build/README.md

-# Description
-APKBUILD for dotnet31-build. This is sourced by dotnet31-runtime and dotnet31-sdk,
-which handles the actual packaging due to this aport building products with
-varying versions
-
-# Generated packages
-* dotnet31-build (aimed for internal use)
- 
-# How to build dotnet31 stack
-* Build testing/dotnet31-stage0 (provides prebuilt bits for first bootstrap bld)
-* Build testing/dotnet31-bootstrap (provides "tainted" SDK for first build)
-* Build testing/dotnet31-build ("untainted" build of dotnet)
-* Build testing/dotnet31-runtime (packages runtime bits from dotnet31-build)
-* Build testing/dotnet31-sdk (packages sdk bits from dotnet31-build)
-
-# Special functions
-* abuild _update_bootstrap: Updates dotnet31-bootstrap to current version

testing/dotnet31-build/application-insights_fix-net40-location.patch

-From 387efb0ac01e40cd85cf9f5ce770be6437265ca4 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/microsoft/ApplicationInsights-dotnet/issues/2498
-From: Antoine Martin <dev@ayakael.net>
-Date: Fri, 4 Jun 2021 13:32:53 +0000
-Subject: [PATCH] FIxed Net40 location
-
-Because paths on Linux are case sensitive. Applications insights looks
-for <dotnet/applicationsinsights>/src/Core/Managed/net40 in net40 
-while the repo has a Net40. Patch moves whatever is in Net40 to net40
----
- src/Core/Managed/{Net40 => net40}/CorrelationHelper.cs | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename src/Core/Managed/{Net40 => net40}/CorrelationHelper.cs (100%)
-
-diff --git a/src/Core/Managed/Net40/CorrelationHelper.cs b/src/Core/Managed/net40/CorrelationHelper.cs
-similarity index 100%
-rename from src/Core/Managed/Net40/CorrelationHelper.cs
-rename to src/Core/Managed/net40/CorrelationHelper.cs
--- 
-2.30.2
-

testing/dotnet31-build/build_darc-fix-alpine.patch

-From d07d50c6f8a5793badc50fb2c964b87dec87a3a1 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/source-build/issues/1868)
-From: Antoine Martin <dev@ayakael.net>
-Date: Thu, 15 Jul 2021 15:37:33 +0000
-Subject: [PATCH 1/1] Fixed darc init for Alpine
-
-Darc has a segmentation fault on Alpine due to not chosing the correct
-binary architecture. This patch deletes all the wrong ones so that it
-is forced to chose the correct one. This issue only occurs when using 
-dotnet-stage0-runtime, thus libunwind is suspected to be the issue as
-stage0 wasn't built with system libunwind.
----
- eng/common/darc-init.sh | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
-index 82b2b57..5227a37 100755
---- a/eng/common/darc-init.sh
-+++ b/eng/common/darc-init.sh
-@@ -77,6 +77,9 @@ function InstallDarcCli {
-   else
-     echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath")
-   fi
-+  for i in  win* ubuntu.1* rhel* osx fedora* debian*; do
-+    rm -R $toolpath/.store/microsoft.dotnet.darc/*/microsoft.dotnet.darc/*/tools/netcoreapp3.0/any/runtimes/${i}
-+  done
- }
- 
- InstallDarcCli
--- 
-2.30.2
-

testing/dotnet31-build/build_ignore-warnings.patch

-From 764e5310c8059931cd542c5cdc869972d3520696 Mon Sep 17 00:00:00 2001
-From: Antoine Martin <dev@ayakael.net>
-Date: Mon, 10 Jan 2022 23:21:55 +0000
-Subject: [PATCH 1/1] ignore warnings
-
-Ignore warnings during build of coreclr
----
- repos/coreclr.common.props | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/repos/coreclr.common.props b/repos/coreclr.common.props
-index 8e4137d8..2b0a459a 100644
---- a/repos/coreclr.common.props
-+++ b/repos/coreclr.common.props
-@@ -2,7 +2,7 @@
-   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
- 
-   <PropertyGroup>
--    <BuildArguments>$(Platform) $(Configuration) skiptests</BuildArguments>
-+    <BuildArguments>$(Platform) $(Configuration) skiptests ignorewarnings</BuildArguments>
-     <BuildArguments Condition="'$(OS)' != 'Windows_NT'">$(BuildArguments) -ignoreWarnings</BuildArguments>
-     <BuildArguments>$(BuildArguments) -skipmanagedtools</BuildArguments>
-     <BuildArguments Condition="'$(OS)' != 'Windows_NT'">$(BuildArguments) -skiprestore</BuildArguments>
--- 
-2.34.1
-

testing/dotnet31-build/build_musl-build.patch

-From 97c51fb4d0cb42d62ee60215b13df4c2d76ca68f Mon Sep 17 00:00:00 2001
-From: "build@apk-groulx" <build@apk-groulx.praxis>
-Date: Fri, 11 Feb 2022 16:44:05 +0000
-Subject: [PATCH 1/1] musl-build
-
----
- repos/aspnetcore.proj         | 1 +
- repos/core-sdk.proj           | 2 +-
- repos/core-setup.common.props | 2 +-
- repos/corefx.common.props     | 4 ++--
- 4 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj
-index fc04c1b8..e034ec0a 100644
---- a/repos/aspnetcore.proj
-+++ b/repos/aspnetcore.proj
-@@ -21,6 +21,7 @@
-     <BuildCommandArgs>$(BuildCommandArgs) /p:BuildNodeJs=false</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildRuntimeIdentifier=$(OverrideTargetRid)</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:UseAppHost=false</BuildCommandArgs>
-+    <BuildCommandArgs>$(BuildCommandArgs) --os-name linux-musl</BuildCommandArgs>
- 
-     <LogVerbosityOptOut>true</LogVerbosityOptOut>
- 
-diff --git a/repos/core-sdk.proj b/repos/core-sdk.proj
-index 7a78cf40..35cbb89d 100644
---- a/repos/core-sdk.proj
-+++ b/repos/core-sdk.proj
-@@ -9,7 +9,7 @@
-     <OSNameOverride>$(TargetRid.Substring(0, $(TargetRid.IndexOf("-"))))</OSNameOverride>
-     <BuildCommandArgs/>
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
--    <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
-+    <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-musl-$(Platform)</BuildCommandArgs>
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:OSName=$(OSNameOverride)</BuildCommandArgs>
-     <!-- core-sdk always wants to build portable on OSX and FreeBSD -->
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
-diff --git a/repos/core-setup.common.props b/repos/core-setup.common.props
-index 39821269..8e2fb7a5 100644
---- a/repos/core-setup.common.props
-+++ b/repos/core-setup.common.props
-@@ -6,7 +6,7 @@
-     <OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
--    <OverrideTargetRid Condition="'$(TargetOS)' == 'Linux' and ('$(PortableBuild)' == 'true' or '$(BuildingPortableRuntime)' == 'true')">linux-$(Platform)</OverrideTargetRid>
-+    <OverrideTargetRid Condition="'$(TargetOS)' == 'Linux' and ('$(PortableBuild)' == 'true' or '$(BuildingPortableRuntime)' == 'true')">linux-musl-$(Platform)</OverrideTargetRid>
-     <OverridePortable>$(PortableBuild)</OverridePortable>
-     <OverridePortable Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'FreeBSD'">true</OverridePortable>
-     <OverridePortable Condition="'$(BuildingPortableRuntime)' == 'true'">true</OverridePortable>
-diff --git a/repos/corefx.common.props b/repos/corefx.common.props
-index 8f214fbb..d7bc9800 100644
---- a/repos/corefx.common.props
-+++ b/repos/corefx.common.props
-@@ -12,7 +12,7 @@
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
--    <OverrideTargetRid Condition="'$(TargetOS)' == 'Linux' and ('$(PortableBuild)' == 'true' or '$(BuildingPortableRuntime)' == 'true')">linux-$(Platform)</OverrideTargetRid>
-+    <OverrideTargetRid Condition="'$(TargetOS)' == 'Linux' and ('$(PortableBuild)' == 'true' or '$(BuildingPortableRuntime)' == 'true')">linux-musl-$(Platform)</OverrideTargetRid>
- 
-     <BuildArguments>$(FlagParameterPrefix)configuration $(Configuration)</BuildArguments>
-     <BuildArguments Condition="'$(RunTests)' != 'true' AND '$(PrepForTests)' != 'true'">$(BuildArguments) $(FlagParameterPrefix)restore $(FlagParameterPrefix)build $(FlagParameterPrefix)pack /p:SkipTests=true</BuildArguments>
-@@ -24,7 +24,7 @@
-     <BuildArguments>$(BuildArguments) /p:PackageRid=$(OverrideTargetRid)</BuildArguments>
-     <!-- CoreFX parses this argument for a OS "family", i.e. rhel.7 to rhel.  OSX doesn't have the extra identifier so we need to include the
-          "-x64" so CoreFX can find a character to break on (digits, hyphen, period).  -->
--    <BuildArguments Condition="'$(TargetOS)' != 'OSX'">$(BuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</BuildArguments>
-+    <BuildArguments Condition="'$(TargetOS)' != 'OSX'">$(BuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))-musl</BuildArguments>
-     <BuildArguments Condition="'$(TargetOS)' == 'OSX'">$(BuildArguments) /p:RuntimeOS=$(OverrideTargetRid)</BuildArguments>
-     <BuildArguments>$(BuildArguments) /p:PortableBuild=$(OverridePortableBuild)</BuildArguments>
-     <BuildArguments>$(BuildArguments) /p:ILAsmToolPath=$(ToolPackageExtractDir)coreclr-tools/</BuildArguments>
--- 
-2.34.1
-

testing/dotnet31-build/cli_add-zsh-compdef-completion-script.patch

-From 4c74721e1f5da9642adab03075dda2f55719ac7b Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/sdk/pull/14239
-From: Esgariot <esgariot@icloud.com>
-Date: Mon, 19 Oct 2020 23:42:37 +0200
-Subject: [PATCH 1/1] Add zsh compdef completion script.
-
-Continuing off of PR 13384 in upstream.
-This commit is ready to be rebased to include appropriate co-authors
-before merging PR.
-
----
- scripts/register-completions.zsh | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/scripts/register-completions.zsh b/scripts/register-completions.zsh
-index 8eebe9a867..faa32fef71 100644
---- a/scripts/register-completions.zsh
-+++ b/scripts/register-completions.zsh
-@@ -1,10 +1,3 @@
--# zsh parameter completion for the dotnet CLI
--
--_dotnet_zsh_complete() 
--{
--  local completions=("$(dotnet complete "$words")")
--
--  reply=( "${(ps:\n:)completions}" )
--}
--
--compctl -K _dotnet_zsh_complete dotnet
-+#compdef dotnet
-+local completions=("$(dotnet complete "$words")")
-+[[ -n "$completions" ]] && compadd -- "${(ps:\n:)completions}" 
--- 
-2.34.1
-

testing/dotnet31-build/core-sdk_generate-layout-core-setup-blob-path-fix.patch

-From 94e8b5473285f0ae97204c726b2f8119f178f197 Mon Sep 17 00:00:00 2001
-From: Antoine Martin <dev@ayakael.net>
-Date: Sun, 5 Dec 2021 15:33:35 +0000
-Subject: [PATCH 1/1] GenerateLayout CoreSetup blob path fix
-
-<dotnet/core-setup> blobs are written to $builddir/artifacts/obj/x64/Release/
-blobs/Runtime/3.1.20-alpine.3.15 while installer expects them in 3.1.20.
-This patches <dotnet/installer>/src/redist/targets/GenerateLayout.targets
-to point to actual path.
-
----
- src/redist/targets/GenerateLayout.targets | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
-index eb4e312c0..240dbf403 100644
---- a/src/redist/targets/GenerateLayout.targets
-+++ b/src/redist/targets/GenerateLayout.targets
-@@ -12,7 +12,7 @@
-   <PropertyGroup>
-     <!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
-     <AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</AspNetCoreBlobVersion>
--    <CoreSetupBlobVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</CoreSetupBlobVersion>
-+    <CoreSetupBlobVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)-$([System.Text.RegularExpressions.Regex]::Replace($(Rid), "-.*", ""))</CoreSetupBlobVersion>
- 
-     <!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
-     <NETCoreAppTargetingPackBlobVersion Condition="'$(Rid)' != 'win-arm64'">3.1.0-rtm.19565.2</NETCoreAppTargetingPackBlobVersion>
--- 
-2.34.0
-

testing/dotnet31-build/core-setup_clang13-no-werror.patch

-From e900fff68af76d51a59ac085b35ace76939bc007 Mon Sep 17 00:00:00 2001
-Patch-Source: https://src.fedoraproject.org/rpms/dotnet3.1/blob/rawhide/f/core-setup-no-werror.patch
-From: Omair Majid <omajid@redhat.com>
-Date: Tue, 18 Jan 2022 21:45:52 -0500
-Subject: [PATCH] Disable Werror
- 
-This is so late in the release cycle that fixing warnings is just not
-really worth it. The general approach is to fix the issues in the
-development branches and disable warnings in the older release branches.
----
- src/settings.cmake | 1 -
- 1 file changed, 1 deletion(-)
- 
-diff --git a/src/settings.cmake b/src/settings.cmake
-index ff1e04f9..5cc9b3ef 100644
---- a/src/settings.cmake
-+++ b/src/settings.cmake
-@@ -201,7 +201,6 @@ else()
-         # compiling with -std=c++11.
-         # add_compile_options(-Weverything)
-     endif()
--    add_compile_options(-Werror)
-     add_compile_options(-Wno-missing-field-initializers)
-     add_compile_options(-Wno-unused-function)
-     add_compile_options(-Wno-unused-local-typedef)
--- 
-2.34.1

testing/dotnet31-build/core-setup_rid-plat-generation-on-alpine-fix.patch

-From 0bbf075007df7313cceccfc9ad0512db912dfcbd Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/core-setup/pull/9195
-From: Antoine Martin <dev@ayakael.net>
-Date: Tue, 22 Feb 2022 01:18:45 +0000
-Subject: [PATCH 1/1] Fixed __rid_plat generation on alpine for core-setup
-
-<dotnet/core-setup>/src/corehost/build.sh generates wrong plat_rid on Alpine
-Generated RID is expected to be alpine.x.xx-xx, while the computed RID
-is linux-musl-xxx. This patches it by matching what's expected.
-
-On portable builds it also broken as computed RID is linux rather
-than the expected linux-musl
-
----
- src/corehost/build.sh | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/corehost/build.sh b/src/corehost/build.sh
-index fb503e74..c3b34321 100755
---- a/src/corehost/build.sh
-+++ b/src/corehost/build.sh
-@@ -21,14 +21,11 @@ init_rid_plat()
-         __rid_plat=""
-         if [ -e /etc/os-release ]; then
-             source /etc/os-release
--            if [[ "$ID" == "rhel" ]]; then
-+            if [ "$ID" == "rhel" ] || [ "$ID" == "alpine" ] ; then
-                 # remove the last version number
-                 VERSION_ID=${VERSION_ID%.*}
-             fi
-             __rid_plat="$ID.$VERSION_ID"
--            if [[ "$ID" == "alpine" ]]; then
--                __rid_plat="linux-musl"
--            fi
-         elif [ -e /etc/redhat-release ]; then
-             local redhatRelease=$(</etc/redhat-release)
-             if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
-@@ -50,6 +47,8 @@ init_rid_plat()
-             __rid_plat="osx"
-         elif [ "$(uname -s)" == "FreeBSD" ]; then
-             __rid_plat="freebsd"
-+        elif [[ "$ID" == "alpine" ]]; then
-+            __rid_plat="linux-musl"
-         else
-             __rid_plat="linux"
-         fi
--- 
-2.34.1
-

testing/dotnet31-build/coreclr_fix-musl-123.patch

-From 2582f958770ca42ec7b40c55690abf5e93e7d99a Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/coreclr/pull/28245
-From: Antoine Martin <dev@ayakael.net>
-Date: Sun, 17 Apr 2022 00:42:11 +0000
-Subject: [PATCH 1/1] musl-321
-
-Musl 1.2.3 introduced NULL checks that breaks this code. Patch fixes
-code for better compliancy.
-
----
- src/pal/src/include/pal/palinternal.h | 12 ++--
- src/pal/src/init/pal.cpp              | 92 +++++++++++++--------------
- 2 files changed, 52 insertions(+), 52 deletions(-)
-
-diff --git a/src/pal/src/include/pal/palinternal.h b/src/pal/src/include/pal/palinternal.h
-index 12e161dff1..7ef4c70ef5 100644
---- a/src/pal/src/include/pal/palinternal.h
-+++ b/src/pal/src/include/pal/palinternal.h
-@@ -729,30 +729,30 @@ T* InterlockedCompareExchangePointerT(
- template <typename T>
- inline T* InterlockedExchangePointerT(
-     T* volatile * target,
--    int           value) // When NULL is provided as argument.
-+    std::nullptr_t           value) // When NULL is provided as argument.
- {
-     //STATIC_ASSERT(value == 0);
--    return InterlockedExchangePointerT(target, reinterpret_cast<T*>(value));
-+    return InterlockedExchangePointerT(target, (T*)(void*)(value));
- }
- 
- template <typename T>
- inline T* InterlockedCompareExchangePointerT(
-     T* volatile * destination,
--    int           exchange,  // When NULL is provided as argument.
-+    std::nullptr_t           exchange,  // When NULL is provided as argument.
-     T*            comparand)
- {
-     //STATIC_ASSERT(exchange == 0);
--    return InterlockedCompareExchangePointerT(destination, reinterpret_cast<T*>(exchange), comparand);
-+    return InterlockedCompareExchangePointerT(destination, (T*)(void*)(exchange), comparand);
- }
- 
- template <typename T>
- inline T* InterlockedCompareExchangePointerT(
-     T* volatile * destination,
-     T*            exchange,
--    int           comparand) // When NULL is provided as argument.
-+    std::nullptr_t           comparand) // When NULL is provided as argument.
- {
-     //STATIC_ASSERT(comparand == 0);
--    return InterlockedCompareExchangePointerT(destination, exchange, reinterpret_cast<T*>(comparand));
-+    return InterlockedCompareExchangePointerT(destination, exchange, (T*)(void*)(comparand));
- }
- 
- #undef InterlockedExchangePointer
-diff --git a/src/pal/src/init/pal.cpp b/src/pal/src/init/pal.cpp
-index ab926a1a12..1acb0d815f 100644
---- a/src/pal/src/init/pal.cpp
-+++ b/src/pal/src/init/pal.cpp
-@@ -128,7 +128,7 @@ static bool RunningNatively()
- {
-     int ret = 0;
-     size_t sz = sizeof(ret);
--    if (sysctlbyname("sysctl.proc_native", &ret, &sz, NULL, 0) != 0)
-+    if (sysctlbyname("sysctl.proc_native", &ret, &sz, nullptr, 0) != 0)
-     {
-         // if the sysctl failed, we'll assume this OS does not support
-         // binary translation - so we must be running natively.
-@@ -201,7 +201,7 @@ int
- PALAPI
- PAL_InitializeDLL()
- {
--    return Initialize(0, NULL, g_initializeDLLFlags);
-+    return Initialize(0, nullptr, g_initializeDLLFlags);
- }
- 
- /*++
-@@ -263,12 +263,12 @@ void
- InitializeDefaultStackSize()
- {
-     char* defaultStackSizeStr = getenv("COMPlus_DefaultStackSize");
--    if (defaultStackSizeStr != NULL)
-+    if (defaultStackSizeStr != nullptr)
-     {
-         errno = 0;
-         // Like all numeric values specific by the COMPlus_xxx variables, it is a 
-         // hexadecimal string without any prefix.
--        long int size = strtol(defaultStackSizeStr, NULL, 16);
-+        long int size = strtol(defaultStackSizeStr, nullptr, 16);
- 
-         if (errno == 0)
-         {
-@@ -305,10 +305,10 @@ Initialize(
-     DWORD flags)
- {
-     PAL_ERROR palError = ERROR_GEN_FAILURE;
--    CPalThread *pThread = NULL;
--    CSharedMemoryObjectManager *pshmom = NULL;
--    LPWSTR command_line = NULL;
--    LPWSTR exe_path = NULL;
-+    CPalThread *pThread = nullptr;
-+    CSharedMemoryObjectManager *pshmom = nullptr;
-+    LPWSTR command_line = nullptr;
-+    LPWSTR exe_path = nullptr;
-     int retval = -1;
-     bool fFirstTimeInit = false;
- 
-@@ -330,18 +330,18 @@ Initialize(
- 
-     CriticalSectionSubSysInitialize();
- 
--    if(NULL == init_critsec)
-+    if(nullptr == init_critsec)
-     {
-         pthread_mutex_lock(&init_critsec_mutex); // prevents race condition of two threads 
-                                                  // initializing the critical section.
--        if(NULL == init_critsec)
-+        if(nullptr == init_critsec)
-         {
-             static CRITICAL_SECTION temp_critsec;
- 
-             // Want this critical section to NOT be internal to avoid the use of unsafe region markers.
-             InternalInitializeCriticalSectionAndSpinCount(&temp_critsec, 0, false);
- 
--            if(NULL != InterlockedCompareExchangePointer(&init_critsec, &temp_critsec, NULL))
-+            if(nullptr != InterlockedCompareExchangePointer(&init_critsec, &temp_critsec, nullptr))
-             {
-                 // Another thread got in before us! shouldn't happen, if the PAL
-                 // isn't initialized there shouldn't be any other threads 
-@@ -352,7 +352,7 @@ Initialize(
-         pthread_mutex_unlock(&init_critsec_mutex);
-     }
- 
--    InternalEnterCriticalSection(pThread, init_critsec); // here pThread is always NULL
-+    InternalEnterCriticalSection(pThread, init_critsec); // here pThread is always nullptr
- 
-     if (init_count == 0)
-     {
-@@ -387,12 +387,12 @@ Initialize(
- 
- #ifdef FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION
-         char* useDefaultBaseAddr = getenv("COMPlus_UseDefaultBaseAddr");
--        if (useDefaultBaseAddr != NULL)
-+        if (useDefaultBaseAddr != nullptr)
-         {
-             errno = 0;
-             // Like all numeric values specific by the COMPlus_xxx variables, it is a
-             // hexadecimal string without any prefix.
--            long int flag = strtol(useDefaultBaseAddr, NULL, 16);
-+            long int flag = strtol(useDefaultBaseAddr, nullptr, 16);
- 
-             if (errno == 0)
-             {
-@@ -510,7 +510,7 @@ Initialize(
-         //
- 
-         pshmom = InternalNew<CSharedMemoryObjectManager>();
--        if (NULL == pshmom)
-+        if (nullptr == pshmom)
-         {
-             ERROR("Unable to allocate new object manager\n");
-             palError = ERROR_OUTOFMEMORY;
-@@ -533,7 +533,7 @@ Initialize(
-         g_pSynchronizationManager =
-             CPalSynchMgrController::CreatePalSynchronizationManager();
- 
--        if (NULL == g_pSynchronizationManager)
-+        if (nullptr == g_pSynchronizationManager)
-         {
-             palError = ERROR_NOT_ENOUGH_MEMORY;
-             ERROR("Failure creating synchronization manager\n");
-@@ -547,11 +547,11 @@ Initialize(
- 
-     palError = ERROR_GEN_FAILURE;
- 
--    if (argc > 0 && argv != NULL)
-+    if (argc > 0 && argv != nullptr)
-     {
-         /* build the command line */
-         command_line = INIT_FormatCommandLine(argc, argv);
--        if (NULL == command_line)
-+        if (nullptr == command_line)
-         {
-             ERROR("Error building command line\n");
-             goto CLEANUP1d;
-@@ -559,13 +559,13 @@ Initialize(
- 
-         /* find out the application's full path */
-         exe_path = INIT_ConvertEXEPath(argv[0]);
--        if (NULL == exe_path)
-+        if (nullptr == exe_path)
-         {
-             ERROR("Unable to find exe path\n");
-             goto CLEANUP1e;
-         }
- 
--        if (NULL == command_line || NULL == exe_path)
-+        if (nullptr == command_line || nullptr == exe_path)
-         {
-             ERROR("Failed to process command-line parameters!\n");
-             goto CLEANUP2;
-@@ -582,7 +582,7 @@ Initialize(
-         }
- 
-         // InitializeProcessCommandLine took ownership of this memory.
--        command_line = NULL;
-+        command_line = nullptr;
- 
- #ifdef PAL_PERF
-         // Initialize the Profiling structure
-@@ -601,7 +601,7 @@ Initialize(
-         }
- 
-         // LOADSetExeName took ownership of this memory.
--        exe_path = NULL;
-+        exe_path = nullptr;
-     }
- 
-     if (init_count == 0)
-@@ -751,7 +751,7 @@ done:
- 
-     if (fFirstTimeInit && 0 == retval)
-     {
--        _ASSERTE(NULL != pThread);
-+        _ASSERTE(nullptr != pThread);
-     }
- 
-     if (retval != 0 && GetLastError() == ERROR_SUCCESS)
-@@ -867,7 +867,7 @@ PAL_IsDebuggerPresent()
-     struct kinfo_proc info = {};
-     size_t size = sizeof(info);
-     int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() };
--    int ret = sysctl(mib, sizeof(mib)/sizeof(*mib), &info, &size, NULL, 0);
-+    int ret = sysctl(mib, sizeof(mib)/sizeof(*mib), &info, &size, nullptr, 0);
- 
-     if (ret == 0)
-         return ((info.kp_proc.p_flag & P_TRACED) != 0);
-@@ -880,12 +880,12 @@ PAL_IsDebuggerPresent()
- 
-     struct kinfo_proc *info;
- 
--    kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open");
--    if (kd == NULL)
-+    kd = kvm_open(nullptr, nullptr, nullptr, KVM_NO_FILES, "kvm_open");
-+    if (kd == nullptr)
-         return FALSE;
- 
-     info = kvm_getprocs(kd, KERN_PROC_PID, getpid(), &cnt);
--    if (info == NULL || cnt < 1)
-+    if (info == nullptr || cnt < 1)
-     {
-         kvm_close(kd);
-         return FALSE;
-@@ -923,7 +923,7 @@ PAL_EntryPoint(
-     ENTRY("PAL_EntryPoint(lpStartAddress=%p, lpParameter=%p)\n", lpStartAddress, lpParameter);
- 
-     pThread = InternalGetCurrentThread();
--    if (NULL == pThread)
-+    if (nullptr == pThread)
-     {
-         /* This function works only for thread that called PAL_Initialize for now. */
-         ERROR( "Unable to get the thread object.\n" );
-@@ -984,7 +984,7 @@ PAL_TerminateEx(
- {
-     ENTRY_EXTERNAL("PAL_TerminateEx()\n");
- 
--    if (NULL == init_critsec)
-+    if (nullptr == init_critsec)
-     {
-         /* note that these macros probably won't output anything, since the
-         debug channels haven't been initialized yet */
-@@ -1102,7 +1102,7 @@ BOOL PALInitLock(void)
-     }
-     
-     CPalThread * pThread = 
--        (PALIsThreadDataInitialized() ? InternalGetCurrentThread() : NULL);
-+        (PALIsThreadDataInitialized() ? InternalGetCurrentThread() : nullptr);
-     
-     InternalEnterCriticalSection(pThread, init_critsec);
-     return TRUE;
-@@ -1124,7 +1124,7 @@ void PALInitUnlock(void)
-     }
- 
-     CPalThread * pThread = 
--        (PALIsThreadDataInitialized() ? InternalGetCurrentThread() : NULL);
-+        (PALIsThreadDataInitialized() ? InternalGetCurrentThread() : nullptr);
- 
-     InternalLeaveCriticalSection(pThread, init_critsec);
- }
-@@ -1206,7 +1206,7 @@ Note : not all peculiarities of Windows command-line processing are supported;
- static LPWSTR INIT_FormatCommandLine (int argc, const char * const *argv)
- {
-     LPWSTR retval;
--    LPSTR command_line=NULL, command_ptr;
-+    LPSTR command_line=nullptr, command_ptr;
-     LPCSTR arg_ptr;
-     INT length, i,j;
-     BOOL bQuoted = FALSE;
-@@ -1231,7 +1231,7 @@ static LPWSTR INIT_FormatCommandLine (int argc, const char * const *argv)
-     if(!command_line)
-     {
-         ERROR("couldn't allocate memory for command line!\n");
--        return NULL;
-+        return nullptr;
-     }
- 
-     command_ptr=command_line;
-@@ -1270,27 +1270,27 @@ static LPWSTR INIT_FormatCommandLine (int argc, const char * const *argv)
-     *command_ptr='\0';
- 
-     /* convert to Unicode */
--    i = MultiByteToWideChar(CP_ACP, 0,command_line, -1, NULL, 0);
-+    i = MultiByteToWideChar(CP_ACP, 0,command_line, -1, nullptr, 0);
-     if (i == 0)
-     {
-         ASSERT("MultiByteToWideChar failure\n");
-         free(command_line);
--        return NULL;
-+        return nullptr;
-     }
- 
-     retval = reinterpret_cast<LPWSTR>(InternalMalloc((sizeof(WCHAR)*i)));
--    if(retval == NULL)
-+    if(retval == nullptr)
-     {
-         ERROR("can't allocate memory for Unicode command line!\n");
-         free(command_line);
--        return NULL;
-+        return nullptr;
-     }
- 
-     if(!MultiByteToWideChar(CP_ACP, 0,command_line, i, retval, i))
-     {
-         ASSERT("MultiByteToWideChar failure\n");
-         free(retval);
--        retval = NULL;
-+        retval = nullptr;
-     }
-     else
-         TRACE("Command line is %s\n", command_line);
-@@ -1326,33 +1326,33 @@ static LPWSTR INIT_ConvertEXEPath(LPCSTR exe_path)
-     if (!strchr(exe_path, '/'))
-     {
-         ERROR( "The exe path is not fully specified\n" );
--        return NULL;
-+        return nullptr;
-     }
- 
-     if (-1 == stat(exe_path, &theStats))
-     {
-         ERROR( "The file does not exist\n" );
--        return NULL;
-+        return nullptr;
-     }
- 
-     if (!CorUnix::RealPathHelper(exe_path, real_path))
-     {
-         ERROR("realpath() failed!\n");
--        return NULL;
-+        return nullptr;
-     }
- 
--    return_size = MultiByteToWideChar(CP_ACP, 0, real_path, -1, NULL, 0);
-+    return_size = MultiByteToWideChar(CP_ACP, 0, real_path, -1, nullptr, 0);
-     if (0 == return_size)
-     {
-         ASSERT("MultiByteToWideChar failure\n");
--        return NULL;
-+        return nullptr;
-     }
- 
-     return_value = reinterpret_cast<LPWSTR>(InternalMalloc((return_size*sizeof(WCHAR))));
--    if (NULL == return_value)
-+    if (nullptr == return_value)
-     {
-         ERROR("Not enough memory to create full path\n");
--        return NULL;
-+        return nullptr;
-     }
-     else
-     {
-@@ -1361,7 +1361,7 @@ static LPWSTR INIT_ConvertEXEPath(LPCSTR exe_path)
-         {
-             ASSERT("MultiByteToWideChar failure\n");
-             free(return_value);
--            return_value = NULL;
-+            return_value = nullptr;
-         }
-         else
-         {
--- 
-2.31.1
-

testing/dotnet31-build/corefx_add-alpine-316-rid.patch

-From 32e4972ddef7b3ba5bd68e581d8dc3abd6af3067 Mon Sep 17 00:00:00 2001
-From: Antoine Martin <dev@ayakael.net>
-Date: Tue, 29 Mar 2022 14:03:04 +0000
-Subject: [PATCH 1/1] add alpine 3.16 RID
-
-Adds RID for Alpine 3.16
-
----
- .../runtime.compatibility.json                | 56 ++++++++++++++++++-
- pkg/Microsoft.NETCore.Platforms/runtime.json  | 14 ++++-
- .../runtimeGroups.props                       |  2 +-
- 3 files changed, 68 insertions(+), 4 deletions(-)
-
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-index 504c479baa..2a4459dac6 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-@@ -274,7 +274,59 @@
-     "any",
-     "base"
-   ],
--
-+  "alpine.3.16": [
-+    "alpine.3.16",
-+    "alpine.3.15",
-+    "alpine.3.14",
-+    "alpine.3.13",
-+    "alpine.3.12",
-+    "alpine.3.11",
-+    "alpine.3.10",
-+    "alpine.3.9",
-+    "alpine.3.8",
-+    "alpine.3.7",
-+    "alpine.3.6",
-+    "alpine",
-+    "linux-musl",
-+    "linux",
-+    "unix",
-+    "any",
-+    "base"
-+  ],
-+  "alpine.3.16-x64": [
-+    "alpine.3.16-x64",
-+    "alpine.3.16",
-+    "alpine.3.15-x64",
-+    "alpine.3.15",
-+    "alpine.3.14-x64",
-+    "alpine.3.14",
-+    "alpine.3.13-x64",
-+    "alpine.3.13",
-+    "alpine.3.12-x64",
-+    "alpine.3.12",
-+    "alpine.3.11-x64",
-+    "alpine.3.11",
-+    "alpine.3.10-x64",
-+    "alpine.3.10",
-+    "alpine.3.9-x64",
-+    "alpine.3.9",
-+    "alpine.3.8-x64",
-+    "alpine.3.8",
-+    "alpine.3.7-x64",
-+    "alpine.3.7",
-+    "alpine.3.6-x64",
-+    "alpine.3.6",
-+    "alpine-x64",
-+    "alpine",
-+    "linux-musl-x64",
-+    "linux-musl",
-+    "linux-x64",
-+    "linux",
-+    "unix-x64",
-+    "unix",
-+    "any",
-+    "base"
-+  ],
-   "alpine.3.6": [
-     "alpine.3.6",
-     "alpine",
-@@ -5403,4 +5455,4 @@
-     "any",
-     "base"
-   ]
--}
-\ No newline at end of file
-+}
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
-index 57abcae8ab..c37e566fba 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtime.json
-+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
-@@ -77,6 +77,18 @@
-         "alpine.3.14-x64"
-       ]
-     },
-+    "alpine.3.16": {
-+      "#import": [
-+        "alpine.3.15"
-+      ]
-+    },
-+    "alpine.3.16-x64": {
-+      "#import": [
-+        "alpine.3.16",
-+        "alpine.3.15-x64"
-+      ]
-+    },
-+
-     "alpine.3.6": {
-       "#import": [
-         "alpine"
-@@ -2453,4 +2465,4 @@
-       ]
-     }
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-index c466a38915..ffbe35200a 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-@@ -16,7 +16,7 @@
-     <RuntimeGroup Include="alpine">
-       <Parent>linux-musl</Parent>
-       <Architectures>x64</Architectures>
--      <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15</Versions>
-+      <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15;3.16</Versions>
-     </RuntimeGroup>
- 
-     <RuntimeGroup Include="android">
--- 
-2.35.1
-

testing/dotnet31-build/corefx_clang13-no-werror.patch

-From 775dedb87946a3be38641060d9eab5de1e472fe3 Mon Sep 17 00:00:00 2001
-Patch-Source: https://src.fedoraproject.org/rpms/dotnet3.1/blob/rawhide/f/corefx-no-werror.patch
-From: Omair Majid <omajid@redhat.com>
-Date: Tue, 29 Mar 2022 14:43:44 +0000
-Subject: [PATCH 1/1] no-werror
-
----
- src/Native/Unix/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt
-index 005aaf1e7d..dc45e58c2a 100644
---- a/src/Native/Unix/CMakeLists.txt
-+++ b/src/Native/Unix/CMakeLists.txt
-@@ -32,8 +32,8 @@ add_compile_options(-g)
- if(CMAKE_C_COMPILER_ID STREQUAL Clang)
-     add_compile_options(-Wthread-safety)
-     add_compile_options(-Wno-thread-safety-analysis)
-+    add_compile_options(-Wno-alloca)
- endif()
--add_compile_options(-Werror)
- 
- if(CMAKE_SYSTEM_NAME STREQUAL Emscripten)
-     set(CLR_CMAKE_PLATFORM_WASM 1)
--- 
-2.35.1
-

testing/dotnet31-build/corefx_fix-build-clang13.patch

-From 124bc55d35fd46ed165a07996cbaa9ad11a17eb5 Mon Sep 17 00:00:00 2001
-Patch-Source: https://github.com/dotnet/corefx/pull/43104
-From: Omair Majid <omajid@redhat.com>
-Date: Thu, 20 Jan 2022 12:41:51 -0500
-Subject: [PATCH 1/1] Fix building with clang 13
-
-Clang 13 now enables cast-function-type warning which results in build
-errors that look like this:
-
-    /corefx/src/Native/Unix/System.Native/pal_process.c(382,76): error G39B05358: cast from 'void (*)(int, siginfo_t *, void *)' to 'void (*)(int)' converts to incompatible function type [-Werror,-Wcast-function-type] [/corefx/src/Native/build-native.proj]
-    void (*oldhandler)(int) = (sa_old.sa_flags & SA_SIGINFO) ? (void (*)(int))sa_old.sa_sigaction : sa_old.sa_handler;
-                                                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Disable this warning using -Wno-cast-function-type warning. That seems
-lower-risk than any functional code change.
-
-Clang 13 also enables reserved-identifier warning which results in build errors
-like this:
-
-    /corefx/src/Native/Unix/System.Native/pal_process.c(819,17): error GA61F72A6: identifier '__cpu' is reserved because it starts with '__' [-Werror,-Wreserved-identifier] [/corefx/src/Native/build-native.proj]
-                      if (CPU_ISSET(cpu, &set))
-                          ^
-    /usr/include/sched.h:94:34: note: expanded from macro 'CPU_ISSET'
-    # define CPU_ISSET(cpu, cpusetp) __CPU_ISSET_S (cpu, sizeof (cpu_set_t), \
-                                     ^
-
-This really seems like a bug in clang that it's complaining about code in
-system libraries that we are using via wrapper-macros. But there are
-other instances of this warning that are speciifc to our code too, such
-as `__padding` in
-src/Native/Unix/System.Native/pal_interfaceaddresses.h. Disable this
-warning too.
-
-Tested with Clang 13 rc1.
----
- src/Native/Unix/CMakeLists.txt  | 6 ++++++
- src/Native/Unix/configure.cmake | 2 ++
- 2 files changed, 8 insertions(+)
-
-diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt
-index c5772c7e02..005aaf1e7d 100644
---- a/src/Native/Unix/CMakeLists.txt
-+++ b/src/Native/Unix/CMakeLists.txt
-@@ -261,9 +261,15 @@ include(configure.cmake)
- if (HAVE_WNO_ALLOCA)
-     add_compile_options(-Wno-alloca)
- endif()
-+if (HAVE_WNO_CAST_FUNCTION_TYPE)
-+    add_compile_options(-Wno-cast-function-type)
-+endif()
- if (HAVE_WNO_IMPLICIT_INT_FLOAT_CONVERSION)
-     add_compile_options(-Wno-implicit-int-float-conversion)
- endif()
-+if (HAVE_WNO_RESERVED_IDENTIFIER)
-+    add_compile_options(-Wno-reserved-identifier)
-+endif()
- 
- if (NOT CLR_CMAKE_PLATFORM_WASM)
-     add_subdirectory(System.IO.Compression.Native)
-diff --git a/src/Native/Unix/configure.cmake b/src/Native/Unix/configure.cmake
-index 6756ea26a5..a01cf90760 100644
---- a/src/Native/Unix/configure.cmake
-+++ b/src/Native/Unix/configure.cmake
-@@ -34,6 +34,8 @@ set(CMAKE_REQUIRED_FLAGS "-Werror -Wno-error=unused-value")
- 
- check_c_compiler_flag(-Wno-alloca HAVE_WNO_ALLOCA)
- check_c_compiler_flag(-Wno-implicit-int-float-conversion HAVE_WNO_IMPLICIT_INT_FLOAT_CONVERSION)
-+check_c_compiler_flag(-Wno-reserved-identifier HAVE_WNO_RESERVED_IDENTIFIER)
-+check_c_compiler_flag(-Wno-cast-function-type HAVE_WNO_CAST_FUNCTION_TYPE)
- 
- # in_pktinfo: Find whether this struct exists
- check_include_files(
--- 
-2.35.1

testing/dotnet31-build/references_sh-build-fix.patch

-From 7b1f102db70fd8c86f21c722669c9f7337367eee Mon Sep 17 00:00:00 2001
-From: Antoine Martin <dev@ayakael.net>
-Date: Sat, 8 Jan 2022 17:02:38 +0000
-Subject: [PATCH 1/1] patched for sh
-
-Exec Command issue with bad character for busybox sh.
-This patches by removing bad character so that it can run with busybox
-
----
- src/targetPacks/assemble.targets | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/targetPacks/assemble.targets b/src/targetPacks/assemble.targets
-index 6b884ce2..e5009793 100644
---- a/src/targetPacks/assemble.targets
-+++ b/src/targetPacks/assemble.targets
-@@ -13,7 +13,7 @@
-     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Assemble TargetingPacks src." />
-     <MakeDir Directories="@(TargetingPackSrc->'$(ArtifactsTFMPackTemp)$(MSBuildProjectName)/%(RecursiveDir)')" />
-     <!-- Note: Hack below to not fill up build logs.  Ilasm produces warning on validly disassembled il src.  The awk below eats just that warning -->
--    <Exec Command="set -o pipefail;$(IlasmToolPathSB)ilasm %(TargetingPackSrc.Identity) -dll -quiet -nologo -output=$(ArtifactsTFMPackTemp)$(MSBuildProjectName)/%(RecursiveDir)%(TargetingPackSrc.Filename).dll |&amp; awk '!/warning : Method has no body/'" IgnoreStandardErrorWarningFormat="true"/>
-+    <Exec Command="set -o pipefail;$(IlasmToolPathSB)ilasm %(TargetingPackSrc.Identity) -dll -quiet -nologo -output=$(ArtifactsTFMPackTemp)$(MSBuildProjectName)/%(RecursiveDir)%(TargetingPackSrc.Filename).dll | awk '!/warning : Method has no body/'" IgnoreStandardErrorWarningFormat="true"/>
-     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Done assembling TargetPacks src." />
-   </Target>
- </Project>
--- 
-2.34.1
-

testing/libnbd/APKBUILD

 # Contributor: Sean McAvoy <seanmcavoy@gmail.com>
 # Maintainer: Sean McAvoy <seanmcavoy@gmail.com>
 pkgname=libnbd
-pkgver=1.10.5
+pkgver=1.14.1
 pkgrel=0
 pkgdesc="NBD client library in userspace"
 url="https://github.com/libguestfs/libnbd"
@@ -12,10 +12,12 @@ makedepends="perl autoconf automake gnutls-dev linux-headers libtool python3-dev
 checkdepends="qemu-img bash python3"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion"
 source="
-	https://download.libguestfs.org/libnbd/1.10-stable/libnbd-$pkgver.tar.gz
+	https://download.libguestfs.org/libnbd/${pkgver%.*}-stable/libnbd-$pkgver.tar.gz
 	"
 
 # secfixes:
+#   1.14.1-r0:
+#     - CVE-2022-0485
 #   1.10.5-r0:
 #     - CVE-2021-20286
 
@@ -29,7 +31,8 @@ build() {
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--sysconfdir=/etc
+		--sysconfdir=/etc \
+		--disable-golang
 	make
 }
 
@@ -42,5 +45,5 @@ package() {
 }
 
 sha512sums="
-036c13d29bc1490d44051db79dcce01c5f61d8b2108f8ffa28eb5f225c75a622f7e490e7a5a4dff4eba14b8ff2535ba1d4183cf8e4a5569d6201c72bfea4bb11  libnbd-1.10.5.tar.gz
+9d95cf7a66926d00ec9aacfc6d04f2dc885ccfed07c78f1e6693190dd14132d30d6d1ff7d46e46007732a8a20a9fbf648775bc0b3371ad49eff4ce1e44e47209  libnbd-1.14.1.tar.gz
 "

testing/limine/APKBUILD

 # Maintainer: psykose <alice@ayaya.dev>
 pkgname=limine
-pkgver=4.0
+pkgver=4.0.2
 pkgrel=0
 pkgdesc="Advanced multiprotocol x86/x86_64 BIOS/UEFI Bootloader"
 url="https://limine-bootloader.org"
@@ -30,11 +30,9 @@ options="!check" # no tests in tarball
 
 build() {
 	./configure \
-		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--enable-all \
-		CROSS_OBJCOPY=llvm-objcopy
+		--enable-all
 	make
 }
 
@@ -92,5 +90,5 @@ _64_arm() {
 }
 
 sha512sums="
-d429a7ac7884e0ac5373c85305da4d7eedb203598df9e9ea6a85cc5219a7e6304b1cb841fe924f4d6a024a546b71183028dd85dd3b4affe5f01169f902436be1  limine-4.0.tar.xz
+60e5ed23f0c5ebf98d9ccd94cf9f58efabddbdbb7c8e220944b26ec8e4ff8e2d1bb9ef6815b064209d4ccc6e14413b34114d95db8eb0a35ee26b6fb239d6c516  limine-4.0.2.tar.xz
 "