lvm2: switch to version 2.2.02.120

Signed-off-by: Daniel Golle <redacted>

diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile
index 4aee2bd9e2ced77ed640533a3880626c29c7e522..7a2e39e38c420fd77919d62b41beceba49bd4f87 100644 (file)
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=LVM2
-PKG_VERSION:=2.02.119
-PKG_RELEASE:=2
+PKG_VERSION:=2.02.120
+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:=93d15d76ab78fbcec4721c4b44284bbb
+PKG_MD5SUM:=326df8542d3a2376da907e98a0888ccf
 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 15c2e86505ddce61cd9ca6ab74f6cd1b25d28dbb..5605f0dd14207f8c35a163b9d3f54b1612b7249a 100644 (file)
--- a/utils/lvm2/patches/002-const-stdio.patch
+++ b/utils/lvm2/patches/002-const-stdio.patch
@@ -1,8 +1,8 @@
-Index: LVM2.2.02.118/lib/commands/toolcontext.c
+Index: LVM2.2.02.120/lib/commands/toolcontext.c
 ===================================================================
---- LVM2.2.02.118.orig/lib/commands/toolcontext.c
-+++ LVM2.2.02.118/lib/commands/toolcontext.c
-@@ -1625,8 +1625,10 @@ struct cmd_context *create_toolcontext(u
+--- LVM2.2.02.120.orig/lib/commands/toolcontext.c
++++ LVM2.2.02.120/lib/commands/toolcontext.c
+@@ -1637,8 +1637,10 @@ struct cmd_context *create_toolcontext(u
                                       unsigned threaded)
  {
        struct cmd_context *cmd;
@@ -13,7 +13,7 @@ Index: LVM2.2.02.118/lib/commands/toolcontext.c
  
  #ifdef M_MMAP_MAX
        mallopt(M_MMAP_MAX, 0);
-@@ -1662,7 +1664,7 @@ struct cmd_context *create_toolcontext(u
+@@ -1674,7 +1676,7 @@ struct cmd_context *create_toolcontext(u
        /* FIXME Make this configurable? */
        reset_lvm_errno(1);
  
@@ -22,7 +22,7 @@ Index: LVM2.2.02.118/lib/commands/toolcontext.c
        /* Set in/out stream buffering before glibc */
        if (set_buffering) {
                /* Allocate 2 buffers */
-@@ -2035,7 +2037,7 @@ void destroy_toolcontext(struct cmd_cont
+@@ -2047,7 +2049,7 @@ void destroy_toolcontext(struct cmd_cont
        if (cmd->libmem)
                dm_pool_destroy(cmd->libmem);
  
@@ -31,11 +31,11 @@ Index: LVM2.2.02.118/lib/commands/toolcontext.c
        if (cmd->linebuffer) {
                /* Reset stream buffering to defaults */
                if (is_valid_fd(STDIN_FILENO) &&
-Index: LVM2.2.02.118/tools/lvmcmdline.c
+Index: LVM2.2.02.120/tools/lvmcmdline.c
 ===================================================================
---- LVM2.2.02.118.orig/tools/lvmcmdline.c
-+++ LVM2.2.02.118/tools/lvmcmdline.c
-@@ -1602,6 +1602,7 @@ int lvm_split(char *str, int *argc, char
+--- LVM2.2.02.120.orig/tools/lvmcmdline.c
++++ LVM2.2.02.120/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)
  {
@@ -43,7 +43,7 @@ Index: LVM2.2.02.118/tools/lvmcmdline.c
        int err = is_valid_fd(STDERR_FILENO);
  
        if (!is_valid_fd(STDIN_FILENO) &&
-@@ -1628,6 +1629,12 @@ static int _check_standard_fds(void)
+@@ -1632,6 +1633,12 @@ static int _check_standard_fds(void)
                       strerror(errno));
                return 0;
        }