diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2015-06-14 22:19:34 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2015-06-14 22:20:07 +0200 |
| commit | 3a81a9b9fae2410c32d72974b9e04340c4cc8389 (patch) | |
| tree | a378cbe667a64ca7f26162f83389c24da105bc8d /utils/lvm2/patches | |
| parent | 1ff278f98c683bde4c1fad3e4c246f57d627fe56 (diff) | |
lvm2: update source and refresh patches
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'utils/lvm2/patches')
| -rw-r--r-- | utils/lvm2/patches/002-const-stdio.patch | 12 | ||||
| -rw-r--r-- | utils/lvm2/patches/003-no-mallinfo.patch | 6 |
2 files changed, 6 insertions, 12 deletions
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. */ |