lvm2: bumped to 2.03.15 (#1087)

community/lvm2/build

@@ -18,14 +18,13 @@ export MKDIR_P="install -d"
 # Bashism banished.
 export CONFIG_SHELL=/bin/sh
 
-# Always disable udev support since libudev-zero is broken. See below.
+# Disable udev support by default since libudev-zero doesn't support it.
 udev=disable
 
-# libudev-zero trips (correctly) the udev auto detection, but is broken with
-# lvm (see https://github.com/illiliti/libudev-zero/issues/4). As such, it's
-# commented out and always disabled. In order to turn it back on, uncomment the
-# line below.
-#pkg-config --exists libudev && udev=disable
+# libudev-zero trips (correctly) on the udev auto detection, but is broken with
+# LVM2 (see https://github.com/illiliti/libudev-zero/issues/4). In order to
+# turn it back on, uncomment the line below.
+#pkg-config --exists libudev && udev=enable
 
 ./configure \
     --prefix=/usr \

community/lvm2/checksums

@@ -1,2 +1,2 @@
-4a63bc8a084a8ae3c7bc5e6530cac264139d218575c64416c8b99e3fe039a05c
-36b598a65d24b18ae7b7657b37343788c96ae56cb9673a13a09423c031002b32
+935283a51ee17abd752a545a0ed1cf4edc993359265bc9e562edf81500edc99e
+c561e67681218c7ec592f2cab319cd87abf2ebe6397e600f0e1ad7ac9545a70b

community/lvm2/patches/fix-stdio-usage.patch

@@ -1,8 +1,6 @@
-diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
-index 479d499..7681a5b 100644
 --- a/lib/commands/toolcontext.c
 +++ b/lib/commands/toolcontext.c
-@@ -1599,7 +1599,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
+@@ -1673,7 +1673,7 @@
  	/* FIXME Make this configurable? */
  	reset_lvm_errno(1);
 
@@ -11,28 +9,37 @@ index 479d499..7681a5b 100644
  	/* Set in/out stream buffering before glibc */
  	if (set_buffering
  #ifdef SYS_gettid
-@@ -1980,7 +1980,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
+@@ -2053,7 +2053,7 @@
+ 		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) {
  		/* Reset stream buffering to defaults */
  		if (is_valid_fd(STDIN_FILENO) &&
-diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
-index 860e6de..c7539bd 100644
+--- a/lib/mm/memlock.c
++++ b/lib/mm/memlock.c
+@@ -160,7 +160,7 @@
+
+ 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;
 --- a/tools/lvmcmdline.c
 +++ b/tools/lvmcmdline.c
-@@ -3209,6 +3209,7 @@ int lvm_split(char *str, int *argc, char **argv, int max)
+@@ -3398,6 +3398,7 @@
  /* Make sure we have always valid filedescriptors 0,1,2 */
  static int _check_standard_fds(void)
  {
 +#ifdef __GLIBC__
  	int err = is_valid_fd(STDERR_FILENO);
 
  	if (!is_valid_fd(STDIN_FILENO) &&
-@@ -3236,6 +3237,12 @@ static int _check_standard_fds(void)
+@@ -3425,6 +3426,12 @@
  		return 0;
  	}
 
@@ -45,14 +52,3 @@ index 860e6de..c7539bd 100644
  	return 1;
  }
 
---- ./lib/mm/memlock.c.orig	2015-03-09 11:18:41.560028850 -0100
-+++ ./lib/mm/memlock.c	2015-03-09 11:19:54.504373309 -0100
-@@ -137,7 +137,7 @@
-
- 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;

community/lvm2/sources

@@ -1,2 +1,2 @@
-https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.2.03.14.tgz
+https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.2.03.15.tgz
 patches/fix-stdio-usage.patch

community/lvm2/version

@@ -1 +1 @@
-2.03.14 1
+2.03.15 1