oasis

commit: e1ad3c02880cddffe41f21e87d5ecf1de395e4da
parent 040da26992ae968b7553dc7000684bc9eba4f964
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Wed, 25 Jun 2025 16:31:43 +0200

pkg/utils-std: bump to 0.0.6

Diffstat:
M
.gitmodules
3
---
M
pkg/utils-std/gen.lua
36
+++++++++++++++++++++---------------
A
pkg/utils-std/sha256
1
+
D
pkg/utils-std/src
1
-
A
pkg/utils-std/url
1
+
M
pkg/utils-std/ver
2
+-

6 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -401,6 +401,3 @@
 	path = pkg/zstd/src
 	url = https://github.com/facebook/zstd
 	ignore = all
-[submodule "pkg/utils-std/src"]
-	path = pkg/utils-std/src
-	url = https://anongit.hacktivis.me/git/utils-std.git
diff --git a/pkg/utils-std/gen.lua b/pkg/utils-std/gen.lua
@@ -13,8 +13,7 @@ pkg.deps = {
 	'$srcdir/config.h'
 }
 
-lib('lib.a', [[lib/(
-	bytes2hex.c
+lib('libutils.a', [[libutils/(
 	consent.c
 	datetime_parse.c
 	err.c
@@ -24,12 +23,9 @@ lib('lib.a', [[lib/(
 	lib_mkdir.c
 	mode.c
 	offline_realpath.c
-	sha1.c
-	sha256.c
-	sha512.c
+	strchrnul.c
 	strtodur.c
 	symbolize_mode.c
-	tr_str.c
 	truncation.c
 	user_group_parse.c
 )]])
@@ -44,19 +40,29 @@ sym('bin/uuencode', 'base64')
 --	yacc('cmd/expr', 'cmd/expr.y')
 --	exe('expr', [[
 --		$outdir/cmd/expr.tab.c
---		lib.a
+--		libutils.a
 --	]])
 --	file('bin/expr', '755', '$outdir/expr')
 --	man{'$srcdir/cmd/expr.1'}
 --end)
 
 file('bin/timeout', '755',
-	exe('timeout', {'cmd/timeout.c', 'lib.a',
+	exe('timeout', {'cmd/timeout.c', 'libutils.a',
 		cc('$outdir/lib/sys_signame.c', {}, {cflags='-I $srcdir/lib/'})
 	})
 )
 man{'$srcdir/cmd/timeout.1'}
 
+file('bin/tr', '755', exe('tr', {'cmd/tr.c', 'libutils.a', 'lib/tr_str.c'}))
+man{'$srcdir/cmd/tr.1'}
+
+file('bin/sha1sum', '755', exe('sha1sum', {'cmd/sha1sum.c', 'libutils.a', 'lib/bytes2hex.c.o', 'lib/sha1.c'}))
+man{'$srcdir/cmd/sha1sum.1'}
+file('bin/sha256sum', '755', exe('sha256sum', {'cmd/sha256sum.c', 'libutils.a', 'lib/bytes2hex.c.o', 'lib/sha256.c'}))
+man{'$srcdir/cmd/sha256sum.1'}
+file('bin/sha512sum', '755', exe('sha512sum', {'cmd/sha512sum.c', 'libutils.a', 'lib/bytes2hex.c.o', 'lib/sha512.c'}))
+man{'$srcdir/cmd/sha512sum.1'}
+
 local cmds = {
 	'arch',
 	'base64',
@@ -75,7 +81,7 @@ local cmds = {
 	'env',
 	-- 'expr',
 	'false',
-	-- 'getconf',
+	-- 'getconf', // Try again in the release after 0.0.6
 	'head',
 	'id',
 	'install',
@@ -101,9 +107,9 @@ local cmds = {
 	'rm',
 	'rmdir',
 	'seq',
-	'sha1sum',
-	'sha256sum',
-	'sha512sum',
+	-- 'sha1sum',
+	-- 'sha256sum',
+	-- 'sha512sum',
 	'shuf',
 	'sleep',
 	'split',
@@ -114,7 +120,7 @@ local cmds = {
 	'time',
 	-- 'timeout',
 	'touch',
-	'tr',
+	-- 'tr',
 	'true',
 	'truncate',
 	'tty',
@@ -131,7 +137,7 @@ rule('m4', 'm4 $m4flags $in > $out')
 for _, cmd in ipairs(cmds) do
 	local src = cmd
 	local deps
-	file('bin/'..cmd, '755', exe(cmd, {'cmd/'..src..'.c', 'lib.a'}, deps))
+	file('bin/'..cmd, '755', exe(cmd, {'cmd/'..src..'.c', 'libutils.a'}, deps))
 
 	if cmd == 'date' or cmd == 'touch' then
 		local out = '$outdir/'..cmd..'.1'
@@ -142,4 +148,4 @@ for _, cmd in ipairs(cmds) do
 	end
 end
 
-fetch 'git'
+fetch 'curl'
diff --git a/pkg/utils-std/sha256 b/pkg/utils-std/sha256
@@ -0,0 +1 @@
+741ff3d7613e20595e228b6d313c9749cd6f80b4a6ea62904f545fbcaa1ddef5  utils-std-0.0.6.tar.gz
diff --git a/pkg/utils-std/src b/pkg/utils-std/src
@@ -1 +0,0 @@
-Subproject commit 62bf9f555ad4ca269fdce24be9a10eb664dd1387
diff --git a/pkg/utils-std/url b/pkg/utils-std/url
@@ -0,0 +1 @@
+url = "https://distfiles.hacktivis.me/releases/utils-std/utils-std-0.0.6.tar.gz"
diff --git a/pkg/utils-std/ver b/pkg/utils-std/ver
@@ -1 +1 @@
-62bf9f5 r0
+0.0.6 r0