commit: 771cb9e0f4e248bf4833132bb761562c52b562f4
parent b1b04ebc27dae01fc20c8db17c6a99a0ebb86130
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Mon, 29 Sep 2025 19:14:59 +0200
pkg/utils-std: bump to 0.0.9
Diffstat:
6 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/pkg/sbase/gen.lua b/pkg/sbase/gen.lua
@@ -66,8 +66,8 @@ lib('libutf.a', [[libutf/(
utftorunestr.c
)]])
-rule('getconf', '$srcdir/getconf.sh >$out')
-build('getconf', '$outdir/getconf.h', {'|', '$srcdir/getconf.sh'})
+--rule('getconf', '$srcdir/getconf.sh >$out')
+--build('getconf', '$outdir/getconf.h', {'|', '$srcdir/getconf.sh'})
local cmds = {
'cal',
@@ -114,9 +114,9 @@ for _, cmd in ipairs(cmds) do
src = 'xinstall'
end
local deps
- if cmd == 'getconf' then
- deps = {'$outdir/getconf.h'}
- end
+ --if cmd == 'getconf' then
+ -- deps = {'$outdir/getconf.h'}
+ --end
file('bin/'..cmd, '755', exe(cmd, {src..'.c', 'libutil.a', 'libutf.a'}, deps))
man{'$srcdir/'..src..'.1'}
end
diff --git a/pkg/utils-std/config.h b/pkg/utils-std/config.h
@@ -6,4 +6,5 @@
#define HAS_COPY_FILE_RANGE
#define HAS_GETOPT_LONG
#define HAS_SYNCFS
+#define HAS_MKSTEMPS
#endif // UTILS_STD_CONFIG_H
diff --git a/pkg/utils-std/gen.lua b/pkg/utils-std/gen.lua
@@ -33,18 +33,20 @@ lib('libutils.a', [[libutils/(
sym('bin/[', 'test')
sym('bin/chgrp', 'chown')
sym('bin/readlink', 'realpath')
+man{'$srcdir/cmd/readlink.1'}
sym('bin/uuencode', 'base64')
+man{'$srcdir/cmd/uuencode.1'}
---sub('expr.ninja', function()
--- cflags{'-D_POSIX_C_SOURCE=200809L'}
--- yacc('cmd/expr', 'cmd/expr.y')
--- exe('expr', [[
--- $outdir/cmd/expr.tab.c
--- libutils.a
--- ]])
--- file('bin/expr', '755', '$outdir/expr')
--- man{'$srcdir/cmd/expr.1'}
---end)
+sub('expr.ninja', function()
+ cflags{'-D_POSIX_C_SOURCE=200809L', '-I $srcdir/cmd/'}
+ yacc('cmd/expr', 'cmd/expr.y')
+ exe('expr', [[
+ $outdir/cmd/expr.tab.c
+ libutils.a
+ ]])
+ file('bin/expr', '755', '$outdir/expr')
+ man{'$srcdir/cmd/expr.1'}
+end)
file('bin/timeout', '755',
exe('timeout', {'cmd/timeout.c', 'libutils.a',
@@ -63,6 +65,14 @@ 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'}
+rule('m4', 'm4 $m4flags $in > $out')
+
+build('m4', '$outdir/getconf_vars.h', '$srcdir/lib/getconf_vars.m4')
+file('bin/getconf', '755',
+ link('getconf', objects({'cmd/getconf.c', 'libutils.a'}, '$outdir/getconf_vars.h', {cflags='-I $outdir/'}))
+)
+man{'$srcdir/cmd/getconf.1'}
+
local cmds = {
'arch',
'base64',
@@ -79,9 +89,8 @@ local cmds = {
'dirname',
'echo',
'env',
- -- 'expr',
+ -- 'expr', special
'false',
- -- 'getconf', // Try again in the release after 0.0.6
'head',
'id',
'install',
@@ -101,15 +110,15 @@ local cmds = {
'pathchk',
'printf',
'pwd',
- -- 'readlink',
+ -- 'readlink', special
'realpath',
'renice',
'rm',
'rmdir',
'seq',
- -- 'sha1sum',
- -- 'sha256sum',
- -- 'sha512sum',
+ -- 'sha1sum', special
+ -- 'sha256sum', special
+ -- 'sha512sum', special
'shuf',
'sleep',
'split',
@@ -118,22 +127,21 @@ local cmds = {
'tee',
'test',
'time',
- -- 'timeout',
+ -- 'timeout', special
'touch',
- -- 'tr',
+ -- 'tr', special
'true',
'truncate',
'tty',
'uname',
'uniq',
'unlink',
- -- 'uuencode',
+ -- 'uuencode', special
'wc',
'which',
'whoami',
'yes',
}
-rule('m4', 'm4 $m4flags $in > $out')
for _, cmd in ipairs(cmds) do
local src = cmd
local deps
diff --git a/pkg/utils-std/sha256 b/pkg/utils-std/sha256
@@ -1 +1 @@
-6acaa2e4d8d7e1c835d3f2585883246eb82d0b8ef332dbd09d60399ffa081173 utils-std-0.0.8.tar.gz
+ca61ac89aff57dee1dc519f30825cf7a8d9f9f87c523fa29d23b2daa02a06f6b utils-std-0.0.9.tar.gz
diff --git a/pkg/utils-std/url b/pkg/utils-std/url
@@ -1 +1 @@
-url = "https://distfiles.hacktivis.me/releases/utils-std/utils-std-0.0.8.tar.gz"
+url = "https://distfiles.hacktivis.me/releases/utils-std/utils-std-0.0.9.tar.gz"
diff --git a/pkg/utils-std/ver b/pkg/utils-std/ver
@@ -1 +1 @@
-0.0.7 r0
+0.0.9 r0
