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>
--- 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);
/* 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) {
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)
{
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;
}