lvm2: update to 2.03.29.

This commit is contained in:
classabbyamp 2024-12-19 11:58:31 -05:00 committed by classabbyamp
parent 81908f0875
commit 29efc13125
2 changed files with 31 additions and 29 deletions

View File

@ -1,40 +1,44 @@
From 63b1c7332bee6080bffecf9ce9d75ff15d799166 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 16 Nov 2022 10:42:39 +0100
Subject: [PATCH] fix stdio usage
---
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
index 60739af..8b3fdf7 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? */
@@ -1661,6 +1661,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
reset_lvm_errno(1);
-#ifndef VALGRIND_POOL
+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
/* Set in/out stream buffering before glibc */
+#ifdef __GLIBC__
if (set_buffering
&& !cmd->running_on_valgrind /* Skipping within valgrind execution. */
#ifdef SYS_gettid
@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
@@ -1704,6 +1705,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
} else if (!set_buffering)
/* Without buffering, must not use stdin/stdout */
init_silent(1);
+#endif
/*
* Environment variable LVM_SYSTEM_DIR overrides this below.
@@ -2038,6 +2040,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
if (cmd->cft_def_hash)
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) {
+#ifdef __GLIBC__
if (!cmd->running_on_valgrind && cmd->linebuffer) {
int flags;
/* Reset stream buffering to defaults */
if (is_valid_fd(STDIN_FILENO) &&
@@ -2061,6 +2064,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
free(cmd->linebuffer);
}
+#endif
destroy_config_context(cmd);
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index a5bb6a5c5..0ebfa375c 100644
index 7209ebd..778c8c0 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void)
@@ -3378,7 +3378,7 @@ static int _check_standard_fds(void)
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
@ -43,7 +47,7 @@ index a5bb6a5c5..0ebfa375c 100644
if (err)
perror("stdin stream open");
else
@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void)
@@ -3388,7 +3388,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDOUT_FILENO) &&
@ -52,7 +56,7 @@ index a5bb6a5c5..0ebfa375c 100644
if (err)
perror("stdout stream open");
/* else no stdout */
@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void)
@@ -3396,7 +3396,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDERR_FILENO) &&
@ -61,5 +65,3 @@ index a5bb6a5c5..0ebfa375c 100644
printf("stderr stream open: %s\n",
strerror(errno));
return 0;
--
2.38.1

View File

@ -1,6 +1,6 @@
# Template file for 'lvm2'
pkgname=lvm2
version=2.03.23
version=2.03.29
revision=1
build_style=gnu-configure
configure_args="--disable-selinux --enable-readline --enable-pkgconfig
@ -19,7 +19,7 @@ license="GPL-2.0-only, LGPL-2.1-only, BSD-2-Clause"
homepage="https://sourceware.org/lvm2/"
changelog="https://abi-laboratory.pro/?view=changelog&l=lvm2&v=${version}"
distfiles="https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${version}.tgz"
checksum=74e794a9e9dee1bcf8a2065f65b9196c44fdf321e22d63b98ed7de8c9aa17a5d
checksum=30c53776cb4ddf6bf9eca29d0c28dbf9c5ac170c09154321213b11c3dbb5be9c
conf_files="/etc/lvm/*.conf /etc/lvm/profile/*"
make_dirs="
/etc/lvm/archive 0755 root root