diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile index 7b6e953284..82942dfe80 100644 --- a/utils/lvm2/Makefile +++ b/utils/lvm2/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=LVM2 -PKG_VERSION:=2.02.141 +PKG_VERSION:=2.02.145 PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 LGPL-2.1 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2/releases -PKG_MD5SUM:=0bb6261f7ecb9ef70fd773c6a952de67 +PKG_MD5SUM:=fd952ba7d640f0bedcec0085e358b318 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 13da6b63f9..fff3796472 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 -@@ -1741,8 +1741,10 @@ struct cmd_context *create_toolcontext(u +@@ -1747,8 +1747,10 @@ struct cmd_context *create_toolcontext(u unsigned set_filters) { struct cmd_context *cmd; @@ -11,7 +11,7 @@ #ifdef M_MMAP_MAX mallopt(M_MMAP_MAX, 0); -@@ -1778,7 +1780,7 @@ struct cmd_context *create_toolcontext(u +@@ -1784,7 +1786,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 */ -@@ -2161,7 +2163,7 @@ void destroy_toolcontext(struct cmd_cont +@@ -2167,7 +2169,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 -@@ -1741,6 +1741,7 @@ int lvm_split(char *str, int *argc, char +@@ -1744,6 +1744,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) && -@@ -1767,6 +1768,12 @@ static int _check_standard_fds(void) +@@ -1770,6 +1771,12 @@ static int _check_standard_fds(void) strerror(errno)); return 0; }