From 3a81a9b9fae2410c32d72974b9e04340c4cc8389 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 14 Jun 2015 22:19:34 +0200
Subject: [PATCH] lvm2: update source and refresh patches

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 utils/lvm2/Makefile                      |  4 ++--
 utils/lvm2/patches/002-const-stdio.patch | 12 ++++--------
 utils/lvm2/patches/003-no-mallinfo.patch |  6 ++----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile
index 7a2e39e38..38b9d63e2 100644
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=LVM2
-PKG_VERSION:=2.02.120
+PKG_VERSION:=2.02.121
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0 LGPL-2.1
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2
-PKG_MD5SUM:=326df8542d3a2376da907e98a0888ccf
+PKG_MD5SUM:=702c61bf07a8fc6dc0db6e9d323d9f6d
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
 
diff --git a/utils/lvm2/patches/002-const-stdio.patch b/utils/lvm2/patches/002-const-stdio.patch
index 5605f0dd1..399485831 100644
--- a/utils/lvm2/patches/002-const-stdio.patch
+++ b/utils/lvm2/patches/002-const-stdio.patch
@@ -1,7 +1,5 @@
-Index: LVM2.2.02.120/lib/commands/toolcontext.c
-===================================================================
---- LVM2.2.02.120.orig/lib/commands/toolcontext.c
-+++ LVM2.2.02.120/lib/commands/toolcontext.c
+--- a/lib/commands/toolcontext.c
++++ b/lib/commands/toolcontext.c
 @@ -1637,8 +1637,10 @@ struct cmd_context *create_toolcontext(u
  				       unsigned threaded)
  {
@@ -31,10 +29,8 @@ Index: LVM2.2.02.120/lib/commands/toolcontext.c
  	if (cmd->linebuffer) {
  		/* Reset stream buffering to defaults */
  		if (is_valid_fd(STDIN_FILENO) &&
-Index: LVM2.2.02.120/tools/lvmcmdline.c
-===================================================================
---- LVM2.2.02.120.orig/tools/lvmcmdline.c
-+++ LVM2.2.02.120/tools/lvmcmdline.c
+--- a/tools/lvmcmdline.c
++++ b/tools/lvmcmdline.c
 @@ -1606,6 +1606,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)
diff --git a/utils/lvm2/patches/003-no-mallinfo.patch b/utils/lvm2/patches/003-no-mallinfo.patch
index d37a5bfa3..be9a6625d 100644
--- a/utils/lvm2/patches/003-no-mallinfo.patch
+++ b/utils/lvm2/patches/003-no-mallinfo.patch
@@ -1,7 +1,5 @@
-Index: LVM2.2.02.119/lib/mm/memlock.c
-===================================================================
---- LVM2.2.02.119.orig/lib/mm/memlock.c
-+++ LVM2.2.02.119/lib/mm/memlock.c
+--- a/lib/mm/memlock.c
++++ b/lib/mm/memlock.c
 @@ -161,12 +161,15 @@ static void _allocate_memory(void)
           *  memory on free(), this is good enough for our purposes.
           */