summaryrefslogtreecommitdiff
path: root/package/lvm/patches/patch-tools_lvmcmdline_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-28 11:25:36 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-03-01 13:51:51 +0100
commita9c484fd58d0535dda5e5a292dab120f83611b80 (patch)
treea7deff7e338f9a290bec40f4e97d39aa4f4fbaed /package/lvm/patches/patch-tools_lvmcmdline_c
parentbf401a7ecf628c21d7eeb0edb32401a648afd93d (diff)
revert this commit, as it breaks with uClibc-ng
https://www.redhat.com/archives/lvm-devel/2014-November/msg00132.html uClibc-ng uses simpler malloc as default.
Diffstat (limited to 'package/lvm/patches/patch-tools_lvmcmdline_c')
-rw-r--r--package/lvm/patches/patch-tools_lvmcmdline_c10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/lvm/patches/patch-tools_lvmcmdline_c b/package/lvm/patches/patch-tools_lvmcmdline_c
index 13124f32d..df9a068cd 100644
--- a/package/lvm/patches/patch-tools_lvmcmdline_c
+++ b/package/lvm/patches/patch-tools_lvmcmdline_c
@@ -1,6 +1,6 @@
---- LVM2.2.02.106.orig/tools/lvmcmdline.c 2014-04-10 17:38:46.000000000 +0200
-+++ LVM2.2.02.106/tools/lvmcmdline.c 2014-05-29 16:57:14.221581766 +0200
-@@ -1252,9 +1252,12 @@ int lvm_split(char *str, int *argc, char
+--- LVM2.2.02.114.orig/tools/lvmcmdline.c 2014-11-29 00:07:43.000000000 +0100
++++ LVM2.2.02.114/tools/lvmcmdline.c 2015-02-28 09:27:09.000000000 +0100
+@@ -1536,9 +1536,12 @@ int lvm_split(char *str, int *argc, char
static int _check_standard_fds(void)
{
int err = is_valid_fd(STDERR_FILENO);
@@ -14,7 +14,7 @@
if (err)
perror("stdin stream open");
else
-@@ -1264,7 +1267,7 @@ static int _check_standard_fds(void)
+@@ -1548,7 +1551,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDOUT_FILENO) &&
@@ -23,7 +23,7 @@
if (err)
perror("stdout stream open");
/* else no stdout */
-@@ -1272,7 +1275,7 @@ static int _check_standard_fds(void)
+@@ -1556,7 +1559,7 @@ static int _check_standard_fds(void)
}
if (!is_valid_fd(STDERR_FILENO) &&