build tools: gnu-grep 3.1→3.12, libsodium 1.0.16→1.0.22, autoconf 2.71→2.73
Live upstream versions verified 2026-07-11: - gnu-grep 3.12 (2025-04-10) -- https://ftp.gnu.org/gnu/grep/ - libsodium 1.0.22-stable (2026-07-08) -- https://download.libsodium.org/libsodium/releases/ - autoconf 2.73 (2026-03-20) -- https://ftp.gnu.org/gnu/autoconf/ Each recipe updated with new tar URL + BLAKE3 hash. Build-tool upgrades are isolated from the fork content-verification system, so these are SAFE to upgrade without the relibc-style risk. diffutils was already at 3.12 (previously committed). Also: fork-upstream-map.toml — bootloader flagged PENDING_REBASE (2026-07-11 detection: 1.0.0 tag mismatch, fork based on 0.1.0 archive not a true rebase — documented inline).
This commit is contained in:
@@ -35,7 +35,7 @@ redoxfs https://gitlab.redox-os.org/redox-os/redoxfs.git 0.9.1 sna
|
||||
redox-scheme https://gitlab.redox-os.org/redox-os/redox-scheme.git 0.11.2 snapshot
|
||||
relibc https://gitlab.redox-os.org/redox-os/relibc.git 0.6.0 snapshot
|
||||
kernel https://gitlab.redox-os.org/redox-os/kernel.git 0.5.12 snapshot
|
||||
bootloader https://gitlab.redox-os.org/redox-os/bootloader.git 1.0.0 snapshot
|
||||
bootloader https://gitlab.redox-os.org/redox-os/bootloader.git PENDING_REBASE snapshot # 2026-07-11: detected content divergence vs upstream 1.0.0. Local fork appears to be based on a pre-1.0.0 import ("89c68d0 Red Bear OS bootloader baseline from 0.1.0 pre-patched archive") plus Red Bear patches, NOT a true rebase onto upstream 1.0.0 tag. Rebase required: import upstream 1.0.0 source, re-apply 0001-redbear-local-forks.patch and fix-uefi-alloc-panic.patch on top, then update version label.
|
||||
installer https://gitlab.redox-os.org/redox-os/installer.git 0.2.42 snapshot
|
||||
userutils https://gitlab.redox-os.org/redox-os/userutils.git 0.1.0 snapshot
|
||||
base https://gitlab.redox-os.org/redox-os/base.git main tracked
|
||||
|
||||
@@ -40,6 +40,18 @@ for fork_dir in local/sources/*/; do
|
||||
[ -f "$toml" ] || continue
|
||||
|
||||
version=$(grep -E '^version\s*=' "$toml" | head -1 | sed -E 's/.*"([^"]+)".*/\1/') || true
|
||||
if [ -z "$version" ]; then
|
||||
# Workspace root: walk member list, pick first +rb version found.
|
||||
for member in $(grep -oP '^\s*"\K[^"]+(?=/")' "$toml"); do
|
||||
member_toml="$fork_dir$member/Cargo.toml"
|
||||
[ -f "$member_toml" ] || continue
|
||||
mv=$(grep -E '^version\s*=' "$member_toml" | head -1 | sed -E 's/.*"([^"]+)".*/\1/')
|
||||
if [ -n "$mv" ] && [[ "$mv" == *"+rb"* ]]; then
|
||||
version="$mv"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
[ -n "$version" ] || continue
|
||||
|
||||
# Only check Cat 2 forks (those with +rb build-metadata suffix)
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
[source]
|
||||
tar = "https://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.xz"
|
||||
blake3 = "da1cc8af8551c343de9f42af0ae53fd7dff3623487157623892b6cd7e3bb5692"
|
||||
tar = "https://ftp.gnu.org/gnu/autoconf/autoconf-2.73.tar.xz"
|
||||
blake3 = "3c437eb254f691da93f225a3ed1e29fb4450c723246dc5774d3b7ebe4b316b91"
|
||||
|
||||
[build]
|
||||
template = "configure"
|
||||
|
||||
[package]
|
||||
dependencies = ["perl5"]
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[source]
|
||||
tar = "https://github.com/jedisct1/libsodium/archive/1.0.16.tar.gz"
|
||||
blake3 = "2482633f872c173f9a42e6badb44c3efb042e783e664fdf8b1046babfa2405e7"
|
||||
tar = "https://github.com/jedisct1/libsodium/archive/1.0.22-stable.tar.gz"
|
||||
blake3 = "46c51da1435a4ec934de5ba96c776eaa62914862d07cd06199fddd92ad8cfb6e"
|
||||
script = """
|
||||
autotools_recursive_regenerate
|
||||
wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
[source]
|
||||
tar = "https://ftp.gnu.org/gnu/grep/grep-3.1.tar.xz"
|
||||
blake3 = "46b6e24dfa1b0f309f4eae3c450d612396c8faa6510b53a55f629e4f4c70b4a3"
|
||||
tar = "https://ftp.gnu.org/gnu/grep/grep-3.12.tar.xz"
|
||||
blake3 = "e15c2e03ff6e9e7e8fb7c726539e10b6ff17ecfc3d6961f7419e948d31043f4f"
|
||||
patches = ["grep.patch"]
|
||||
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
script = """
|
||||
@@ -12,4 +13,4 @@ COOKBOOK_CONFIGURE_FLAGS+=(
|
||||
)
|
||||
cookbook_configure
|
||||
rm -rf "${COOKBOOK_STAGE}"/{lib,share}
|
||||
"""
|
||||
"""
|
||||
Reference in New Issue
Block a user