bootstrap-initrd

commit: 130fbadf04c06ab8624a6740af2912773ec57011
parent 98f2376f4ed3593c99a594b4ce0c8d718f10d595
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue, 15 Apr 2025 06:36:40 +0200

bump utils-std to 0.0.4

Diffstat:
M
distfiles.SHA512SUM
4
++--
M
fetch.sh
6
+++---
M
make-root.sh
4
+---
D
utils-std-0.0.3-test_printf_quotes.patch
37
-------------------------------------

4 files changed, 6 insertions(+), 45 deletions(-)
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -58,7 +58,7 @@ ca2ba7d3e2e1abd887e73e215baaf2cf0f9ca9d307994e07b7f06b192798491321713fd12d02b4e3
 fc82b5abae6ac546821893343a64238ab1d827fc03f4dfe3e0a18499bc2441cf4f259191ba5ad0908f30b965ddeea9132e878e75211252b8d8b1726602a90185  distfiles/tcc-libs-static-0.9.27_git20250106-r0.apk.x86
 5163aff630c2a6e8748128f5b060d0dc0ad5fc3e72d179205ccc90bd0255e3a9fc451a4d91f3157fd2db709aab94423ae5b7d981c966e84a27ff6346748dcc9f  distfiles/tcc-libs-static-0.9.27_git20250106-r0.apk.x86_64
 ccb62313eaf2fb149ba3a372ab6a0cccde2fc23e2193843f457b9ed181b832fddb34fe23b18ec3005aefb7d1137fcb440fb57462b9414734f3b1a90183d3db36  distfiles/tiny-curl-8.4.0.tar.gz
-a77a3532cec2d04b667906cc25a20cf9fef0eae92e0ab6cc292c0de37158c5e24cc7a0f0ff0b4a0fce348e5b2e4780d2d5d538fa4802930459f1fe7fc0945878  distfiles/utils-std-0.0.3.tar.gz
-b3fe02dcb3c6d82504695ac39cbd403aefe31a37a0230dc3d6c08c7cf6ed952e551d7a7a9c3b5793df0f3ff135c06f90fab4ea5644eaebcc551622c02623b426  distfiles/utils-std-0.0.3.tar.gz.sign
+4b40052dc47117ebe9d80daaef490dc910bac6d4f3a812acc96d6e83dee63b2d84ad07c2945809d068002283f140c612c4f64eaefedf379b097b51ef522a9758  distfiles/utils-std-0.0.4.tar.gz
+453ff325c1655ce990e985d9d93e216fbfe023801a4e1e3943858481d3e6f013a73c96e0bba2ec213761520ea01bfcdfa982a5e198bca7d0b31f1c82e2efef0a  distfiles/utils-std-0.0.4.tar.gz.sign
 e186a8fc01871414574fd5e90e8ce87a45bcf40aa0d7276bd90a301ee8c312be3a0adb580fc2c8b6653fbeeda1ce4dfdd078095a5fc77e70263e5e940414dc54  distfiles/yacc-oyacc-6.6.tar.gz
 580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f  distfiles/zlib-1.3.1.tar.gz
diff --git a/fetch.sh b/fetch.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 URLS="
-	https://hacktivis.me/releases/utils-std/utils-std-0.0.3.tar.gz
-	https://hacktivis.me/releases/utils-std/utils-std-0.0.3.tar.gz.sign
+	https://hacktivis.me/releases/utils-std/utils-std-0.0.4.tar.gz
+	https://hacktivis.me/releases/utils-std/utils-std-0.0.4.tar.gz.sign
 	https://frippery.org/make/pdpmake-2.0.3.tgz
 	https://gitlab.com/bzip2/bzip2/-/archive/bzip2-1.0.8/bzip2-bzip2-1.0.8.tar.gz
 	https://zlib.net/zlib-1.3.1.tar.gz
