From f4816e2ba1ec47f20ec5b738632b28e006b9202e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 26 Jul 2015 23:35:10 +0200 Subject: [PATCH] lvm2: update source, refresh patch Signed-off-by: Daniel Golle --- utils/lvm2/Makefile | 4 ++-- utils/lvm2/patches/002-const-stdio.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile index b035d1970..a9e65a198 100644 --- a/utils/lvm2/Makefile +++ b/utils/lvm2/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=LVM2 -PKG_VERSION:=2.02.125 +PKG_VERSION:=2.02.126 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:=2d24ba982c8a85e8c837210f087a6a51 +PKG_MD5SUM:=38cd1953b62bd256c9e924adee01e995 PKG_MAINTAINER:=Daniel Golle 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 d06f4eb0f..b0c730af0 100644 --- a/utils/lvm2/patches/002-const-stdio.patch +++ b/utils/lvm2/patches/002-const-stdio.patch @@ -1,6 +1,6 @@ --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c -@@ -1690,8 +1690,10 @@ struct cmd_context *create_toolcontext(u +@@ -1686,8 +1686,10 @@ struct cmd_context *create_toolcontext(u unsigned threaded) { struct cmd_context *cmd; @@ -11,7 +11,7 @@ #ifdef M_MMAP_MAX mallopt(M_MMAP_MAX, 0); -@@ -1727,7 +1729,7 @@ struct cmd_context *create_toolcontext(u +@@ -1723,7 +1725,7 @@ struct cmd_context *create_toolcontext(u /* FIXME Make this configurable? */ reset_lvm_errno(1); @@ -20,7 +20,7 @@ /* Set in/out stream buffering before glibc */ if (set_buffering) { /* Allocate 2 buffers */ -@@ -2100,7 +2102,7 @@ void destroy_toolcontext(struct cmd_cont +@@ -2096,7 +2098,7 @@ void destroy_toolcontext(struct cmd_cont if (cmd->libmem) dm_pool_destroy(cmd->libmem); @@ -31,7 +31,7 @@ if (is_valid_fd(STDIN_FILENO) && --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -1689,6 +1689,7 @@ int lvm_split(char *str, int *argc, char +@@ -1722,6 +1722,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) { @@ -39,7 +39,7 @@ int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && -@@ -1715,6 +1716,12 @@ static int _check_standard_fds(void) +@@ -1748,6 +1749,12 @@ static int _check_standard_fds(void) strerror(errno)); return 0; }