system/lvm2: Update to 2.03.32

* Many memory leak fixes, some new features, some bugs squashed.
* Integrate my patch to make ./configure work on dash-binsh.

3 files changed, 58 insertions, 7 deletions

diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD
index 626c1da98..e624e1822 100644
--- a/system/lvm2/APKBUILD
+++ b/system/lvm2/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=lvm2
-pkgver=2.03.21
+pkgver=2.03.32
 pkgrel=0
 pkgdesc="Logical Volume Manager 2 utilities"
 url="https://sourceware.org/lvm2/"
@@ -16,6 +16,7 @@ makedepends_host="$depends_dev util-linux-dev"
 makedepends="$makedepends_build $makedepends_host"
 replaces="device-mapper $pkgname-dmeventd"
 source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz
+	bashism-configure.patch
 	fix-stdio-usage.patch
 	mlockall-default-config.patch
 	lvm.initd
@@ -86,8 +87,9 @@ udev() {
 }
 
 
-sha512sums="6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde  LVM2.2.03.21.tgz
-40e49bb34a9c07493ab6a9948e3ac1a85e22f069b69ad2a1369cb7d30a6ea6d72a27f380ad8951f55d939834e2f29c9da589ae475322ea41b4dfce72060b9557  fix-stdio-usage.patch
+sha512sums="6a7acebf10274b029211b0f5b7c7a9aabf2074a8e9ce1b72fce7eadffdaf2ebb23d9d998be41ff31a9e10808ece32ec2dde3454c82103c39084ac1beffe18ec1  LVM2.2.03.32.tgz
+0a16a8f42de0eafcfed994f06a7adb14097ee44937b184aea6e1526a0cfbaf27a03d4dacaa3f3f272fdb2e90fc036984a43c42271a7558b47e6b6f2e824a9e5a  bashism-configure.patch
+ab5eb15aff6be96fe91245749095da28ec4d1f51f039e0d36f29eecaed5596cf79ea4cda90401a9d6fa78453b5247707f6018e11fa544bfdfd5c0c4de20b028c  fix-stdio-usage.patch
 0f1feeddf35a7208a240b13d87f479eeb5410ccb534ccd62714355b10721c4eff77d725c72a2b5270320bef12828c32d60003f187db990fad3fef37ec08c1dff  mlockall-default-config.patch
 a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a  lvm.initd
 07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d  lvm.confd
diff --git a/system/lvm2/bashism-configure.patch b/system/lvm2/bashism-configure.patch
new file mode 100644
index 000000000..5c9f3258c
--- /dev/null
+++ b/system/lvm2/bashism-configure.patch
@@ -0,0 +1,49 @@
+Upstream-URL: https://gitlab.com/lvmteam/lvm2/-/merge_requests/29
+
+From b0b259e3571b5be49d912e56518c9af734f317d4 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Mon, 2 Jun 2025 04:08:08 +0000
+Subject: [PATCH] configure: Use portable string comparison
+
+= and == are equivalent in Bash for strings, but = is the only portable
+operator for compatibility with other shells.  Before this change,
+running ./configure with Dash as /bin/sh resulted in:
+
+./configure: 14558: test: yes: unexpected operator
+
+and the test did not work (i.e. --enable-cmdlib --disable-shared allowed
+a failed build to continue).  Now, the test works in Bash and Dash.
+---
+ configure    | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 342bd0047..75564a228 100755
+--- a/configure
++++ b/configure
+@@ -14564,7 +14564,7 @@ printf %s "checking whether to compile liblvm2cmd.so... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CMDLIB" >&5
+ printf "%s\n" "$CMDLIB" >&6; }
+ 
+-if test "$CMDLIB" == "yes" && test "$SHARED_LINK" = "no"
++if test "$CMDLIB" = "yes" && test "$SHARED_LINK" = "no"
+ then :
+   as_fn_error $? "--enable-cmdlib requires dynamic linking." "$LINENO" 5
+ fi
+diff --git a/configure.ac b/configure.ac
+index 6fcf6f2b5..470057be4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1395,7 +1395,7 @@ AS_IF([test "$CMDLIB" != "yes"], [CMDLIB="no" LVM2CMD_LIB=], [LVM2CMD_LIB="-llvm
+ AC_MSG_CHECKING([whether to compile liblvm2cmd.so])
+ AC_MSG_RESULT([$CMDLIB])
+ 
+-AS_IF([test "$CMDLIB" == "yes" && test "$SHARED_LINK" = "no"],
++AS_IF([test "$CMDLIB" = "yes" && test "$SHARED_LINK" = "no"],
+       [AC_MSG_ERROR([--enable-cmdlib requires dynamic linking.])])
+ 
+ 
+-- 
+2.40.0
+
diff --git a/system/lvm2/fix-stdio-usage.patch b/system/lvm2/fix-stdio-usage.patch
index 2b3f0a91f..5a66665ea 100644
--- a/system/lvm2/fix-stdio-usage.patch
+++ b/system/lvm2/fix-stdio-usage.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr}
 +++ b/lib/log/log.c
 @@ -208,7 +208,11 @@ int reopen_standard_stream(FILE **stream, const char *mode)
  
- 	_check_and_replace_standard_log_streams(old_stream, new_stream);
+ 	_check_and_replace_standard_log_streams(*stream, new_stream);
  
 +#ifdef __GLIBC__
  	*stream = new_stream;
@@ -22,7 +22,7 @@ Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr}
  
 --- a/tools/lvmcmdline.c
 +++ b/tools/lvmcmdline.c
-@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void)
+@@ -3407,7 +3407,7 @@ static int _check_standard_fds(void)
  	int err = is_valid_fd(STDERR_FILENO);
  
  	if (!is_valid_fd(STDIN_FILENO) &&
@@ -31,7 +31,7 @@ Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr}
  		if (err)
  			perror("stdin stream open");
  		else
-@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void)
+@@ -3417,7 +3417,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDOUT_FILENO) &&
@@ -40,7 +40,7 @@ Subject: [PATCH] Use `freopen()` on {stdin,stdout,stderr}
  		if (err)
  			perror("stdout stream open");
  		/* else no stdout */
-@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void)
+@@ -3425,7 +3425,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDERR_FILENO) &&