Re: [PR PATCH] [Updated] lvm2: update to 2.03 series

[dkwo <dkwo@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 415 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages lvm2
https://github.com/void-linux/void-packages/pull/42363

lvm2: update to 2.03 series
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, (x86_64-musl)

A patch file from https://github.com/void-linux/void-packages/pull/42363.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lvm2-42363.patch --]
[-- Type: text/x-diff, Size: 15700 bytes --]

From b57d3d2b802a47f6fbf990cf5aea458580e46926 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 20 Feb 2023 11:32:51 -0500
Subject: [PATCH] lvm2: update to 2.03.22

---
 common/shlibs                                 |   5 +-
 srcpkgs/liblvm2app                            |   1 -
 srcpkgs/liblvm2app-devel                      |   1 -
 .../0001-lvresize-use-POSIX-shell.patch       | 125 ++++++++++++++++++
 srcpkgs/lvm2/patches/fix-stdio-usage.patch    |  34 +++--
 srcpkgs/lvm2/patches/newudev.patch            |  26 ++++
 srcpkgs/lvm2/patches/portability.patch        |  27 ----
 srcpkgs/lvm2/template                         |  47 ++-----
 srcpkgs/removed-packages/template             |   4 +-
 9 files changed, 191 insertions(+), 79 deletions(-)
 delete mode 120000 srcpkgs/liblvm2app
 delete mode 120000 srcpkgs/liblvm2app-devel
 create mode 100644 srcpkgs/lvm2/patches/0001-lvresize-use-POSIX-shell.patch
 create mode 100644 srcpkgs/lvm2/patches/newudev.patch
 delete mode 100644 srcpkgs/lvm2/patches/portability.patch

diff --git a/common/shlibs b/common/shlibs
index dc08c7989c039..1a721780f8545 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -235,8 +235,8 @@ libgnutlsxx.so.30 gnutls-3.7.4_1
 libgnutls-dane.so.0 gnutls-3.6.12_1
 libdevmapper.so.1.02 device-mapper-2.02.110_1
 libdevmapper-event.so.1.02 device-mapper-2.02.110_1
-libdevmapper-event-lvm2.so.2.02 device-mapper-2.02.110_1
-liblvm2cmd.so.2.02 device-mapper-2.02.54_1
+libdevmapper-event-lvm2.so.2.03 device-mapper-2.03.18_1
+liblvm2cmd.so.2.03 device-mapper-2.03.18_1
 libprop.so.0 proplib-0.1_1
 libfontenc.so.1 libfontenc-1.0.4_1
 libx86.so.1 libx86-1.1_1
@@ -664,7 +664,6 @@ libboost_python312.so.1.83.0 boost-python3-1.83.0_1
 libexempi.so.8 exempi-2.5.0_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2-1.45.so.2 libsgutils-1.45_1
-liblvm2app.so.2.2 liblvm2app-2.02.54_1
 libcpufreq.so.0 libcpufreq-007_1
 libcpuid.so.16 libcpuid-0.6.2_1
 libgucharmap_2_90.so.7 gucharmap-3.0.0_1
diff --git a/srcpkgs/liblvm2app b/srcpkgs/liblvm2app
deleted file mode 120000
index 90f3860e82cef..0000000000000
--- a/srcpkgs/liblvm2app
+++ /dev/null
@@ -1 +0,0 @@
-lvm2
\ No newline at end of file
diff --git a/srcpkgs/liblvm2app-devel b/srcpkgs/liblvm2app-devel
deleted file mode 120000
index 90f3860e82cef..0000000000000
--- a/srcpkgs/liblvm2app-devel
+++ /dev/null
@@ -1 +0,0 @@
-lvm2
\ No newline at end of file
diff --git a/srcpkgs/lvm2/patches/0001-lvresize-use-POSIX-shell.patch b/srcpkgs/lvm2/patches/0001-lvresize-use-POSIX-shell.patch
new file mode 100644
index 0000000000000..bac27ea1d9cf6
--- /dev/null
+++ b/srcpkgs/lvm2/patches/0001-lvresize-use-POSIX-shell.patch
@@ -0,0 +1,125 @@
+From 50fe324ff953eedd210054ffc21715d22134b3c1 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 16 Nov 2022 11:55:34 +0100
+Subject: [PATCH] lvresize: use POSIX shell
+
+---
+ 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/srcpkgs/lvm2/patches/fix-stdio-usage.patch b/srcpkgs/lvm2/patches/fix-stdio-usage.patch
index c4809186112cf..9162f08cfe360 100644
--- a/srcpkgs/lvm2/patches/fix-stdio-usage.patch
+++ b/srcpkgs/lvm2/patches/fix-stdio-usage.patch
@@ -1,8 +1,18 @@
-diff --git lib/commands/toolcontext.c lib/commands/toolcontext.c
-index 95fb343..5baea40 100644
+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
 --- a/lib/commands/toolcontext.c
 +++ b/lib/commands/toolcontext.c
-@@ -1869,7 +1869,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
+@@ -1667,7 +1667,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
  	/* FIXME Make this configurable? */
  	reset_lvm_errno(1);
  
@@ -11,20 +21,20 @@ index 95fb343..5baea40 100644
  	/* Set in/out stream buffering before glibc */
  	if (set_buffering
  #ifdef SYS_gettid
-@@ -2274,7 +2274,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
+@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
+ 		dm_hash_destroy(cmd->cft_def_hash);
  
- 	if (cmd->pending_delete_mem)
- 		dm_pool_destroy(cmd->pending_delete_mem);
+ 	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 tools/lvmcmdline.c tools/lvmcmdline.c
-index 0840c65..9503922 100644
+diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
+index a5bb6a5c5..0ebfa375c 100644
 --- a/tools/lvmcmdline.c
 +++ b/tools/lvmcmdline.c
-@@ -3109,7 +3109,7 @@ static int _check_standard_fds(void)
+@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void)
  	int err = is_valid_fd(STDERR_FILENO);
  
  	if (!is_valid_fd(STDIN_FILENO) &&
@@ -33,7 +43,7 @@ index 0840c65..9503922 100644
  		if (err)
  			perror("stdin stream open");
  		else
-@@ -3119,7 +3119,7 @@ static int _check_standard_fds(void)
+@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDOUT_FILENO) &&
@@ -42,7 +52,7 @@ index 0840c65..9503922 100644
  		if (err)
  			perror("stdout stream open");
  		/* else no stdout */
-@@ -3127,7 +3127,7 @@ static int _check_standard_fds(void)
+@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDERR_FILENO) &&
@@ -51,3 +61,5 @@ index 0840c65..9503922 100644
  		printf("stderr stream open: %s\n",
  		       strerror(errno));
  		return 0;
