@@ -1,4 +1,4 @@
-From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001
+From e2f24ea066e6dfb9f13f623009034acbf4ae8818 Mon Sep 17 00:00:00 2001
From: Dengke Du <dengke.du@windriver.com>
Date: Tue, 25 Oct 2016 11:49:40 +0000
Subject: [PATCH] implement libc specific reopen_stream
@@ -21,7 +21,7 @@ Upstream-Status: Pending
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/log/log.c b/lib/log/log.c
-index 7b88252f0..e1720098a 100644
+index eafb3ef1c..ff3d751bf 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
@@ -45,10 +45,10 @@ index 7b88252f0..e1720098a 100644
void init_log_fn(lvm2_log_fn_t log_fn)
{
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
-index 3fd23a521..c2ee39905 100644
+index 1b2f7f47c..e0674d42d 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
-@@ -3380,7 +3380,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) &&
@@ -57,7 +57,7 @@ index 3fd23a521..c2ee39905 100644
if (err)
perror("stdin stream open");
else
-@@ -3390,7 +3390,7 @@ static int _check_standard_fds(void)
+@@ -3388,7 +3388,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDOUT_FILENO) &&
@@ -66,7 +66,7 @@ index 3fd23a521..c2ee39905 100644
if (err)
perror("stdout stream open");
/* else no stdout */
-@@ -3398,7 +3398,7 @@ static int _check_standard_fds(void)
+@@ -3396,7 +3396,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDERR_FILENO) &&
@@ -1,4 +1,4 @@
-From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001
+From 4e2dc175e99792d84873a4785ff1524845267c3e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 25 Mar 2024 13:07:28 -0700
Subject: [PATCH] include libgen.h for basename
@@ -16,12 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+)
diff --git a/lib/device/device_id.c b/lib/device/device_id.c
-index 2b183810a..53467cbbb 100644
+index b3330f2ba..291bd5c73 100644
--- a/lib/device/device_id.c
+++ b/lib/device/device_id.c
-@@ -26,6 +26,7 @@
- #include "lib/datastruct/str_list.h"
- #include "lib/metadata/metadata-exported.h"
+@@ -28,6 +28,7 @@
+ #include "lib/activate/activate.h"
+ #include "device_mapper/misc/dm-ioctl.h"
+#include <libgen.h>
#include <sys/stat.h>
@@ -19,9 +19,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
file://0001-include-libgen.h-for-basename.patch \
"
-SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f"
+SRCREV = "0eef5ab6e14a45e6d2eacbc0bb744dbb33c16a7a"
S = "${WORKDIR}/git"
-PV = "2.03.24"
+PV = "2.03.25"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"