From 4b2f9797416e883aecfe67c53b786cc5abd06989 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 13 Mar 2026 14:14:19 +0900 Subject: [PATCH] internal/rosa/curl: 8.18.0 to 8.19.0 The test suite now depends on python to run mock servers. SMB is disabled because it is completely unused, and pulls in a python dependency for tests. A broken test is fixed and the patch hopefully upstreamed before next release. Signed-off-by: Ophestra --- internal/rosa/curl.go | 34 +++++++++++++++++++++++++++++----- internal/rosa/tamago.go | 4 ++-- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/internal/rosa/curl.go b/internal/rosa/curl.go index 1622254..260928b 100644 --- a/internal/rosa/curl.go +++ b/internal/rosa/curl.go @@ -4,24 +4,48 @@ import "hakurei.app/internal/pkg" func (t Toolchain) newCurl() (pkg.Artifact, string) { const ( - version = "8.18.0" - checksum = "YpOolP_sx1DIrCEJ3elgVAu0wTLDS-EZMZFvOP0eha7FaLueZUlEpuMwDzJNyi7i" + version = "8.19.0" + checksum = "YHuVLVVp8q_Y7-JWpID5ReNjq2Zk6t7ArHB6ngQXilp_R5l3cubdxu3UKo-xDByv" ) return t.NewPackage("curl", version, pkg.NewHTTPGetTar( nil, "https://curl.se/download/curl-"+version+".tar.bz2", mustDecode(checksum), pkg.TarBzip2, - ), nil, &MakeHelper{ + ), &PackageAttr{ + Patches: [][2]string{ + {"test459-misplaced-line-break", `diff --git a/tests/data/test459 b/tests/data/test459 +index 7a2e1db7b3..cc716aa65a 100644 +--- a/tests/data/test459 ++++ b/tests/data/test459 +@@ -54,8 +54,8 @@ Content-Type: application/x-www-form-urlencoded + arg + + +-Warning: %LOGDIR/config:1 Option 'data' uses argument with unquoted whitespace.%SP +-Warning: This may cause side-effects. Consider double quotes. ++Warning: %LOGDIR/config:1 Option 'data' uses argument with unquoted%SP ++Warning: whitespace. This may cause side-effects. Consider double quotes. + + + +`}, + }, + }, &MakeHelper{ Configure: [][2]string{ {"with-openssl"}, {"with-ca-bundle", "/system/etc/ssl/certs/ca-bundle.crt"}, + + {"disable-smb"}, }, Check: []string{ - "TFLAGS=-j256", - "check", + `TFLAGS="-j$(expr "$(nproc)" '*' 2)"`, + "test-nonflaky", }, }, Perl, + Python, + PkgConfig, + Diffutils, Libpsl, OpenSSL, diff --git a/internal/rosa/tamago.go b/internal/rosa/tamago.go index 1c2a42d..2546b99 100644 --- a/internal/rosa/tamago.go +++ b/internal/rosa/tamago.go @@ -8,8 +8,8 @@ import ( func (t Toolchain) newTamaGo() (pkg.Artifact, string) { const ( - version = "1.26.0" - checksum = "5XkfbpTpSdPJfwtTfUegfdu4LUy8nuZ7sCondiRIxTJI9eQONi8z_O_dq9yDkjw8" + version = "1.26.1" + checksum = "fimZnklQcYWGsTQU8KepLn-yCYaTfNdMI9DCg6NJVQv-3gOJnUEO9mqRCMAHnEXZ" ) return t.New("tamago-go"+version, 0, t.AppendPresets(nil, Bash,