From 98f3712082e421fd95eb7f58c6b358e95355c3f2 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 3 Mar 2020 01:00:16 +0100
Subject: [PATCH] lvm2: update to 2.02.186.

---
 srcpkgs/lvm2/patches/fix-stdio-usage.patch | 50 ++++++++++++----------
 srcpkgs/lvm2/template                      |  4 +-
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/lvm2/patches/fix-stdio-usage.patch b/srcpkgs/lvm2/patches/fix-stdio-usage.patch
index aa501c35164..9238c3a0d43 100644
--- a/srcpkgs/lvm2/patches/fix-stdio-usage.patch
+++ b/srcpkgs/lvm2/patches/fix-stdio-usage.patch
@@ -1,6 +1,30 @@
+diff --git lib/commands/toolcontext.c lib/commands/toolcontext.c
+index 95fb343..5baea40 100644
+--- lib/commands/toolcontext.c
++++ lib/commands/toolcontext.c
+@@ -1869,7 +1869,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
+ 	/* FIXME Make this configurable? */
+ 	reset_lvm_errno(1);
+ 
+-#ifndef VALGRIND_POOL
++#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
+ 	/* Set in/out stream buffering before glibc */
+ 	if (set_buffering
+ #ifdef SYS_gettid
+@@ -2274,7 +2274,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
+ 
+ 	if (cmd->pending_delete_mem)
+ 		dm_pool_destroy(cmd->pending_delete_mem);
+-#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
 --- tools/lvmcmdline.c
 +++ tools/lvmcmdline.c
-@@ -1252,7 +1252,7 @@
+@@ -3109,7 +3109,7 @@ static int _check_standard_fds(void)
  	int err = is_valid_fd(STDERR_FILENO);
  
  	if (!is_valid_fd(STDIN_FILENO) &&
@@ -9,7 +33,7 @@
  		if (err)
  			perror("stdin stream open");
  		else
-@@ -1262,7 +1262,7 @@
+@@ -3119,7 +3119,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDOUT_FILENO) &&
@@ -18,7 +42,7 @@
  		if (err)
  			perror("stdout stream open");
  		/* else no stdout */
-@@ -1270,7 +1270,7 @@
+@@ -3127,7 +3127,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDERR_FILENO) &&
@@ -27,23 +51,3 @@
  		printf("stderr stream open: %s\n",
  		       strerror(errno));
  		return 0;
---- lib/commands/toolcontext.c.orig
-+++ lib/commands/toolcontext.c
-@@ -1860,7 +1860,7 @@
- 	/* FIXME Make this configurable? */
- 	reset_lvm_errno(1);
- 
--#ifndef VALGRIND_POOL
-+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- 	/* Set in/out stream buffering before glibc */
- 	if (set_buffering) {
- 		/* Allocate 2 buffers */
-@@ -2241,7 +2241,7 @@
- 	if (cmd->libmem)
- 		dm_pool_destroy(cmd->libmem);
- 
--#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 a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index e7d8994a535..48ce82aeb45 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -1,6 +1,6 @@
 # Template file for 'lvm2'
 pkgname=lvm2
-version=2.02.185
+version=2.02.186
 revision=1
 wrksrc="LVM2.${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
 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=070b2e7d34c8069602741c7483be715327f62875f5ce1f5727627fbea2481f4d
+checksum=d8421eee702982dc0d8b0c9e40cc1443ee487eff1460a00244a9f4bf439a27be
 conf_files="/etc/lvm/*.conf /etc/lvm/profile/*"
 make_dirs="
  /etc/lvm/archive 0755 root root