From: Daniel Golle <daniel@makrotopia.org>
Date: Fri, 18 Mar 2022 18:49:33 +0000 (+0000)
Subject: lvm2: update to 2.03.15
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=63408123dfb4eaaccd0e5c1ba02a300779e629f5;p=feed%2Fpackages.git

lvm2: update to 2.03.15

Version 2.03.15 - 07th February 2022
====================================
  Remove service based autoactivation. global/event_activation = 0 is NOOP.
  Improve support for metadata profiles for --type writecache.
  Use cache or active DM device when available with new kernels.
  Introduce function to utilize UUIDs from DM_DEVICE_LIST.
  Increase some hash table size to better support large device sets.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile
index af35899909..7fc09fa48e 100644
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=LVM2
-PKG_VERSION:=2.03.14
+PKG_VERSION:=2.03.15
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=https://sourceware.org/pub/lvm2
-PKG_HASH:=4a63bc8a084a8ae3c7bc5e6530cac264139d218575c64416c8b99e3fe039a05c
+PKG_HASH:=935283a51ee17abd752a545a0ed1cf4edc993359265bc9e562edf81500edc99e
 PKG_BUILD_DIR:=$(BUILD_DIR)/lvm2-$(BUILD_VARIANT)/$(PKG_NAME).$(PKG_VERSION)
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
diff --git a/utils/lvm2/patches/002-const-stdio.patch b/utils/lvm2/patches/002-const-stdio.patch
index 0bd2a9cf8d..070e83498f 100644
--- a/utils/lvm2/patches/002-const-stdio.patch
+++ b/utils/lvm2/patches/002-const-stdio.patch
@@ -1,6 +1,6 @@
 --- a/lib/commands/toolcontext.c
 +++ b/lib/commands/toolcontext.c
-@@ -1677,7 +1677,7 @@ struct cmd_context *create_toolcontext(u
+@@ -1673,7 +1673,7 @@ struct cmd_context *create_toolcontext(u
  	/* FIXME Make this configurable? */
  	reset_lvm_errno(1);
  
@@ -9,10 +9,10 @@
  	/* Set in/out stream buffering before glibc */
  	if (set_buffering
  #ifdef SYS_gettid
-@@ -2064,7 +2064,7 @@ void destroy_toolcontext(struct cmd_cont
+@@ -2053,7 +2053,7 @@ void destroy_toolcontext(struct cmd_cont
+ 		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(__GLIBC__) && !defined(VALGRIND_POOL)
  	if (cmd->linebuffer) {
@@ -20,7 +20,7 @@
  		if (is_valid_fd(STDIN_FILENO) &&
 --- a/tools/lvmcmdline.c
 +++ b/tools/lvmcmdline.c
-@@ -3381,6 +3381,7 @@ int lvm_split(char *str, int *argc, char
+@@ -3398,6 +3398,7 @@ int lvm_split(char *str, int *argc, char
  /* Make sure we have always valid filedescriptors 0,1,2 */
  static int _check_standard_fds(void)
  {
@@ -28,7 +28,7 @@
  	int err = is_valid_fd(STDERR_FILENO);
  
  	if (!is_valid_fd(STDIN_FILENO) &&
-@@ -3407,6 +3408,12 @@ static int _check_standard_fds(void)
+@@ -3424,6 +3425,12 @@ static int _check_standard_fds(void)
  		       strerror(errno));
  		return 0;
  	}