commit: 3ae9b755eb7d1bc63e9a76c6991eda84797f4016
parent 2d75c2fab3d8977b6fc912ee26710961aec15bc2
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sun, 5 Oct 2025 15:14:22 +0200
bump utils-std to 0.0.10
Diffstat:
4 files changed, 6 insertions(+), 67 deletions(-)
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -58,7 +58,7 @@ b42a09dcc2f98bc2a1c8fa1d67c203a8e982b6ca97374962099f3074a6fbf12aa77f08963b731327
56f6c21c8591d5cc8a42f3d0c1d6f568319b91bcaa1bc31b17f6f1ee9ac22d8c3135fcd20eb4719ef562d280c91dbaac40b7f9a6025a993f7320646122f38369 distfiles/tcc-libs-static-0.9.27_git20250106-r0.apk.x86_64
ccb62313eaf2fb149ba3a372ab6a0cccde2fc23e2193843f457b9ed181b832fddb34fe23b18ec3005aefb7d1137fcb440fb57462b9414734f3b1a90183d3db36 distfiles/tiny-curl-8.4.0.tar.gz
e24f54749ce81a36fc9fb33bf89a70dd51a54d33eac8723e6fb0dfecf7753cd5df7095527dfcf6b01d18546833d350a5a2179cce1b5c9ee6b39c2b1d63a95113 distfiles/usign-f1f65026a94137c91b5466b149ef3ea3f20091e9.tar.gz
-8eff101fc2bff397f96a4a5ae5fca63492bd192ff7d690ba0a03a837e28f7668fa453eb6e99988d3b02482944f5b62f01440e8fc2557489641d59bc0e394a413 distfiles/utils-std-0.0.9.tar.gz
-84f2b9059bf70a0ec8fe74516aa76d32824bc9c152d8e9efccb7ea6122d63700074ed90326b6c12065072cc1df46a436326f11e0e7997317cb77f404f32e9d72 distfiles/utils-std-0.0.9.tar.gz.sign
+7a0c2fb47e6d74b06ced463436090511649196b351af2aff7107442c2bc3bc197e68befd4272fe765aa134d2fcb4fdd0c598167c2fac6a5fae94e018c0b6290a distfiles/utils-std-0.0.10.tar.gz
+3e65179b24a49ac0bce347ba9100cd52cec3aff34736a0073660ffb9bda0448b0e156fdd0cbe6e550f7bc9430eb915a5b25a8e7632388e4ce91d3956400491dd distfiles/utils-std-0.0.10.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://distfiles.hacktivis.me/releases/utils-std/utils-std-0.0.9.tar.gz
- https://distfiles.hacktivis.me/releases/utils-std/utils-std-0.0.9.tar.gz.sign
+ https://distfiles.hacktivis.me/releases/utils-std/utils-std-0.0.10.tar.gz
+ https://distfiles.hacktivis.me/releases/utils-std/utils-std-0.0.10.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
@@ -73,7 +73,7 @@ fetch_forge https://github.com/openwrt/usign/archive usign f1f65026a94137c91b546
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.9.tar.gz.sign -m utils-std-0.0.9.tar.gz
+ signify -V -p lanodan-2025.pub -x utils-std-0.0.10.tar.gz.sign -m utils-std-0.0.10.tar.gz
fi
cd -
diff --git a/make-root.sh b/make-root.sh
@@ -6,7 +6,7 @@
tarballs="
oksh-oksh-7.7.tar.gz
yacc-oyacc-6.6.tar.gz
- utils-std-0.0.9.tar.gz
+ utils-std-0.0.10.tar.gz
pdpmake-2.0.3.tgz
nawk-20250116.tar.gz
bzip2-bzip2-1.0.8.tar.gz
@@ -217,10 +217,6 @@ ln -s oksh "${out_base}/bin/sh"
gen_oksh_tcc_h > oksh_tcc.h
-cd "${out_base}"/src/utils-std-*
-
-patch -p1 <"${WORKDIR}"/src/utils-std-0.0.9-patches/0001-cmd-ln-change-same-reference-from-error-to-informati.patch || die "Failed patching cmd/ln.c"
-
cd "${out_base}/src"
oyacc=$(echo ./yacc-oyacc-*/)
diff --git a/src/utils-std-0.0.9-patches/0001-cmd-ln-change-same-reference-from-error-to-informati.patch b/src/utils-std-0.0.9-patches/0001-cmd-ln-change-same-reference-from-error-to-informati.patch
@@ -1,57 +0,0 @@
-From c10e309cb4c029629c419d73a2b3f362b42ee65f Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Mon, 8 Sep 2025 19:55:00 +0200
-Subject: [PATCH] cmd/ln: change same reference from error to information
-
-POSIX (2008 and 2024) requires a message to standard error so has
-to be logged. Considering as the action is already done there's
-no need for an errorneous status.
----
- cmd/ln.c | 4 ++--
- test-cmd/ln.sh | 9 ++++++++-
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/cmd/ln.c b/cmd/ln.c
-index ad42486..5e866e1 100644
---- a/cmd/ln.c
-+++ b/cmd/ln.c
-@@ -113,10 +113,10 @@ do_link(char *src, char *dest, int destfd)
- else if(src_stat.st_dev == dest_stat.st_dev && src_stat.st_ino == dest_stat.st_ino)
- {
- fprintf(stderr,
-- "ln: error: Source '%s' and destination '%s' refer to the same file\n",
-+ "ln: info: Source '%s' and destination '%s' refer to the same file\n",
- src,
- dest);
-- return -1;
-+ return 0;
- }
-
- if(unlink(dest) < 0)
-diff --git a/test-cmd/ln.sh b/test-cmd/ln.sh
-index ca0aa61..39ae619 100755
---- a/test-cmd/ln.sh
-+++ b/test-cmd/ln.sh
-@@ -2,7 +2,7 @@
- # SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me>
- # SPDX-License-Identifier: MPL-2.0
-
--plans=63
-+plans=67
- WD=$(dirname "$0")
- target="${WD}/../cmd/ln"
- . "${WD}/tap.sh"
-@@ -107,3 +107,10 @@ t_readlink()
- " -s /foo/bar/dest_broken_symlink ./
- t_args 'dest_broken_symlink:force' '' -sf /foo/bar/dest_broken_symlink ./
- t_cmd 'dest_broken_symlink:cleanup' '' rm dest_broken_symlink
-+
-+t_args same:create '' -s "$target" same
-+t_args --exit=1 same:no_force "ln: error: Destination 'same' already exists
-+" -s "$target" same
-+t_args same:force "ln: info: Source '$target' and destination 'same' refer to the same file
-+" -fs "$target" same
-+t_cmd same:cleanup '' rm same
---
-2.49.1
-
