internal/rosa/package/tamago: 1.26.4 to 1.26.5

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/mbf/main.go

@@ -210,6 +210,10 @@ func main() {
 		&cm.attr.Jobs,
 		"jobs", command.IntFlag(0),
 		"Preferred number of jobs to run, when applicable",
+	).Flag(
+		&cm.attr.Load,
+		"load-average", command.IntFlag(0),
+		"Preferred load average number, when applicable",
 	).Flag(
 		&cm.base,
 		"d", command.StringFlag("$MBF_CACHE_DIR"),

internal/rosa/builtins.go

@@ -107,7 +107,7 @@ func skipGNUTests(tests ...int64) string {
 			buf.WriteString(strconv.Itoa(int(n - 1)))
 			buf.WriteString(" ")
 		}
-		if i == len(tests)-1 || tests[i+1] != n+1 {
+		if i == len(tests)-1 || (tests[i+1] != n+1 && tests[i+1] != n+2) {
 			buf.WriteString(strconv.Itoa(int(n + 1)))
 			buf.WriteString("-")
 		}

internal/rosa/builtins_test.go

@@ -16,6 +16,7 @@ func TestSkipGNUTests(t *testing.T) {
 	}{
 		{[]int64{764}, "1-763 765-"},
 		{[]int64{764, 0xcafe, 37, 9}, "1-8 10-36 38-763 765-51965 51967-"},
+		{[]int64{168, 170, 623, 764}, "1-167 169 171-622 624-763 765-"},
 		{[]int64{1, 2, 0xbed}, "3-3052 3054-"},
 		{[]int64{3, 4}, "1-2 5-"},
 	}

internal/rosa/go.go

@@ -56,16 +56,15 @@ ln -s \
 
 func init() {
 	const (
-		version  = "1.26.4"
-		checksum = "fpqJlxa41wKRtbnviYNLk9VxgcL-5oIEDxsriF8svU6kNwQW70oRRA9gTz_ImVoB"
+		version  = "1.25.12"
+		checksum = "XNrGD_boJl2-El_a_T3BuTcMin_WPoU-FGddcNG8dcXA8n2QuxZB7kaUaCWu60QX"
 	)
 	meta := Metadata{
-		Name:        "go",
-		Description: "the Go programming language toolchain",
+		Name:        "go-bootstrap",
+		Description: "the Go programming language toolchain (bootstrap)",
 		Website:     "https://go.dev",
 		Version:     version,
-
-		ID: 1227,
+		Exclude:     true,
 	}
 	native.MustRegister(meta.Name, func(t Toolchain) (*Metadata, pkg.Artifact) {
 		var (
@@ -152,8 +151,8 @@ sed -i \
 		)
 
 		go125 := t.newGo(
-			"1.25.11",
-			"cnqAQ8wpVZXcM6nHAfSqFkIW4L3H73ALB9rBfKUBbfgg4_pOF3I9zOZARgYQ6MR2",
+			version,
+			checksum,
 			[]string{"CGO_ENABLED=0"}, `
 sed -i \
 	's,/lib/ld-musl-`+t.linuxArch()+`.so.1,/system/bin/linker,' \
@@ -165,23 +164,6 @@ rm \
 `, go123,
 		)
 
-		return &meta, t.newGo(
-			version,
-			checksum,
-			finalEnv, `
-sed -i \
-	's,/lib/ld-musl-`+t.linuxArch()+`.so.1,/system/bin/linker,' \
-	cmd/link/internal/`+t.arch+`/obj.go
-sed -i \
-	's/cpu.X86.HasAVX512VBMI/& \&\& cpu.X86.HasPOPCNT/' \
-	internal/runtime/gc/scan/scan_amd64.go
-
-rm \
-	os/root_unix_test.go \
-	cmd/cgo/internal/testsanitizers/tsan_test.go \
-	cmd/cgo/internal/testsanitizers/cshared_test.go
-`, go125,
-		)
-
+		return &meta, go125
 	})
 }

internal/rosa/llvm.go

@@ -17,11 +17,12 @@ var (
 	_earlyRuntimes   = H("early-runtimes")
 	_musl            = H("musl")
 
-	_bash      = H("bash")
-	_gawk      = H("gawk")
-	_coreutils = H("coreutils")
-	_diffutils = H("diffutils")
-	_findutils = H("findutils")
+	_bash        = H("bash")
+	_awk         = H("awk")
+	_pythonEarly = H("python-early")
+	_coreutils   = H("coreutils")
+	_diffutils   = H("diffutils")
+	_findutils   = H("findutils")
 
 	_zlib          = H("zlib")
 	_zstd          = H("zstd")
@@ -124,7 +125,7 @@ ln -s \
 	"/work/system/lib/${ROSA_TRIPLE}/crtendS.o"
 `,
 		},
-			_python,
+			_pythonEarly,
 
 			_muslHeaders,
 			_kernelHeaders,
@@ -180,7 +181,7 @@ ln -s \
 			},
 			SkipTest: true,
 		},
-			_python,
+			_pythonEarly,
 
 			_zlib,
 			_zstd,
@@ -367,11 +368,11 @@ ln -s clang++ /work/system/bin/c++
 
 			Test: "ninja " + jobsFlagE + " " + loadFlagE + " check-all",
 		},
-			_python,
+			_pythonEarly,
 			_perl,
 			_diffutils,
 			_bash,
-			_gawk,
+			_awk,
 			_coreutils,
 			_findutils,
 

internal/rosa/llvm_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestLLVMInputs(t *testing.T) {
-	const wantInputCount = 553
+	const wantInputCount = 467
 
 	_, llvm := rosa.Native().Std().MustLoad(rosa.H("llvm"))
 	var n int

internal/rosa/make.go

@@ -56,7 +56,7 @@ func (attr *MakeHelper) extra(flag int) P {
 	extra := P{_make}
 	if (attr == nil || !attr.OmitDefaults) && flag&TEarly == 0 {
 		extra = append(extra,
-			_gawk,
+			_awk,
 			_coreutils,
 		)
 	}

internal/rosa/meson.go

@@ -5,10 +5,16 @@ import (
 	"strings"
 )
 
-var _meson = H("meson")
+var (
+	_muon  = H("muon")
+	_meson = H("meson")
+)
 
 // MesonHelper builds and tests a meson project.
 type MesonHelper struct {
+	// Use muon instead of meson.
+	Muon bool
+
 	// Runs after setup.
 	ScriptCompileEarly string
 	// Runs after compile.
@@ -29,7 +35,12 @@ type MesonHelper struct {
 var _ Helper = new(MesonHelper)
 
 // extra returns hardcoded meson runtime dependencies.
-func (*MesonHelper) extra(int) P { return P{_meson} }
+func (attr *MesonHelper) extra(int) P {
+	if !attr.isPython() {
+		return P{_muon}
+	}
+	return P{_meson}
+}
 
 // wantsChmod returns false.
 func (*MesonHelper) wantsChmod() bool { return false }
@@ -43,6 +54,12 @@ func (*MesonHelper) scriptEarly() string { return "" }
 // wantsDir requests a new directory in TMPDIR.
 func (*MesonHelper) wantsDir() (string, bool) { return `"$(mktemp -d)"`, false }
 
+// isPython returns whether the legacy python implementation is used.
+func (attr *MesonHelper) isPython() bool {
+	return attr == nil ||
+		!attr.Muon || len(attr.SkipTests) != 0 || attr.InteractiveTest
+}
+
 // script generates the cure script.
 func (attr *MesonHelper) script(t Toolchain, name string) string {
 	if attr == nil {
@@ -54,12 +71,28 @@ func (attr *MesonHelper) script(t Toolchain, name string) string {
 		scriptCompiled = "\n" + scriptCompiled
 	}
 
+	python := attr.isPython()
+	muon := "muon"
+	compile := " samu " + jobsFlagE
+	destdir := "-d"
+	if python {
+		muon = "meson"
+		compile = " compile " + jobsFlagE + " " + loadFlagE
+		destdir = "--destdir"
+	}
+
 	var scriptTest string
 	if !attr.SkipTest && t.opts&OptSkipCheck == 0 {
 		scriptTest = `
-meson test \
-	-t 10 \
+` + muon + ` test \
+	` + jobsFlagE + ` \
+	-t 10`
+		if python {
+			scriptTest += ` \
 	--print-errorlogs`
+		} else {
+			scriptTest += " -Rv"
+		}
 		if attr.InteractiveTest {
 			scriptTest += ` \
 	--interactive`
@@ -70,29 +103,25 @@ meson test \
 	}
 
 	return `
-cd "$(mktemp -d)"
-meson setup \
+` + muon + ` setup \
 	` + strings.Join(slices.Collect(func(yield func(string) bool) {
 		for _, v := range append([]KV{
-			{"wrap-mode", "nofallback"},
+			{"wrap_mode", "nofallback"},
 			{"prefix", "/system"},
 			{"buildtype", "release"},
 		}, attr.Setup...) {
-			s := "-" + v[0]
-			if len(v[0]) > 0 && v[0][0] != 'D' {
-				s = "-" + s
-			}
+			s := v[0]
 			if v[1] != "" {
-				s += "=" + v[1]
+				s = "-D" + s + "=" + v[1]
 			}
 			if !yield(s) {
 				return
 			}
 		}
 	}), " \\\n\t") + ` \
-	. '/usr/src/` + name + `'
-meson compile` + scriptCompiled + scriptTest + `
-meson install \
-	--destdir=/work
+	'/usr/src/` + name + `'
+` + muon + compile + scriptCompiled + scriptTest + `
+` + muon + ` install \
+	` + destdir + ` /work
 ` + attr.Script
 }

internal/rosa/package/awk.az

@@ -0,0 +1,30 @@
+package awk {
+	description = "one true awk";
+	website = "https://github.com/onetrueawk/awk";
+	anitya = 16171;
+
+	version# = "20260426";
+	source = remoteGitHub {
+		suffix = "onetrueawk/awk";
+		tag = version;
+		checksum = "ewAvWLEHajhm7cA7v4DsKVk1c11niCLKIE5Q-8W_sxv1XXsbZlcOuWn1KOBYMxjo";
+	};
+
+	enterSource = true;
+	writable = true;
+	chmod = true;
+
+	exec = make {
+		omitDefaults = true;
+		inPlace = true;
+		skipConfigure = true;
+		preCheck = "install -vD a.out /system/bin/awk\n";
+		install = "install -vD a.out /work/system/bin/awk";
+	};
+
+	inputs = [
+		m4,
+		bison,
+		diffutils,
+	];
+}

internal/rosa/package/bison.az

@@ -10,10 +10,15 @@ package bison {
 		compress = gzip;
 	};
 
+	// awk dependency loop
+	toyboxEarly = true;
+
 	exec = make {
 		check = [
 			"TESTSUITEFLAGS=" + jobsFlagE + "' " + skipGNUTests {
 				tests = [
+					// GNU-isms not implemented in toybox
+					168, 170, 623,
 					// clang miscompiles (SIGILL)
 					764,
 				];
@@ -22,9 +27,5 @@ package bison {
 		];
 	};
 
-	inputs = [
-		m4,
-		diffutils,
-		sed,
-	];
+	inputs = [ m4 ];
 }

internal/rosa/package/cairo.az

@@ -13,16 +13,16 @@ package cairo {
 
 	exec = meson {
 		setup = {
-			"Ddwrite": "enabled";
-			"Dfontconfig": "enabled";
-			"Dfreetype": "enabled";
+			"dwrite": "enabled";
+			"fontconfig": "enabled";
+			"freetype": "enabled";
 
-			"Dpng": "enabled";
-			"Dtee": "enabled";
-			"Dxcb": "enabled";
-			"Dxlib": "disabled";
-			"Dxlib-xcb": "disabled";
-			"Dzlib": "enabled";
+			"png": "enabled";
+			"tee": "enabled";
+			"xcb": "enabled";
+			"xlib": "disabled";
+			"xlib-xcb": "disabled";
+			"zlib": "enabled";
 		};
 		// runs the entire test suite in a single meson test
 		interactiveTest = true;
@@ -31,7 +31,7 @@ package cairo {
 	};
 
 	inputs = [
-		gawk,
+		awk,
 
 		zlib,
 		libpng,

internal/rosa/package/cmake/bootstrap-test-no-openssl.patch

@@ -1,13 +0,0 @@
-diff --git a/Tests/BootstrapTest.cmake b/Tests/BootstrapTest.cmake
-index 137de78bc1..b4da52e664 100644
---- a/Tests/BootstrapTest.cmake
-+++ b/Tests/BootstrapTest.cmake
-@@ -9,7 +9,7 @@ if(NOT nproc EQUAL 0)
- endif()
- message(STATUS "running bootstrap: ${bootstrap} ${ninja_arg} ${parallel_arg}")
- execute_process(
--  COMMAND ${bootstrap} ${ninja_arg} ${parallel_arg}
-+  COMMAND ${bootstrap} ${ninja_arg} ${parallel_arg} -- -DCMAKE_USE_OPENSSL=OFF
-   WORKING_DIRECTORY "${bin_dir}"
-   RESULT_VARIABLE result
-   )

internal/rosa/package/cmake/package.az

@@ -3,18 +3,15 @@ package cmake {
 	website = "https://cmake.org";
 	anitya = 306;
 
-	version# = "4.3.4";
+	version# = "4.4.0";
 	source = remoteGitHubRelease {
 		suffix = "Kitware/CMake";
 		tag = "v"+version;
 		name = "cmake-"+version+".tar.gz";
-		checksum = "6A50pqarKDXKOCv7ffKMvWJWmNTVp_ep8KoaWwNdg-RYQRddgKbxayHveTo6jZ_7";
+		checksum = "ZL0Y19_mSJWsl3dMjRRQJAaCvl4_PqbwpgUC1aBA-cdVdrK_gt4ylpUM2GMoQMku";
 		compress = gzip;
 	};
-	patches = [
-		"bootstrap-test-no-openssl.patch",
-		"disable-broken-tests-musl.patch",
-	];
+	patches = [ "disable-broken-tests-musl.patch" ];
 
 	// test suite expects writable source tree
 	writable = true;
@@ -32,6 +29,7 @@ package cmake {
 			"--";
 			"-DCMAKE_USE_OPENSSL": "OFF";
 			"-DCMake_TEST_NO_NETWORK": "ON";
+			"-DCMake_TEST_BOOTSTRAP": "OFF";
 		};
 
 		check = [

internal/rosa/package/dbus.az

@@ -19,9 +19,9 @@ package dbus {
 
 	exec = meson {
 		setup = {
-			"Depoll": "enabled";
-			"Dinotify": "enabled";
-			"Dx11_autolaunch": "disabled";
+			"epoll": "enabled";
+			"inotify": "enabled";
+			"x11_autolaunch": "disabled";
 		};
 	};
 
@@ -50,7 +50,7 @@ package xdg-dbus-proxy {
 
 	exec = meson {
 		setup = {
-			"Dman": "disabled";
+			"man": "disabled";
 		};
 	};
 

internal/rosa/package/dtc.az

@@ -18,7 +18,7 @@ package dtc {
 
 	exec = meson {
 		setup = {
-			"Dyaml": "disabled";
+			"yaml": "disabled";
 		};
 	};
 

internal/rosa/package/fontconfig.az

@@ -3,12 +3,12 @@ package fontconfig {
 	website = "https://www.freedesktop.org/wiki/Software/fontconfig";
 	anitya = 827;
 
-	version# = "2.18.1";
+	version# = "2.18.2";
 	source = remoteGitLab {
 		domain = "gitlab.freedesktop.org";
 		suffix = "fontconfig/fontconfig";
 		ref = version;
-		checksum = "S3FJfh-PeZ2_YgNrUqL0H2G4Wf_ilj5HpIGV2oURnkK672AQHpWk526bNtRHwyJt";
+		checksum = "P8YoQunIynBhc3gdDyPkImw_GGYoy1U4aX0jTnpkgtLmU4nqIgUyeqCH3-rNzpTd";
 	};
 
 	exec = make {

internal/rosa/package/fribidi.az

@@ -12,7 +12,7 @@ package fribidi {
 
 	exec = meson {
 		setup = {
-			"Ddocs": "false";
+			"docs": "false";
 		};
 	};
 }

internal/rosa/package/fuse.az

@@ -14,10 +14,10 @@ package fuse {
 
 	exec = meson {
 		setup = {
-			"Ddefault_library": "both";
-			"Dtests": "true";
-			"Duseroot": "false";
-			"Dinitscriptdir": "/system/etc";
+			"default_library": "both";
+			"tests": "true";
+			"useroot": "false";
+			"initscriptdir": "/system/etc";
 		};
 
 		postCompile = "python3 -m pytest test/";

internal/rosa/package/git.az

@@ -60,6 +60,8 @@ disable_test t1451-fsck-buffer
 disable_test t4104-apply-boundary
 disable_test t4200-rerere
 disable_test t5515-fetch-merge-logic
+disable_test t4124-apply-ws-rule
+disable_test t3404-rebase-interactive
 `;
 
 		check = [

internal/rosa/package/glib/package.az

@@ -17,7 +17,7 @@ package glib {
 
 	exec = meson {
 		setup = {
-			"Ddefault_library": "both";
+			"default_library": "both";
 		};
 		// fails with ipv6 disabled
 		skipTests = [ "gio" ];

internal/rosa/package/gnu.az

@@ -12,6 +12,9 @@ package m4 {
 		compress = bzip2;
 	};
 
+	// awk dependency loop
+	toyboxEarly = true;
+
 	writable = true;
 	early = `
 chmod +w tests/test-c32ispunct.sh && echo '#!/bin/sh' > tests/test-c32ispunct.sh
@@ -220,25 +223,6 @@ test_disable '#!/bin/sh' tests/need-filename
 	exec = make {};
 }
 
-package gawk {
-	description = "an implementation of awk with GNU extensions";
-	website = "https://www.gnu.org/software/gawk";
-	anitya = 868;
-
-	version# = "5.4.0";
-	source = remoteTar {
-		url = "https://ftpmirror.gnu.org/gnu/gawk/gawk-"+version+".tar.gz";
-		checksum = "m0RkIolC-PI7EY5q8pcx5Y-0twlIW0Yp3wXXmV-QaHorSdf8BhZ7kW9F8iWomz0C";
-		compress = gzip;
-	};
-
-	toyboxEarly = true;
-	exec = make {
-		// dependency loop
-		skipCheck = true;
-	};
-}
-
 package grep {
 	description = "searches input for lines containing a match to a pattern";
 	website = "https://www.gnu.org/software/grep";
@@ -309,14 +293,15 @@ package findutils {
 	website = "https://www.gnu.org/software/findutils";
 	anitya = 812;
 
-	version# = "4.10.0";
+	version# = "4.11.0";
 	source = remoteFile {
 		url = "https://ftpmirror.gnu.org/gnu/findutils/findutils-"+version+".tar.xz";
-		checksum = "ZXABdNBQXL7QjTygynRRTdXYWxQKZ0Wn5eMd3NUnxR0xaS0u0VfcKoTlbo50zxv6";
+		checksum = "X-qsv9aUoBL583q-4iZcBI3_7Ufd3fSIqFmNLXWdEpUihlRfMpGGyAUt8SAvDKae";
 	};
 
 	early = `
 echo '#!/bin/sh' > gnulib-tests/test-c32ispunct.sh
+echo 'int main(){return 0;}' > gnulib-tests/test-fstatat.c
 echo 'int main(){return 0;}' > tests/xargs/test-sigusr.c
 `;
 
@@ -450,7 +435,7 @@ package texinfo {
 
 	runtime = [
 		perl,
-		gawk,
+		awk,
 	];
 }
 

internal/rosa/package/go/746640.patch

@@ -0,0 +1,29 @@
+From 45929774c3d5c084cc478afba63c77cf67a68bd7 Mon Sep 17 00:00:00 2001
+From: khr@golang.org <khr@golang.org>
+Date: Wed, 18 Feb 2026 09:09:57 -0800
+Subject: [PATCH] internal/runtime/gc/scan: require popcnt for x86
+
+The GOAMD64=v1 test disables popcnt instructions, which is a feature
+this package's amd64 assembly uses.
+
+Fixes #77674
+
+Change-Id: I7be9bb665838f5da50275f96ef3df398412bb44a
+Reviewed-on: https://go-review.googlesource.com/c/go/+/746640
+LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
+Reviewed-by: Michael Knyszek <mknyszek@google.com>
+Reviewed-by: Keith Randall <khr@google.com>
+Auto-Submit: Keith Randall <khr@golang.org>
+---
+
+diff --git a/src/internal/runtime/gc/scan/scan_amd64.go b/src/internal/runtime/gc/scan/scan_amd64.go
+index c03021c7d4..544b237770 100644
+--- a/src/internal/runtime/gc/scan/scan_amd64.go
++++ b/src/internal/runtime/gc/scan/scan_amd64.go
+@@ -39,4 +39,5 @@ var avx512ScanPackedReqsMet = cpu.X86.HasAVX512VL &&
+ 	cpu.X86.HasGFNI &&
+ 	cpu.X86.HasAVX512BITALG &&
+ 	cpu.X86.HasAVX512DQ && // for kmovb, see #79871
+-	cpu.X86.HasAVX512VBMI
++	cpu.X86.HasAVX512VBMI &&
++	cpu.X86.HasPOPCNT

internal/rosa/package/go/799064.patch

@@ -0,0 +1,135 @@
+From 06f90ebfa6f3e0a744584513e2786988b26569da Mon Sep 17 00:00:00 2001
+From: Damien Neil <dneil@google.com>
+Date: Wed, 08 Jul 2026 11:11:48 -0700
+Subject: [PATCH] os: properly handle trailing / in Root.MkdirAll
+
+MkdirAll("dir/") should create "dir", not return an error.
+
+Fixes #80308
+
+Change-Id: I75458c30b6cb94be3a3d368f6024caef6a6a6964
+---
+
+diff --git a/src/os/root_noopenat.go b/src/os/root_noopenat.go
+index 228b580..a84e952 100644
+--- a/src/os/root_noopenat.go
++++ b/src/os/root_noopenat.go
+@@ -158,6 +158,9 @@
+ 	if err := checkPathEscapes(r, name); err == errPathEscapes {
+ 		return &PathError{Op: "mkdirat", Path: name, Err: err}
+ 	}
++	if name == "" {
++		return &PathError{Op: "mkdirat", Path: name, Err: syscall.ENOENT}
++	}
+ 	prefix := r.root.name + string(PathSeparator)
+ 	if err := MkdirAll(prefix+name, perm); err != nil {
+ 		if pe, ok := err.(*PathError); ok {
+diff --git a/src/os/root_openat.go b/src/os/root_openat.go
+index d7c9334..92865e4 100644
+--- a/src/os/root_openat.go
++++ b/src/os/root_openat.go
+@@ -167,6 +167,12 @@
+ 					fi, e := r.Stat(fullname)
+ 					if e == nil && fi.Mode().IsDir() {
+ 						err = nil
++					} else if e == nil {
++						err = syscall.ENOTDIR
++					} else if !IsNotExist(e) {
++						// EPERM, ELOOP, etc.,
++						// probably more useful than EEXIST.
++						err = e
+ 					}
+ 				}
+ 			}
+@@ -177,7 +183,12 @@
+ 		}
+ 		return struct{}{}, &PathError{Op: "mkdirat", Err: err}
+ 	}
+-	_, err := doInRoot(r, fullname, 0, openDirFunc, openLastComponentFunc)
++	flags := uint(doInRootCreatingDirectory)
++	switch runtime.GOOS {
++	case "linux", "windows":
++		flags = doInRootNoHandleTerminalSlash // see rootMkdir
++	}
++	_, err := doInRoot(r, fullname, flags, openDirFunc, openLastComponentFunc)
+ 	if err != nil {
+ 		if _, ok := err.(*PathError); !ok {
+ 			err = &PathError{Op: "mkdirat", Path: fullname, Err: err}
+diff --git a/src/os/root_test.go b/src/os/root_test.go
+index 5e0acf9..33a2f33 100644
+--- a/src/os/root_test.go
++++ b/src/os/root_test.go
+@@ -585,6 +585,11 @@
+ 
+ func TestRootMkdirAll(t *testing.T) {
+ 	for _, test := range rootTestCases {
++		if test.name == "directory does not exist" {
++			// Test expects error, mkdirall creates the missing directory.
++			// TestRootMultiMkdirAll covers this case better anyway, just skip.
++			continue
++		}
+ 		test.run(t, func(t *testing.T, target string, root *os.Root) {
+ 			wantError := test.wantError
+ 			if test.ltarget != "" {
+@@ -593,7 +598,7 @@
+ 				wantError = true
+ 			}
+ 
+-			err := root.Mkdir(test.open, 0o777)
++			err := root.MkdirAll(test.open, 0o777)
+ 			if errEndsTest(t, err, wantError, "root.MkdirAll(%q)", test.open) {
+ 				return
+ 			}
+@@ -3133,6 +3138,52 @@
+ 	})
+ }
+ 
++func TestRootMultiMkdirAllShallow(t *testing.T) {
++	runRootMultiTest(t, func(t *testing.T, test *rootMultiTest) (string, error) {
++		return testRootMultiMkdirAll(t, test, test.targetPath)
++	})
++}
++
++func TestRootMultiMkdirAllDeep(t *testing.T) {
++	runRootMultiTest(t, func(t *testing.T, test *rootMultiTest) (string, error) {
++		targetPath := test.targetPath
++		if len(targetPath) > 0 && os.IsPathSeparator(targetPath[len(targetPath)-1]) {
++			targetPath += "a/b/"
++		} else {
++			targetPath += "/a/b"
++		}
++		return testRootMultiMkdirAll(t, test, targetPath)
++	})
++}
++
++func testRootMultiMkdirAll(t *testing.T, test *rootMultiTest, targetPath string) (string, error) {
++	var mkdirAll = os.MkdirAll
++	if test.root != nil {
++		mkdirAll = test.root.MkdirAll
++	}
++
++	test.setOp("MkdirAll(%q, 0o777)", targetPath)
++	gotErr := mkdirAll(targetPath, 0o777)
++
++	switch {
++	case test.root != nil && test.target.lescapes():
++		// "mkdir ../target", or equivalent escaping path.
++		test.wantError(t, gotErr, os.ErrPathEscapes)
++	case test.root != nil && test.target.escapes():
++		// "mkdir ../target", or equivalent escaping path.
++		test.wantError(t, gotErr, errAny)
++		return "", errSkipRootConsistencyCheck
++	case test.root != nil && test.target.kind == testFileSymlink && test.target.target.kind == testFileAbsent && targetPath != test.targetPath:
++		// A minor inconsistency between Root.MkdirAll and os.MkdirAll:
++		// When an intermediate component of the tree being constructed is a
++		// dangling symlink, Root.MkdirAll will follow the symlink and create
++		// its target directory, while os.MkdirAll will fail with an error.
++		return "", errSkipRootConsistencyCheck
++	default:
++	}
++	return "", gotErr
++}
++
+ func TestRootMultiRename(t *testing.T) {
+ 	if runtime.GOOS == "wasip1" {
+ 		switch os.Getenv("GOWASIRUNTIME") {

internal/rosa/package/go/package.az

@@ -0,0 +1,64 @@
+package go {
+	description = "the Go programming language toolchain";
+	website = "https://go.dev";
+	anitya = 1227;
+
+	version# = "1.26.5";
+	source = remoteTar {
+		url = "https://go.dev/dl/go"+version+".src.tar.gz";
+		checksum = "13yt1u_NGOd62LO-WZ8W6CUXodOrEF5CdkiTTiH9E635IHn1luvlXYjsHpBXNFSw";
+		compress = gzip;
+	};
+
+	patches = [
+		// https://go.dev/issue/77674
+		"746640.patch",
+		// https://go.dev/issue/80308
+		"799064.patch",
+	];
+
+	env = [
+		"CC=cc",
+		"GOCACHE=/tmp/gocache",
+		"GOROOT_BOOTSTRAP=/system/go",
+		"TMPDIR=/dev/shm/go",
+	];
+
+	enterSource = true;
+
+	exec = generic {
+		inPlace = true;
+		build = `
+mkdir /work/system/ "${TMPDIR}"
+cp -r . /work/system/go
+cd /work/system/go/src/
+chmod -R +w ..
+
+sed -i \
+	's,/lib/ld-musl-`+linuxArch+`.so.1,/system/bin/linker,' \
+	cmd/link/internal/`+arch+`/obj.go
+
+rm \
+	os/root_unix_test.go \
+	runtime/crash_cgo_test.go \
+	cmd/cgo/internal/testsanitizers/tsan_test.go \
+	cmd/cgo/internal/testsanitizers/cshared_test.go
+
+set +u
+. ./make.bash "$@" --no-banner
+set -u
+`;
+		check = "bash run.bash --no-rebuild\n";
+		install = `
+../bin/go tool dist banner # print build info
+
+mkdir /work/system/bin
+ln -s \
+	../go/bin/go \
+	../go/bin/gofmt \
+	/work/system/bin
+`;
+	};
+
+	inputs = [ bash, go-bootstrap ];
+}

internal/rosa/package/harfbuzz.az

@@ -12,10 +12,10 @@ package harfbuzz {
 
 	exec = meson {
 		setup = {
-			"Dcairo": "enabled";
-			"Dpng": "enabled";
-			"Dzlib": "enabled";
-			"Dfreetype": "enabled";
+			"cairo": "enabled";
+			"png": "enabled";
+			"zlib": "enabled";
+			"freetype": "enabled";
 		};
 	};
 

internal/rosa/package/kernel/package.az

@@ -132,7 +132,7 @@ rm -v "/work/system/lib/modules/$(make -f /usr/src/kernel/Makefile kernelversion
 		perl,
 		bc,
 		sed,
-		gawk,
+		awk,
 		coreutils,
 		diffutils,
 		bash,

internal/rosa/package/kmod.az

@@ -13,12 +13,12 @@ package kmod {
 
 	exec = meson {
 		setup = {
-			"Dmoduledir": "/system/lib/modules";
-			"Dsysconfdir": "/system/etc";
-			"Dbashcompletiondir": "no";
-			"Dfishcompletiondir": "no";
-			"Dxz": "disabled";
-			"Dmanpages": "false";
+			"moduledir": "/system/lib/modules";
+			"sysconfdir": "/system/etc";
+			"bashcompletiondir": "no";
+			"fishcompletiondir": "no";
+			"xz": "disabled";
+			"manpages": "false";
 		};
 
 		// makes assumptions about the running kernel

internal/rosa/package/libdrm.az

@@ -13,7 +13,7 @@ package libdrm {
 
 	exec = meson {
 		setup = {
-			"Dintel": "enabled";
+			"intel": "enabled";
 		};
 	};
 

internal/rosa/package/libepoxy.az

@@ -12,8 +12,8 @@ package libepoxy {
 
 	exec = meson {
 		setup = {
-			"Dglx": "yes";
-			"Degl": "yes";
+			"glx": "yes";
+			"egl": "yes";
 		};
 	};
 

internal/rosa/package/libevdev.az

@@ -13,7 +13,7 @@ package libevdev {
 
 	exec = meson {
 		setup = {
-			"Ddocumentation": "disabled";
+			"documentation": "disabled";
 		};
 	};
 

internal/rosa/package/libffi.az

@@ -3,12 +3,14 @@ package libffi {
 	website = "https://sourceware.org/libffi";
 	anitya = 1611;
 
-	version# = "3.6.0";
+	block = "severe regressions caused by questionable maintainer decisions";
+
+	version# = "3.5.2";
 	source = remoteGitHubRelease {
 		suffix = "libffi/libffi";
 		tag = "v"+version;
 		name = "libffi-"+version+".tar.gz";
-		checksum = "y3H_jP_eoByznlztjvni3wDfGA4CIJoOh3eRnzjnE3G3Ms3AWk53oOZxkbruvLxM";
+		checksum = "2_Q-ZNBBbVhltfL5zEr0wljxPegUimTK4VeMSiwJEGksls3n4gj3lV0Ly3vviSFH";
 		compress = gzip;
 	};
 

internal/rosa/package/libglvnd.az

@@ -13,8 +13,8 @@ package libglvnd {
 
 	exec = meson {
 		setup = {
-			"Dx11": "enabled";
-			"Dglx": "enabled";
+			"x11": "enabled";
+			"glx": "enabled";
 		};
 
 		postCompile = `

internal/rosa/package/libinput.az

@@ -14,9 +14,9 @@ package libinput {
 	bin = [ "bash" ];
 	exec = meson {
 		setup = {
-			"Dmtdev": "false";
-			"Dlibwacom": "false";
-			"Ddebug-gui": "false";
+			"mtdev": "false";
+			"libwacom": "false";
+			"debug-gui": "false";
 		};
 	};
 

internal/rosa/package/libpsl.az

@@ -3,12 +3,12 @@ package libpsl {
 	website = "https://rockdaboot.github.io/libpsl";
 	anitya = 7305;
 
-	version# = "0.22.0";
+	version# = "0.23.0";
 	source = remoteGitHubRelease {
 		suffix = "rockdaboot/libpsl";
 		tag = version;
 		name = "libpsl-"+version+".tar.gz";
-		checksum = "sYrq75kNAJvU5gA2gv2tFYIFbFFit6PuYuW1tYSgcsJsIUzwMJTodofsaEGq3iGf";
+		checksum = "7M0i3g6snxXGri0PcE5iYJFVGhZjBq1QxEom45ML0tCyu8b7i-ydvlcIAS2g9zqa";
 		compress = gzip;
 	};
 

internal/rosa/package/libucontext.az

@@ -3,11 +3,11 @@ package libucontext {
 	website = "https://github.com/kaniini/libucontext";
 	anitya = 17085;
 
-	version# = "1.5.1";
+	version# = "1.5.2";
 	source = remoteGitHub {
 		suffix = "kaniini/libucontext";
 		tag = "libucontext-"+version;
-		checksum = "mUgeyJknjMxT-5fORzz-rqhZfP3Y7EZGBhOwvhuX7MsF4Pk9wkuwtrLf5IML-jWu";
+		checksum = "SSIdb9LVzAel9JPGfkrnG1MIF60Hx5ZJoXBDbmxi9swbrjSfsLkTyldB1wEAnAH0";
 	};
 
 	// uses source tree as scratch space

internal/rosa/package/libva.az

@@ -3,18 +3,18 @@ package libva {
 	website = "https://01.org/vaapi";
 	anitya = 1752;
 
-	version# = "2.24.0";
+	version# = "2.24.1";
 	source = remoteGitHub {
 		suffix = "intel/libva";
 		tag = version;
-		checksum = "Jb5bdeHXLPPTWFlmauKDZlfAjFiXiILs17Pp7F8kAiyctFiDItpzYY0prIlnW7mu";
+		checksum = "4IdXxvDFLvl_7lXbJne4_TQA4PZhG89MZXLyvQEkGSb4LcX7CGLrMOjRNZOWb9d6";
 	};
 
 	exec = meson {
 		setup = {
-			"Dwith_x11": "yes";
-			"Dwith_glx": "yes";
-			"Dwith_wayland": "yes";
+			"with_x11": "yes";
+			"with_glx": "yes";
+			"with_wayland": "yes";
 		};
 	};
 

internal/rosa/package/mesa.az

@@ -14,14 +14,14 @@ package mesa {
 
 	exec = meson {
 		setup = {
-			"Dplatforms": "x11,wayland";
-			"Dvideo-codecs": "all";
+			"platforms": "x11,wayland";
+			"video-codecs": "all";
 
-			"Dglvnd": "enabled";
-			"Dgbm": "enabled";
-			"Degl": "enabled";
+			"glvnd": "enabled";
+			"gbm": "enabled";
+			"egl": "enabled";
 
-			"Dgallium-drivers": join {
+			"gallium-drivers": join {
 				elems = [
 					"asahi",     // Apple AGX
 					"crocus",    // Intel legacy
@@ -51,7 +51,7 @@ package mesa {
 				sep = ",";
 			};
 
-			"Dvulkan-drivers": join {
+			"vulkan-drivers": join {
 				elems = [
 					"amd",         // AMD (aka RADV)
 					"broadcom",    // Broadcom VC5 (Raspberry Pi 4, aka V3D)
@@ -72,7 +72,7 @@ package mesa {
 				sep = ",";
 			};
 
-			"Dvulkan-layers": join {
+			"vulkan-layers": join {
 				elems = [
 					"device-select",
 					"intel-nullhw",
@@ -84,8 +84,8 @@ package mesa {
 				sep = ",";
 			};
 
-			"Dfreedreno-kmds": "msm,virtio";
-			"Damdgpu-virtio": "true";
+			"freedreno-kmds": "msm,virtio";
+			"amdgpu-virtio": "true";
 		};
 	};
 

internal/rosa/package/meson.az

@@ -3,11 +3,11 @@ package meson {
 	website = "https://mesonbuild.com";
 	anitya = 6472;
 
-	version# = "1.11.1";
+	version# = "1.11.2";
 	source = remoteGitHub {
 		suffix = "mesonbuild/meson";
 		tag = version;
-		checksum = "uvILRxdopwc6Dy17UbIeClcQr0qHqyTaqyk1M9OqWKN9PwB9N6UVAiyN8kSSz3r2";
+		checksum = "9AMilGxTOVqPA2DaGMASyuVs1BeTzgDZ0NH2oSYoRZk846ApvfOBa4cc18XEEK7M";
 	};
 
 	env = [

internal/rosa/package/muon.az

@@ -0,0 +1,62 @@
+package meson-tests {
+	description = "tests from meson/test cases, updated alongside muon";
+	website = "https://github.com/muon-build/meson-tests";
+	exclude = true;
+
+	version# = "0bbaa42e7ba553356fbec038e8b40cf89f90da82";
+	output = remoteTar {
+		url = "https://github.com/muon-build/meson-tests/archive/"+
+			version+".tar.gz";
+		checksum = "W_yNC2Id1aGBXLmBhrQ53UARVBl-nZ2bDZJcmZDaE4GyoZyj6tSURojuTyWgG1U8";
+		compress = gzip;
+	};
+}
+
+package muon {
+	description = "meson implementation in C";
+	website = "https://muon.build";
+	anitya = 391173;
+
+	version# = "0.6.0";
+	source = remoteTar {
+		url = "https://git.sr.ht/~lattis/muon/archive/"+version+".tar.gz";
+		checksum = "DiRw1dTaHlL5d3TNK8gykFHI_BAWK7ERooSmVC-kltUkjOubWkN9b-DG21a1ETCe";
+		compress = gzip;
+	};
+	extra = [ meson-tests ];
+
+	writable = true;
+	early = `
+chmod +w subprojects
+cp -r ../extra/meson-tests subprojects
+chmod -R +w subprojects/meson-tests
+sed -i '/common.220 fs module/d' subprojects/meson-tests/meson.build
+`;
+
+	exec = generic {
+		build = `
+(cd /usr/src/muon && CC=cc ./bootstrap.sh /boot)
+/boot/muon-bootstrap setup \
+	-Dprefix=/system \
+	-Dbuildtype=release \
+	-Dlibcurl=disabled \
+	-Dlibarchive=disabled \
+	-Dlibpkgconf=disabled \
+	-Dtracy=disabled \
+	-Dmeson-docs=disabled \
+	-Dmeson-tests=enabled \
+	-Dwebsite=disabled \
+	/usr/src/muon
+/boot/muon-bootstrap samu `+jobsFlagE+`
+`;
+		check = "./muon test "+jobsFlagE+" -Rv\n";
+		install = "./muon install -d /work\n";
+	};
+
+	inputs = [
+		python-early,
+		kernel-headers,
+	];
+
+	runtime = [ pkg-config ];
+}

internal/rosa/package/ncurses.az

@@ -20,6 +20,13 @@ package ncurses {
 
 		// "tests" are actual demo programs, not a test suite.
 		skipCheck = true;
+
+		postInstall = `
+find /work/system/lib \
+	-type f \
+	-name '*.a' \
+	-exec objcopy --enable-deterministic-archives {} \;
+`;
 	};
 
 	inputs = [ pkg-config ];

internal/rosa/package/ninja.az

@@ -34,7 +34,7 @@ cp ninja /work/system/bin/`;
 	};
 
 	inputs = [
-		python,
+		python-early,
 		bash,
 	];
 }

internal/rosa/package/nss.az

@@ -61,7 +61,7 @@ cp -r \
 	inputs = [
 		perl,
 		python,
-		gawk,
+		awk,
 		coreutils,
 
 		zlib,

internal/rosa/package/p11-kit.az

@@ -3,17 +3,17 @@ package p11-kit {
 	website = "https://p11-glue.freedesktop.org/p11-kit.html";
 	anitya = 2582;
 
-	version# = "0.26.2";
+	version# = "0.26.4";
 	source = remoteGit {
 		url = "https://github.com/p11-glue/p11-kit.git";
 		tag = version;
-		checksum = "3ei-6DUVtYzrRVe-SubtNgRlweXd6H2qHmUu-_5qVyIn6gSTvZbGS2u79Y8IFb2N";
+		checksum = "iqkBuTqqBAc6suv7wY89DyceN1arWTn2QwaXVwKN_J_IqNyRGNKPLq9RAmkumYD7";
 	};
 
 	exec = meson {
 		setup = {
-			"Dsystemd": "disabled";
-			"Dlibffi": "enabled";
+			"systemd": "disabled";
+			"libffi": "enabled";
 		};
 	};
 

internal/rosa/package/pango.az

@@ -13,9 +13,9 @@ package pango {
 
 	exec = meson {
 		setup = {
-			"Dfontconfig": "enabled";
-			"Dfreetype": "enabled";
-			"Dcairo": "enabled";
+			"fontconfig": "enabled";
+			"freetype": "enabled";
+			"cairo": "enabled";
 		};
 		// Fontconfig error: Cannot load default config file: File not found: /etc/fonts/fonts.conf
 		skipTest = true;

internal/rosa/package/pixman.az

@@ -13,7 +13,7 @@ package pixman {
 
 	exec = meson {
 		setup = {
-			"Dtests": "enabled";
+			"tests": "enabled";
 		};
 	};
 }

internal/rosa/package/python/package.az

@@ -73,6 +73,76 @@ package python {
 	];
 }
 
+package python-early {
+	description = "minimal python interpreter exclusive to the bootstrap path";
+	website = "https://www.python.org";
+	exclude = true;
+	anitya = 13254;
+	block = "exclusive to the bootstrap path";
+
+	version# = "3.14.6";
+	source = remoteTar {
+		url = "https://www.python.org/ftp/python/"+version+
+			"/Python-"+version+".tgz";
+		checksum = "yynwXnElUvlAweA_RkBKQY35P59Gu5YU6ickJs6Z-blIoHgw5KgKXROY1gq2w0ez";
+		compress = gzip;
+	};
+
+	// test_synopsis_sourceless assumes this is writable and checks __pycache__
+	writable = true;
+	chmod = true;
+
+	env = [
+		"EXTRATESTOPTS=-j0 -x " + join {
+			elems = [
+				// requires internet access (http://www.pythontest.net/)
+				"test_asyncio",
+				"test_socket",
+				"test_urllib2",
+				"test_urllibnet",
+				"test_urllib2net",
+
+				// makes assumptions about uid_map/gid_map
+				"test_os",
+				"test_subprocess",
+
+				// insane strict_timestamps default
+				"test_zipfile",
+
+				// requires gcc
+				"test_ctypes",
+
+				// breaks on llvm
+				"test_dbm_gnu",
+			];
+			sep = " -x ";
+		},
+
+		// _ctypes appears to infer something from the linker name
+		"LDFLAGS=-Wl,--dynamic-linker=/system/lib/" +
+			"ld-musl-" + linuxArch + ".so.1",
+	];
+
+	exec = make {
+		check = [ "test" ];
+		postInstall = "ln -s python3 /work/system/bin/python";
+	};
+
+	inputs = [
+		zlib,
+		bzip2,
+		libffi,
+
+		kernel-headers,
+	];
+
+	runtime = [
+		zlib,
+		bzip2,
+		libffi,
+	];
+}
+
 package python-setuptools {
 	description = "the autotools of the Python ecosystem";
 	website = "https://pypi.org/project/setuptools";
@@ -302,11 +372,11 @@ package python-hatchling {
 	website = "https://hatch.pypa.io";
 	anitya = 16137;
 
-	version# = "1.17.0";
+	version# = "1.17.1";
 	source = remoteGitHub {
 		suffix = "pypa/hatch";
 		tag = "hatch-v"+version;
-		checksum = "fK85G542FXEXTP1QZNVhhfp8_Y8f9u1DAyeeFO3PWyv3JLTCPdPl9WTz8Ov6tfYp";
+		checksum = "FK9PkGIkL3wyVFHOKrx9lSRqoevuQ_TFrN-pMqsoFKsh5eim4pfzx7MvL3ioif9o";
 	};
 
 	exec = pip {

internal/rosa/package/seatd.az

@@ -17,9 +17,9 @@ package seatd {
 
 	exec = meson {
 		setup = {
-			"Dlibseat-logind": "disabled";
-			"Dlibseat-seatd": "enabled";
-			"Dlibseat-builtin": "enabled";
+			"libseat-logind": "disabled";
+			"libseat-seatd": "enabled";
+			"libseat-builtin": "enabled";
 		};
 	};
 

internal/rosa/package/tamago.az

@@ -3,11 +3,11 @@ package tamago {
 	website = "https://github.com/usbarmory/tamago-go";
 	anitya = 388872;
 
-	version# = "1.26.4";
+	version# = "1.26.5";
 	source = remoteGitHub {
 		suffix = "usbarmory/tamago-go";
 		tag = "tamago-go"+version;
-		checksum = "3-VmJ2mRLQnJtbcXny2unpc7RMNzvVxajirl_M4o-JP7_oRrWOFuaJqUfE-yrZL-";
+		checksum = "QESl24dveM1jniFx_PkPGbxQe7daHcnMlMQXC1MXz6EEmxSeYyrI-tMLi0NEu8QE";
 	};
 
 	env = [

internal/rosa/package/wayland.az

@@ -3,12 +3,12 @@ package wayland {
 	website = "https://wayland.freedesktop.org";
 	anitya = 10061;
 
-	version# = "1.25.0";
+	version# = "1.25.91";
 	source = remoteGitLab {
 		domain = "gitlab.freedesktop.org";
 		suffix = "wayland/wayland";
 		ref = version;
-		checksum = "q-4dYXme46JPgLGtXAxyZGTy7udll9RfT0VXtcW2YRR1WWViUhvdZXZneXzLqpCg";
+		checksum = "SvltMSgObMdDmRoqlSRg_TlKoemR3R-uXtRlRE8bvdw6MFxFp69f0geLOJvahyLT";
 	};
 
 	writable = true;
@@ -19,14 +19,14 @@ echo 'int main(){}' > tests/sanity-test.c
 
 	exec = meson {
 		setup = {
-			"Ddefault_library": "both";
-			"Ddocumentation": "false";
-			"Dtests": "true";
+			"default_library": "both";
+			"documentation": "false";
+			"tests": "true";
 		};
 	};
 
 	inputs = [
-		gawk,
+		awk,
 		diffutils,
 
 		libffi,

internal/rosa/package/wlroots.az

@@ -3,19 +3,19 @@ package wlroots {
 	website = "https://gitlab.freedesktop.org/wlroots/wlroots";
 	anitya = 18357;
 
-	version# = "0.20.1";
+	version# = "0.20.2";
 	source = remoteGitLab {
 		domain = "gitlab.freedesktop.org";
 		suffix = "wlroots/wlroots";
 		ref = version;
-		checksum = "NQAn59GTXYBE4JHkgKnOUGZi9TGKcIrgH0khj53zDUj0whIQvNAc-sE_8xWYF66a";
+		checksum = "TDDJLXJ83uZEu-81LZeDlM0f1wNxaFd4Xn2q1NlKhm7IAEHnZJQHSdLmJIC4As_e";
 	};
 
 	exec = meson {
 		setup = {
-			"Dxwayland": "enabled";
-			"Dallocators": "gbm";
-			"Dbackends": "drm,libinput";
+			"xwayland": "enabled";
+			"allocators": "gbm";
+			"backends": "drm,libinput";
 		};
 	};
 

internal/rosa/package/x.az

@@ -80,7 +80,7 @@ package libXau {
 
 	exec = meson {
 		setup = {
-			"Ddefault_library": "both";
+			"default_library": "both";
 		};
 	};
 
@@ -576,12 +576,12 @@ package libXfont2 {
 	website = "https://gitlab.freedesktop.org/xorg/lib/libxfont";
 	anitya = 17165;
 
-	version# = "2.0.7";
+	version# = "2.0.8";
 	source = remoteGitLab {
 		domain = "gitlab.freedesktop.org";
 		suffix = "xorg/lib/libxfont";
 		ref = "libXfont2-"+version;
-		checksum = "jv9BZNA02493KB8j1lfAErF5SA3ZFcAhm3_UVJ--Bp1maz-vNprl_wXpkHApBi9M";
+		checksum = "8bYRkoiDkbZC2nFs0cOlcmLUNKS6_ZkDTrxas2KxxCJm_PsUD_E58HkMCmGfPGkp";
 	};
 
 	exec = make {
@@ -682,7 +682,7 @@ package libpciaccess {
 
 	exec = meson {
 		setup = {
-			"Dzlib": "enabled";
+			"zlib": "enabled";
 		};
 	};
 
@@ -695,32 +695,32 @@ package xserver {
 	website = "https://gitlab.freedesktop.org/xorg/xserver";
 	anitya = 5250;
 
-	version# = "21.1.23";
+	version# = "21.1.24";
 	source = remoteGitLab {
 		domain = "gitlab.freedesktop.org";
 		suffix = "xorg/xserver";
 		ref = "xorg-server-"+version;
-		checksum = "-hXqyWClfhoRYilXFruZFPCdT4bdYVn8S4BFW6teHqyuSjL2nxx3Fy7yhP2hJDZ6";
+		checksum = "ueBiwKIOHZkSmJPzxAeze_SJHt4QxEHQTk1kMkic-GYxC7Fs41ckwgVzcwr2N3ca";
 	};
 
 	exec = meson {
 		setup = {
-			"Dxorg": "true";
-			"Dxephyr": "true";
-			"Dxnest": "true";
-			"Dipv6": "false";
+			"xorg": "true";
+			"xephyr": "true";
+			"xnest": "true";
+			"ipv6": "false";
 
-			"Dudev": "false";
-			"Dudev_kms": "false";
-			"Dglx": "false";
+			"udev": "false";
+			"udev_kms": "false";
+			"glx": "false";
 
 			// ../../usr/src/xserver/glamor/glamor_glx.c:24:10: fatal error: 'epoxy/glx.h' file not found
-			"Dglamor": "false";
+			"glamor": "false";
 		};
 	};
 
 	inputs = [
-		gawk,
+		awk,
 
 		xorgproto,
 		libxtrans,
@@ -773,25 +773,25 @@ package xwayland {
 	website = "https://gitlab.freedesktop.org/xorg/xserver";
 	anitya = 180949;
 
-	version# = "24.1.12";
+	version# = "24.1.13";
 	source = remoteGitLab {
 		domain = "gitlab.freedesktop.org";
 		suffix = "xorg/xserver";
 		ref = "xwayland-"+version;
-		checksum = "0D0bs8EbDzlyLIULvm6lizqzdx4g1-umdbjVVO7zk-cS1kVIaSkKronCqj95tz-A";
+		checksum = "dZpEGlcPJ72TBCtnR1mvquvN4iUypGvGJ4tN9hpa-ljux28EkSCQRlQHLPRijz36";
 	};
 
 	bin = [ "bash" ];
 	exec = meson {
 		setup = {
-			"Dipv6": "false";
-			"Dsystemd_notify": "false";
+			"ipv6": "false";
+			"systemd_notify": "false";
 		};
 	};
 
 	inputs = [
 		bash,
-		gawk,
+		awk,
 
 		mesa,
 		libglvnd,

internal/rosa/package/xkbcommon.az

@@ -16,7 +16,7 @@ package xkbcommon {
 
 	exec = meson {
 		setup = {
-			"Denable-x11": "false";
+			"enable-x11": "false";
 		};
 	};
 

internal/rosa/rosa.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"unsafe"
 
 	"hakurei.app/fhs"
 	"hakurei.app/internal/pkg"
@@ -332,7 +333,7 @@ func (s *S) HasStageEarly() (ok bool) {
 }
 
 // NewPatchedSource returns [pkg.Artifact] of source with patches applied. If
-// passthrough is true, source is returned as is for zero length patches.
+// passthrough is true, source is returned as is for zero-length patches.
 func (t Toolchain) NewPatchedSource(
 	name string,
 	source pkg.Artifact,
@@ -346,29 +347,34 @@ func (t Toolchain) NewPatchedSource(
 	paths := make([]pkg.ExecPath, len(patches)+1)
 	for i, p := range patches {
 		paths[i+1] = pkg.Path(
-			AbsUsrSrc.Append(name+"-patches", p[0]+".patch"), false,
-			pkg.NewFile(p[0]+".patch", []byte(p[1])),
+			fhs.AbsRoot.Append("patches", p[0]), false,
+			pkg.NewFile(p[0], unsafe.Slice(unsafe.StringData(p[1]), len(p[1]))),
 		)
 	}
-	paths[0] = pkg.Path(AbsUsrSrc.Append(name), false, source)
+	paths[0] = pkg.Path(fhs.AbsRoot.Append("src"), false, source)
 
-	aname := name + "-src"
-	script := `
-cp -r /usr/src/` + name + `/. /work/.
+	var buf strings.Builder
+	buf.WriteString(`
+cp -r /src/. /work/.
 chmod -R +w /work && cd /work
-`
+`)
 	if len(paths) > 1 {
-		script += `
-cat /usr/src/` + name + `-patches/* | \
-	patch \
-	-p 1 \
-	--ignore-whitespace
-`
-		aname += "-patched"
+		buf.WriteString(`
+function apply {
+	echo "applying $1"
+	patch -p 1 < "/patches/$1"
+}
+`)
+
+		for _, p := range patches {
+			buf.WriteString("apply '")
+			buf.WriteString(p[0])
+			buf.WriteString("'\n")
+		}
 	}
-	return t.New(aname, 0, t.Append(nil,
+	return t.New(name+"-src", 0, t.Append(nil,
 		_patch,
-	), nil, nil, script, paths...)
+	), nil, nil, buf.String(), paths...)
 }
 
 // helperInPlace is a special directory value for omitting the cd statement.

internal/rosa/state.go

@@ -878,6 +878,7 @@ func (s *S) getFrame() azalea.Frame {
 			) (v any, set bool, err error) {
 				var attr MesonHelper
 				if err = args.Apply(map[unique.Handle[azalea.Ident]]any{
+					k("muon"):            &attr.Muon,
 					k("preCompile"):      &attr.ScriptCompileEarly,
 					k("postCompile"):     &attr.ScriptCompiled,
 					k("postInstall"):     &attr.Script,
@@ -1053,7 +1054,7 @@ func (ctx *evalContext) pf(
 			return
 		}
 		attr.Patches = append(attr.Patches, KV{
-			strings.TrimSuffix(filepath.Base(pathname), ".patch"),
+			filepath.Base(pathname),
 			unsafe.String(unsafe.SliceData(p), len(p)),
 		})
 	}