commit: 633d873ff94adf03747e2bb13f4e069c911ad7a5
parent f70e6f9f111f3ee503dfeb489dbae3ed985c0533
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Fri, 16 May 2025 05:24:51 +0200
lanodan/utils-std*: upgrade to 0.0.4
Diffstat:
6 files changed, 4 insertions(+), 176 deletions(-)
diff --git a/lanodan/utils-std-static/APKBUILD b/lanodan/utils-std-static/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Haelwenn (lanodan) Monnier <contact+alpine@hacktivis.me>
pkgname=utils-std-static
tarname=utils-std
-pkgver=0.0.3
+pkgver=0.0.4
pkgrel=0
pkgdesc="Collection of commonly available Unix tools"
url="https://hacktivis.me/projects/utils-std"
@@ -12,8 +12,6 @@ checkdepends=""
subpackages="$pkgname-dbg $pkgname-doc $pkgname-strings $pkgname-strings-doc:strings_doc $pkgname-getconf $pkgname-getconf-doc:getconf_doc"
source="
https://distfiles.hacktivis.me/releases/utils-std/$tarname-$pkgver.tar.gz
- utils-std-0.0.3-getconf_terminating_null_byte.patch
- utils-std-0.0.3-getconf_use_correct_structs.patch
"
builddir="$srcdir/$tarname-$pkgver"
@@ -98,7 +96,5 @@ getconf_doc() {
}
sha512sums="
-a77a3532cec2d04b667906cc25a20cf9fef0eae92e0ab6cc292c0de37158c5e24cc7a0f0ff0b4a0fce348e5b2e4780d2d5d538fa4802930459f1fe7fc0945878 utils-std-0.0.3.tar.gz
-436ba03025e16fd870fc7c9da4933e76fc2d786a4c8350743d3e2e6f08cf24356994380d00ff287822b7365b26702c98ed22ce379986116257c139fda5f1c18d utils-std-0.0.3-getconf_terminating_null_byte.patch
-ef4901fd05acb9be08152c53dd6cd6f33460b597968638519d198729c13e2c02859b879ec9ef322456a39cd3e460588ed97c435e39286d418327c3278d09a8fd utils-std-0.0.3-getconf_use_correct_structs.patch
+4b40052dc47117ebe9d80daaef490dc910bac6d4f3a812acc96d6e83dee63b2d84ad07c2945809d068002283f140c612c4f64eaefedf379b097b51ef522a9758 utils-std-0.0.4.tar.gz
"
diff --git a/lanodan/utils-std-static/utils-std-0.0.3-getconf_terminating_null_byte.patch b/lanodan/utils-std-static/utils-std-0.0.3-getconf_terminating_null_byte.patch
@@ -1,37 +0,0 @@
-From 5d7fc0ed50c184dc6a9ced8e9d36cc931b5eb5ac Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Mon, 14 Apr 2025 01:36:33 +0200
-Subject: [PATCH 1/2] cmd/getconf: don't write the terminating null byte from
- confstr()
-
-Also use the return value of the second call to confstr()
-as length in case the buffer didn't entirely get filled.
----
- cmd/getconf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmd/getconf.c b/cmd/getconf.c
-index a98b7ba..3baed4d 100644
---- a/cmd/getconf.c
-+++ b/cmd/getconf.c
-@@ -77,7 +77,7 @@ print_system_var(const char *var)
- return 0;
- }
-
-- fwrite(buf, buflen, 1, stdout);
-+ fwrite(buf, (ret - 1), 1, stdout);
- free(buf);
- return 0;
- }
-@@ -250,7 +250,7 @@ main(int argc, char *argv[])
- }
-
- printf("%s: ", confstr_vars[i].name);
-- fwrite(buf, buflen_ret, 1, stdout);
-+ fwrite(buf, (ret - 1), 1, stdout);
- printf("\n");
- }
-
---
-2.49.0
-
diff --git a/lanodan/utils-std-static/utils-std-0.0.3-getconf_use_correct_structs.patch b/lanodan/utils-std-static/utils-std-0.0.3-getconf_use_correct_structs.patch
@@ -1,45 +0,0 @@
-From c9e9194dd4ed1796f28c594bf27f75fbe7d1e9ea Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Mon, 14 Apr 2025 01:55:41 +0200
-Subject: [PATCH] cmd/getconf: use the correct structs in -a loops
-
----
- cmd/getconf.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/cmd/getconf.c b/cmd/getconf.c
-index 3baed4d..ebad913 100644
---- a/cmd/getconf.c
-+++ b/cmd/getconf.c
-@@ -174,7 +174,7 @@ main(int argc, char *argv[])
- strerror(errno));
- return 1;
- }
-- if(ret == -1) ret = sysconf_vars[i].limit_h;
-+ if(ret == -1) ret = pathconf_vars[i].limit_h;
-
- printf("%ld\n", ret);
- return 0;
-@@ -264,8 +264,8 @@ main(int argc, char *argv[])
- {
- fprintf(stderr,
- "getconf: error: sysconf(%d /* \"%s\" */): %s\n",
-- confstr_vars[i].value,
-- confstr_vars[i].name,
-+ sysconf_vars[i].value,
-+ sysconf_vars[i].name,
- strerror(errno));
- err = 1;
- continue;
-@@ -311,7 +311,7 @@ main(int argc, char *argv[])
- err = 1;
- continue;
- }
-- if(ret == -1) ret = sysconf_vars[i].limit_h;
-+ if(ret == -1) ret = pathconf_vars[i].limit_h;
-
- printf("%s: %ld\n", pathconf_vars[i].name, ret);
- }
---
-2.49.0
-
diff --git a/lanodan/utils-std/APKBUILD b/lanodan/utils-std/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Haelwenn (lanodan) Monnier <contact+alpine@hacktivis.me>
pkgname=utils-std
-pkgver=0.0.3
+pkgver=0.0.4
pkgrel=0
pkgdesc="Collection of commonly available Unix tools"
url="https://hacktivis.me/projects/utils-std"
@@ -11,8 +11,6 @@ checkdepends=""
subpackages="$pkgname-dbg $pkgname-doc $pkgname-strings $pkgname-strings-doc:strings_doc $pkgname-getconf $pkgname-getconf-doc:getconf_doc"
source="
https://distfiles.hacktivis.me/releases/utils-std/$pkgname-$pkgver.tar.gz
- utils-std-0.0.3-getconf_terminating_null_byte.patch
- utils-std-0.0.3-getconf_use_correct_structs.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -97,7 +95,5 @@ getconf_doc() {
}
sha512sums="
-a77a3532cec2d04b667906cc25a20cf9fef0eae92e0ab6cc292c0de37158c5e24cc7a0f0ff0b4a0fce348e5b2e4780d2d5d538fa4802930459f1fe7fc0945878 utils-std-0.0.3.tar.gz
-436ba03025e16fd870fc7c9da4933e76fc2d786a4c8350743d3e2e6f08cf24356994380d00ff287822b7365b26702c98ed22ce379986116257c139fda5f1c18d utils-std-0.0.3-getconf_terminating_null_byte.patch
-ef4901fd05acb9be08152c53dd6cd6f33460b597968638519d198729c13e2c02859b879ec9ef322456a39cd3e460588ed97c435e39286d418327c3278d09a8fd utils-std-0.0.3-getconf_use_correct_structs.patch
+4b40052dc47117ebe9d80daaef490dc910bac6d4f3a812acc96d6e83dee63b2d84ad07c2945809d068002283f140c612c4f64eaefedf379b097b51ef522a9758 utils-std-0.0.4.tar.gz
"
diff --git a/lanodan/utils-std/utils-std-0.0.3-getconf_terminating_null_byte.patch b/lanodan/utils-std/utils-std-0.0.3-getconf_terminating_null_byte.patch
@@ -1,37 +0,0 @@
-From 5d7fc0ed50c184dc6a9ced8e9d36cc931b5eb5ac Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Mon, 14 Apr 2025 01:36:33 +0200
-Subject: [PATCH 1/2] cmd/getconf: don't write the terminating null byte from
- confstr()
-
-Also use the return value of the second call to confstr()
-as length in case the buffer didn't entirely get filled.
----
- cmd/getconf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmd/getconf.c b/cmd/getconf.c
-index a98b7ba..3baed4d 100644
---- a/cmd/getconf.c
-+++ b/cmd/getconf.c
-@@ -77,7 +77,7 @@ print_system_var(const char *var)
- return 0;
- }
-
-- fwrite(buf, buflen, 1, stdout);
-+ fwrite(buf, (ret - 1), 1, stdout);
- free(buf);
- return 0;
- }
-@@ -250,7 +250,7 @@ main(int argc, char *argv[])
- }
-
- printf("%s: ", confstr_vars[i].name);
-- fwrite(buf, buflen_ret, 1, stdout);
-+ fwrite(buf, (ret - 1), 1, stdout);
- printf("\n");
- }
-
---
-2.49.0
-
diff --git a/lanodan/utils-std/utils-std-0.0.3-getconf_use_correct_structs.patch b/lanodan/utils-std/utils-std-0.0.3-getconf_use_correct_structs.patch
@@ -1,45 +0,0 @@
-From c9e9194dd4ed1796f28c594bf27f75fbe7d1e9ea Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Mon, 14 Apr 2025 01:55:41 +0200
-Subject: [PATCH] cmd/getconf: use the correct structs in -a loops
-
----
- cmd/getconf.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/cmd/getconf.c b/cmd/getconf.c
-index 3baed4d..ebad913 100644
---- a/cmd/getconf.c
-+++ b/cmd/getconf.c
-@@ -174,7 +174,7 @@ main(int argc, char *argv[])
- strerror(errno));
- return 1;
- }
-- if(ret == -1) ret = sysconf_vars[i].limit_h;
-+ if(ret == -1) ret = pathconf_vars[i].limit_h;
-
- printf("%ld\n", ret);
- return 0;
-@@ -264,8 +264,8 @@ main(int argc, char *argv[])
- {
- fprintf(stderr,
- "getconf: error: sysconf(%d /* \"%s\" */): %s\n",
-- confstr_vars[i].value,
-- confstr_vars[i].name,
-+ sysconf_vars[i].value,
-+ sysconf_vars[i].name,
- strerror(errno));
- err = 1;
- continue;
-@@ -311,7 +311,7 @@ main(int argc, char *argv[])
- err = 1;
- continue;
- }
-- if(ret == -1) ret = sysconf_vars[i].limit_h;
-+ if(ret == -1) ret = pathconf_vars[i].limit_h;
-
- printf("%s: %ld\n", pathconf_vars[i].name, ret);
- }
---
-2.49.0
-