+-- 
+2.38.1
diff --git a/srcpkgs/lvm2/patches/newudev.patch b/srcpkgs/lvm2/patches/newudev.patch
new file mode 100644
index 0000000000000..df15ced5c20e4
--- /dev/null
+++ b/srcpkgs/lvm2/patches/newudev.patch
@@ -0,0 +1,26 @@
+commit 9f9924cab244b2065ebf6de869f434cc1f336469
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Nov 16 12:26:51 2022 +0100
+
+    support new udev activation without systemd
+    
+    Debian import: https://salsa.debian.org/lvm-team/lvm2/-/commit/2340adad4b3875331be1ba7abba881cc1b6e6738
+
+diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in
+index 14e7dd2..b32b94a 100644
+--- a/udev/69-dm-lvm.rules.in
++++ b/udev/69-dm-lvm.rules.in
+@@ -76,8 +76,14 @@ LABEL="lvm_scan"
+ # it's better suited to appearing in the journal.
+ 
+ IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}"
++TEST!="/run/systemd/system", GOTO="lvm_direct_vgchange"
++
+ ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
+ GOTO="lvm_end"
+ 
++LABEL="lvm_direct_vgchange"
++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
++GOTO="lvm_end"
++
+ LABEL="lvm_end"
diff --git a/srcpkgs/lvm2/patches/portability.patch b/srcpkgs/lvm2/patches/portability.patch
deleted file mode 100644
index dcc1399517178..0000000000000
--- a/srcpkgs/lvm2/patches/portability.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Portability fixes:
-
-- Use fcntl.h for O_RDONLY and friends.
-- Only use mallinfo with glibc.
-
---- a/libdaemon/server/daemon-server.c      2014-11-29 00:07:42.000000000 +0100
-+++ b/libdaemon/server/daemon-server.c      2014-12-28 08:22:40.985928408 +0100
-@@ -14,6 +14,7 @@
- #include "daemon-server.h"
- #include "daemon-log.h"
- 
-+#include <fcntl.h>
- #include <dlfcn.h>
- #include <errno.h>
- #include <pthread.h>
-
---- a/lib/mm/memlock.c	2016-06-07 08:00:46.557058318 +0200
-+++ b/lib/mm/memlock.c	2016-06-07 08:01:25.453505793 +0200
-@@ -150,7 +150,7 @@ static void _touch_memory(void *mem, siz
- 
- static void _allocate_memory(void)
- {
--#ifndef VALGRIND_POOL
-+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- 	void *stack_mem;
- 	struct rlimit limit;
- 	int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index 28d973a4cc5a2..4e3fca5a6e029 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -1,24 +1,25 @@
 # Template file for 'lvm2'
 pkgname=lvm2
-version=2.02.188
+version=2.03.22
 revision=1
 build_style=gnu-configure
 configure_args="--disable-selinux --enable-readline --enable-pkgconfig
- --enable-fsadm --enable-applib --enable-dmeventd --enable-cmdlib
- --enable-udev_sync --enable-udev_rules --enable-lvmetad
+ --enable-fsadm --enable-dmeventd --enable-cmdlib
+ --enable-udev_sync --enable-udev_rules --without-systemd-run
  --with-udevdir=/usr/lib/udev/rules.d --with-default-pid-dir=/run
  --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm
  --with-default-locking-dir=/run/lock/lvm"
 hostmakedepends="pkg-config"
-makedepends="eudev-libudev-devel libaio-devel libblkid-devel readline-devel"
+makedepends="eudev-libudev-devel libaio-devel libblkid-devel
+ readline-devel thin-provisioning-tools"
 depends="thin-provisioning-tools"
 short_desc="Logical Volume Manager 2 utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only, LGPL-2.1-only"
+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=7101e8b0816ad77e4390fed9749a090214ba520061cd083437871e19e50cc9bd
+checksum=4c5a6923bd1ace7ce04474608a84937ce053ba91b1ace9f0b0017268e732dc7c
 conf_files="/etc/lvm/*.conf /etc/lvm/profile/*"
 make_dirs="
  /etc/lvm/archive 0755 root root
@@ -28,25 +29,19 @@ case $XBPS_TARGET_MACHINE in
 	*-musl) configure_args+=" --enable-static_link";;
 esac
 
+pre_configure() {
+	sed -i 's|@BLKID_LIBS@|-lblkid -luuid|g' make.tmpl.in
+}
+
 do_check() {
 	# requires opening /dev/kmsg which requires root
 	:
 }
 
-pre_configure() {
-	sed -i 's|@BLKID_LIBS@|-lblkid -luuid|g' make.tmpl.in
-}
-
 post_install() {
-	sed -i 's,use_lvmetad = 1,use_lvmetad = 0,' ${DESTDIR}/etc/lvm/lvm.conf
-	case $XBPS_TARGET_MACHINE in
-		*-musl)
-			sed -i 's,use_mlockall = 0,use_mlockall = 1,' ${DESTDIR}/etc/lvm/lvm.conf
-		;;
-	esac
-	vsv lvmetad
 	vmkdir usr/bin
 	mv -f ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin/ || true
+	vlicense COPYING.BSD
 }
 
 device-mapper-devel_package() {
@@ -83,21 +78,3 @@ device-mapper_package() {
 		vsv dmeventd
 	}
 }
-
-liblvm2app-devel_package() {
-	depends="device-mapper-devel-${version}_${revision} libblkid-devel
-	 liblvm2app-${version}_${revision}"
-	short_desc="LVM2 application library - development files"
-	pkg_install() {
-		vmove usr/include/lvm2app.h
-		vmove "usr/lib/pkgconfig/lvm2app*"
-		vmove usr/lib/liblvm2app.so
-	}
-}
-
-liblvm2app_package() {
-	short_desc="LVM2 application library"
-	pkg_install() {
-		vmove "usr/lib/liblvm2app.so.*"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c25c5c3e720ea..e3af23ee31cb5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20231110
+version=0.1.20231114
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -345,6 +345,8 @@ replaces="
  libllvm8<=8.0.1_5
  libllvm9<=9.0.1_8
  liblrzip<=0.641_1
+ liblvm2app<=2.02.187
+ liblvm2app-devel<=2.02.187
  libmagick6-devel<=6.9.12.12_2
  libmagick6-perl<=6.9.12.12_2
  libmagick6<=6.9.12.12_2