@@ -72,7 +72,7 @@ fetch_forge https://github.com/pts/muxzcat/archive/refs/tags muxzcat v2b
 test -e sbase-b30fb568.tar.gz || curl ${CURL_OPTS} -o sbase-b30fb568.tar.gz https://git.sr.ht/~mcf/sbase/archive/b30fb56804bfed69b45ef0e944d2e029e4d26258.tar.gz
 
 if command -v signify >/dev/null; then
-	signify -V -p lanodan-2025.pub -x utils-std-0.0.2.tar.gz.sign -m utils-std-0.0.2.tar.gz
+	signify -V -p lanodan-2025.pub -x utils-std-0.0.4.tar.gz.sign -m utils-std-0.0.4.tar.gz
 fi
 
 cd -
diff --git a/make-root.sh b/make-root.sh
@@ -6,7 +6,7 @@
 tarballs="
 	oksh-oksh-7.6.tar.gz
 	yacc-oyacc-6.6.tar.gz
-	utils-std-0.0.3.tar.gz
+	utils-std-0.0.4.tar.gz
 	pdpmake-2.0.3.tgz
 	nawk-20250116.tar.gz
 	bzip2-bzip2-1.0.8.tar.gz
@@ -178,8 +178,6 @@ gen_oksh_tcc_h > oksh_tcc.h
 
 cd "${out_base}/src"
 
-patch -p0 <"${WORKDIR}/utils-std-0.0.3-test_printf_quotes.patch"
-
 oyacc=$(echo ./yacc-oyacc-*/)
 cat >"${oyacc}/config.h" <<EOF
 // __dead and __dead2 are absent in musl
diff --git a/utils-std-0.0.3-test_printf_quotes.patch b/utils-std-0.0.3-test_printf_quotes.patch
@@ -1,37 +0,0 @@
-From 3f5fd38aa20a56a6c936fd441fcb88ba05498b76 Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Sat, 12 Apr 2025 23:00:34 +0200
-Subject: [PATCH] test-cmd/printf.sh: use regular quoting instead of heredoc
- trick
-
-OpenBSD ksh 7.6 fails to parse it
----
- test-cmd/printf.sh | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/test-cmd/printf.sh b/test-cmd/printf.sh
-index feb3d81..8a5ba21 100755
---- utils-std-0.0.3/test-cmd/printf.sh
-+++ utils-std-0.0.3/test-cmd/printf.sh
-@@ -17,16 +17,10 @@
- bar
- '
- 
--var_c_upper=$(cat <<'EOF'
--\c@\cA\cB\cC\cD\cE\cF\cG\cH\cI\cJ\cK\cL\cM\cN\cO\cP\cQ\cR\cS\cT\cU\cV\cW\cX\cY\cZ\c[\c\\c]\c^\c_ !"#$%%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\c?
--EOF
--)
-+var_c_upper='\c@\cA\cB\cC\cD\cE\cF\cG\cH\cI\cJ\cK\cL\cM\cN\cO\cP\cQ\cR\cS\cT\cU\cV\cW\cX\cY\cZ\c[\c\\c]\c^\c_ !"#$%%&'"'"'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\c?'
- 
- t_file esc_c_upper "${WD}/test-cmd/inputs/all_ascii" "${var_c_upper}"
- 
--var_c_lower=$(cat <<'EOF'
--\c@\ca\cb\cc\cd\ce\cf\cg\ch\ci\cj\ck\cl\cm\cn\co\cp\cq\cr\cs\ct\cu\cv\cw\cx\cy\cz\c[\c\\c]\c^\c_ !"#$%%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\c?
--EOF
--)
-+var_c_lower='\c@\ca\cb\cc\cd\ce\cf\cg\ch\ci\cj\ck\cl\cm\cn\co\cp\cq\cr\cs\ct\cu\cv\cw\cx\cy\cz\c[\c\\c]\c^\c_ !"#$%%&'"'"'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\c?'
- 
- t_file esc_c_lower "${WD}/test-cmd/inputs/all_ascii" "${var_c_lower}"
--- 
-2.49.0
-