sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (0534562007c3c5b1afea92340e99028f19e294cb)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0534562007c3c5b1afea92340e99028f19e294cb)
Date: Thu, 13 Apr 2023 20:14:32 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

disk/lvm/DETAILS | 3
disk/lvm/HISTORY | 6
disk/lvm/PRE_BUILD | 3
disk/lvm/patches/0001-fix-stdio-usage.patch | 69 ++++++++++
disk/lvm/patches/0001-lvresize-use-POSIX-shell.patch | 127
+++++++++++++++++++
shell-term-fm/busybox/DETAILS | 2
shell-term-fm/toybox/DETAILS | 1
7 files changed, 207 insertions(+), 4 deletions(-)

New commits:
commit 0534562007c3c5b1afea92340e99028f19e294cb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lvm: Add Watch line

commit 6c042f6714b67bfdd981c3665c74871d8a7d52ab
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lvm: Remove dependency on bash

commit b549dfc97a03c59abddf64fd8f17cb74d91a3ae7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lvm: Fix build against musl

commit 324fa85ff6923223f9a997fa55bde99d7e4c7d0e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lvm 2.03.20

commit 3b194027acefb31e230e08973662dfad5908d78c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

toybox: Add Watch line

commit cd72c035dc80fb41547949560d6cca38a9f41474
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

busybox: Add Watch line

diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index f0706d7..311cef9 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,5 +1,6 @@
+# Watch: ftp://sourceware.org/pub/lvm2/ LVM2.([0-9.]+)[.]tgz
SPELL=lvm
- VERSION=2.03.18
+ VERSION=2.03.20
SOURCE=LVM2.$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 0428a59..2faa26f 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,9 @@
+2023-04-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.03.20
+ * PRE_BUILD, patches/0001-fix-stdio-usage.patch:
+ removed obsolete edit, and fixed build against musl
+ * patches/0001-lvresize-use-POSIX-shell.patch: removed dep on bash
+
2023-01-25 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: fix pkgconfig flag
* PRE_BUILD: fix build
diff --git a/disk/lvm/PRE_BUILD b/disk/lvm/PRE_BUILD
index 822a553..4604ffc 100755
--- a/disk/lvm/PRE_BUILD
+++ b/disk/lvm/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-# fix compile
-sed -i '/GNU_SYMVER/,/#endif/D' libdm/datastruct/bitset.c
+apply_patch_dir patches
diff --git a/disk/lvm/patches/0001-fix-stdio-usage.patch
b/disk/lvm/patches/0001-fix-stdio-usage.patch
new file mode 100644
index 0000000..a545909
--- /dev/null
+++ b/disk/lvm/patches/0001-fix-stdio-usage.patch
@@ -0,0 +1,69 @@
+From 63b1c7332bee6080bffecf9ce9d75ff15d799166 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa AT alpinelinux.org>
+Date: Wed, 16 Nov 2022 10:42:39 +0100
+Subject: [PATCH] fix stdio usage
+
+Origin: Alpine Linux
+Upstream-Status: Unknown
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ lib/commands/toolcontext.c | 4 ++--
+ tools/lvmcmdline.c | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
+index b630554a9..f20080d18 100644
+--- a/lib/commands/toolcontext.c
++++ b/lib/commands/toolcontext.c
+@@ -1667,7 +1667,7 @@ struct cmd_context *create_toolcontext(unsigned
is_clvmd,
+ /* FIXME Make this configurable? */
+ reset_lvm_errno(1);
+
+-#ifndef VALGRIND_POOL
++#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
+ /* Set in/out stream buffering before glibc */
+ if (set_buffering
+ #ifdef SYS_gettid
+@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
+ dm_hash_destroy(cmd->cft_def_hash);
+
+ dm_device_list_destroy(&cmd->cache_dm_devs);
+-#ifndef VALGRIND_POOL
++#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
+ if (cmd->linebuffer) {
+ /* Reset stream buffering to defaults */
+ if (is_valid_fd(STDIN_FILENO) &&
+diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
+index a5bb6a5c5..0ebfa375c 100644
+--- a/tools/lvmcmdline.c
++++ b/tools/lvmcmdline.c
+@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void)
+ int err = is_valid_fd(STDERR_FILENO);
+
+ if (!is_valid_fd(STDIN_FILENO) &&
+- !(stdin = fopen(_PATH_DEVNULL, "r"))) {
++ !freopen(_PATH_DEVNULL, "r", stdin)) {
+ if (err)
+ perror("stdin stream open");
+ else
+@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void)
+ }
+
+ if (!is_valid_fd(STDOUT_FILENO) &&
+- !(stdout = fopen(_PATH_DEVNULL, "w"))) {
++ !freopen(_PATH_DEVNULL, "w", stdout)) {
+ if (err)
+ perror("stdout stream open");
+ /* else no stdout */
+@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void)
+ }
+
+ if (!is_valid_fd(STDERR_FILENO) &&
+- !(stderr = fopen(_PATH_DEVNULL, "w"))) {
++ !freopen(_PATH_DEVNULL, "w", stderr)) {
+ printf("stderr stream open: %s\n",
+ strerror(errno));
+ return 0;
+--
+2.38.1
+
diff --git a/disk/lvm/patches/0001-lvresize-use-POSIX-shell.patch
b/disk/lvm/patches/0001-lvresize-use-POSIX-shell.patch
new file mode 100644
index 0000000..6c034cc0
--- /dev/null
+++ b/disk/lvm/patches/0001-lvresize-use-POSIX-shell.patch
@@ -0,0 +1,127 @@
+From 50fe324ff953eedd210054ffc21715d22134b3c1 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa AT alpinelinux.org>
+Date: Wed, 16 Nov 2022 11:55:34 +0100
+Subject: [PATCH] lvresize: use POSIX shell
+
+Origin: Alpine Linux
+Upstream-Status: Unknown
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ scripts/lvresize_fs_helper.sh | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/scripts/lvresize_fs_helper.sh b/scripts/lvresize_fs_helper.sh
+index 90b1a97..1c48a71 100755
+--- a/scripts/lvresize_fs_helper.sh
++++ b/scripts/lvresize_fs_helper.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright (C) 2022 Red Hat, Inc. All rights reserved.
+ #
+@@ -69,7 +69,7 @@ fsextend() {
+ fi
+ fi
+
+- if [[ "$FSTYPE" == "ext"* ]]; then
++ if [ "${FSTYPE#ext}" != "$FSTYPE" ]; then
+ logmsg "resize2fs ${DEVPATH}"
+ if resize2fs "$DEVPATH"; then
+ logmsg "resize2fs done"
+@@ -77,7 +77,7 @@ fsextend() {
+ logmsg "resize2fs failed"
+ RESIZEFS_FAILED=1
+ fi
+- elif [[ "$FSTYPE" == "xfs" ]]; then
++ elif [ "$FSTYPE" = "xfs" ]; then
+ logmsg "xfs_growfs ${DEVPATH}"
+ if xfs_growfs "$DEVPATH"; then
+ logmsg "xfs_growfs done"
+@@ -102,7 +102,7 @@ fsextend() {
+
+ # If the fs was temporarily unmounted, now remount it.
+ # Not considered a command failure if this fails.
+- if [[ $DO_UNMOUNT -eq 1 && $REMOUNT -eq 1 ]]; then
++ if [ "$DO_UNMOUNT" -eq 1 ] && [ "$REMOUNT" -eq 1 ]; then
+ logmsg "remount ${DEVPATH} ${MOUNTDIR}"
+ if mount -t "$FSTYPE" "$DEVPATH" "$MOUNTDIR"; then
+ logmsg "remount done"
+@@ -151,7 +151,7 @@ fsreduce() {
+ fi
+ fi
+
+- if [[ "$FSTYPE" == "ext"* ]]; then
++ if [ "${FSTYPE#ext}" != "$FSTYPE" ]; then
+ NEWSIZEKB=$(( NEWSIZEBYTES / 1024 ))
+ logmsg "resize2fs ${DEVPATH} ${NEWSIZEKB}k"
+ if resize2fs "$DEVPATH" "$NEWSIZEKB"k; then
+@@ -194,7 +194,7 @@ fsreduce() {
+
+ # If the fs was temporarily unmounted, now remount it.
+ # Not considered a command failure if this fails.
+- if [[ $DO_UNMOUNT -eq 1 && $REMOUNT -eq 1 ]]; then
++ if [ "$DO_UNMOUNT" -eq 1 ] && [ "$REMOUNT" -eq 1 ]; then
+ logmsg "remount ${DEVPATH} ${MOUNTDIR}"
+ if mount -t "$FSTYPE" "$DEVPATH" "$MOUNTDIR"; then
+ logmsg "remount done"
+@@ -291,7 +291,7 @@ DO_FSCK=0
+ # mounted and the script unmounted it.
+ REMOUNT=0
+
+-if [ "$UID" != 0 ] && [ "$EUID" != 0 ]; then
++if [ "$(id -u)" != 0 ]; then
+ errorexit "${SCRIPTNAME} must be run as root."
+ fi
+
+@@ -372,11 +372,11 @@ done
+ #
+
+ # There are three top level commands: --fsextend, --fsreduce, --cryptresize.
+-if [[ "$DO_FSEXTEND" -eq 0 && "$DO_FSREDUCE" -eq 0 && "$DO_CRYPTRESIZE" -eq
0 ]]; then
++if [ "$DO_FSEXTEND" -eq 0 ] && [ "$DO_FSREDUCE" -eq 0 ] && [
"$DO_CRYPTRESIZE" -eq 0 ]; then
+ errorexit "Missing --fsextend|--fsreduce|--cryptresize."
+ fi
+
+-if [[ "$DO_FSEXTEND" -eq 1 || "$DO_FSREDUCE" -eq 1 ]]; then
++if [ "$DO_FSEXTEND" -eq 1 ] || [ "$DO_FSREDUCE" -eq 1 ]; then
+ case "$FSTYPE" in
+ ext[234]) ;;
+ "xfs") ;;
+@@ -388,7 +388,7 @@ if [[ "$DO_FSEXTEND" -eq 1 || "$DO_FSREDUCE" -eq 1 ]];
then
+ fi
+ fi
+
+-if [[ "$DO_CRYPTRESIZE" -eq 1 && -z "$CRYPTPATH" ]]; then
++if [ "$DO_CRYPTRESIZE" -eq 1 ] && [ -z "$CRYPTPATH" ]; then
+ errorexit "Missing required --cryptpath for --cryptresize."
+ fi
+
+@@ -406,15 +406,15 @@ if [ ! -e "$DEVPATH" ]; then
+ errorexit "Device does not exist \"$DEVPATH\"."
+ fi
+
+-if [[ "$DO_UNMOUNT" -eq 1 && -z "$MOUNTDIR" ]]; then
++if [ "$DO_UNMOUNT" -eq 1 ] && [ -z "$MOUNTDIR" ]; then
+ errorexit "Missing required --mountdir for --unmount."
+ fi
+
+-if [[ "$DO_FSREDUCE" -eq 1 && "$FSTYPE" == "xfs" ]]; then
++if [ "$DO_FSREDUCE" -eq 1 ] && [ "$FSTYPE" = "xfs" ]; then
+ errorexit "Cannot reduce xfs."
+ fi
+
+-if [[ "$DO_FSCK" -eq 1 && "$FSTYPE" == "xfs" ]]; then
++if [ "$DO_FSCK" -eq 1 ] && [ "$FSTYPE" = "xfs" ]; then
+ errorexit "Cannot use --fsck with xfs."
+ fi
+
+@@ -424,7 +424,7 @@ if [ "$DO_MOUNT" -eq 1 ]; then
+ errorexit "Failed to create temp dir."
+ fi
+ # In case the script terminates without doing cleanup
+- function finish {
++ finish() {
+ if [ "$TMP_MOUNT_DONE" -eq 1 ]; then
+ logmsg "exit unmount ${TMPDIR}"
+ umount "$TMPDIR"
diff --git a/shell-term-fm/busybox/DETAILS b/shell-term-fm/busybox/DETAILS
index d594d6e..4768ebf 100755
--- a/shell-term-fm/busybox/DETAILS
+++ b/shell-term-fm/busybox/DETAILS
@@ -1,7 +1,7 @@
+# Watch: https://www.busybox.net/
SPELL=busybox
VERSION=1.34.0
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=https://www.busybox.net/downloads/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/shell-term-fm/toybox/DETAILS b/shell-term-fm/toybox/DETAILS
index 43bec34..f29a3b8 100755
--- a/shell-term-fm/toybox/DETAILS
+++ b/shell-term-fm/toybox/DETAILS
@@ -1,3 +1,4 @@
+# Watch: http://www.landley.net/toybox/
SPELL=toybox
VERSION=0.8.8
SOURCE="$SPELL-$VERSION.tar.gz"

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (0534562007c3c5b1afea92340e99028f19e294cb), Ismael Luceno, 04/13/2023