commit: 8f3d286e8bd4a94f057190b459a37431183f3066
parent 0c406e7d59949779c11f52f0d9679be1f7caa1d6
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sun, 12 May 2024 07:31:36 +0200
Bump utils-std to 8266037
- mv command
- several bugfixes to install(1) implementation
- install with -D option
Diffstat:
6 files changed, 5 insertions(+), 49 deletions(-)
diff --git a/bootstrap-gettext-tiny.sh b/bootstrap-gettext-tiny.sh
@@ -7,7 +7,7 @@ cd gettext-tiny-*/
export RANLIB=true
make
-make install INSTALL=./install.sh LIBINTL=MUSL libdir=/usr/lib/
+make install INSTALL=install LIBINTL=MUSL libdir=/usr/lib/
cd ..
rm -fr gettext-tiny-*/
diff --git a/distfiles.SHA512SUM b/distfiles.SHA512SUM
@@ -70,7 +70,7 @@ ede1616d9892b2ca1fdb332a4329ac26f544321620cae1abc73bea13c79120599e7bc626296494ef
b932d4c4d05193a4c68370607234f3d77ce0fba93aadf6323529ad6aa56e51b38309c0d85870a040baac704eb30807a71e6510351e8893fbd2aa7b1265027ecc distfiles/tcc-libs-static-0.9.27_git20240117-r0.apk.x86
b89b489fbee7c19a21175ad61168d250856801175fa000261b35202312148ee8e7b6cb1994d042503ad36f2651ee1ba68c4f83d96051abb50fb4e0e5dbc78960 distfiles/tcc-libs-static-0.9.27_git20240117-r0.apk.x86_64
ccb62313eaf2fb149ba3a372ab6a0cccde2fc23e2193843f457b9ed181b832fddb34fe23b18ec3005aefb7d1137fcb440fb57462b9414734f3b1a90183d3db36 distfiles/tiny-curl-8.4.0.tar.gz
-0a54d8d976536c335821635072ed60e287d6554e2e9947dff1cab8f2fc1413890289fc4493af43e9fdd7eb9a4475df04b3e2da562e0e2502c90bc612b3d65f67 distfiles/utils-std-c098107.tar.gz
+4c5fb10c864d748b02e4da01c0e23bca72866755c1aeaa97d872a26454228cb5bb134f91cc1b883951eab99360ce44acd994ae69a3c1bde23007259b5da25f42 distfiles/utils-std-8266037.tar.gz
149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737 distfiles/xz-5.4.2.tar.gz
6adb51c5f07e8084a86688589f52d9eee0183fb4d77508e36621a6b0ba91a5c4195feb87db3401ec69560554f71f2f6984dec01266e41e0fd54fa72ef1780e80 distfiles/yacc-1.9.1.tar.Z
580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f distfiles/zlib-1.3.1.tar.gz
diff --git a/fetch.sh b/fetch.sh
@@ -1,6 +1,6 @@
#!/bin/sh
URLS="
- https://hacktivis.me/releases/utils-std/utils-std-c098107.tar.gz
+ https://hacktivis.me/releases/utils-std/utils-std-8266037.tar.gz
http://void.crufty.net/ftp/pub/sjg/bmake-20230909.tar.gz
http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
https://distfiles.gentoo.org/distfiles/ec/yacc-1.9.1.tar.Z
diff --git a/init.sh b/init.sh
@@ -26,7 +26,7 @@ build_awk() {
}
build_stubs() {
- for i in ls mv grep cp
+ for i in ls grep cp
do
$CC $CFLAGS -o "/bin/$i" "/${i}-stub.c" || die "Failed compiling $i stub"
done
diff --git a/make-root.sh b/make-root.sh
@@ -6,7 +6,7 @@
tarballs="
lolibc-f6e9da7.tar.gz
loksh-7.3.tar.gz
- utils-std-c098107.tar.gz
+ utils-std-8266037.tar.gz
mk-20210330.tar.gz
bmake-20230909.tar.gz
yacc-1.9.1.tar.Z
@@ -37,7 +37,6 @@ distfiles="
local_files="
init.sh
ls-stub.c
- mv-stub.c
grep-stub.c
cp-stub.c
bootstrap-bash.sh
diff --git a/mv-stub.c b/mv-stub.c
@@ -1,43 +0,0 @@
-// utils-std: Collection of commonly available Unix tools
-// SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me>
-// SPDX-License-Identifier: MPL-2.0
-
-#include <stdio.h> // fprintf, rename
-#include <unistd.h> // getopt
-#include <string.h> // strerror
-#include <errno.h>
-
-int
-main(int argc, char *argv[])
-{
- int c = -1;
- while((c = getopt(argc, argv, ":f")) != -1)
- {
- switch(c)
- {
- case 'f':
- // ignored
- break;
- case '?':
- fprintf(stderr, "mv: Unknown option '-%c'\n", optopt);
- break;
- }
- }
-
- argc -= optind;
- argv += optind;
-
- if(argc != 2)
- {
- fprintf(stderr, "Usage: mv [-f] src dest\n");
- return 1;
- }
-
- if(rename(argv[0], argv[1]) != 0)
- {
- fprintf(stderr, "mv: Failed renaming: %s\n", strerror(errno));
- return 1;
- }
-
- return 0;
-}
