diff options
| author | James Meyer <james.meyer@operamail.com> | 2014-02-17 00:01:44 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2014-02-19 19:03:04 (GMT) |
| commit | 15471fc26d53c9431ebf69b06bb6ac0036484d54 (patch) | |
| tree | 980b9a9c655d127b95235011915aedddb567ec8d /abs/core/util-linux/0001-lsblk-fix-D-segfault.patch | |
| parent | 76d8789a8f3dd26cd1a6cea90517d75efa922f40 (diff) | |
| download | linhes_pkgbuild-15471fc26d53c9431ebf69b06bb6ac0036484d54.zip linhes_pkgbuild-15471fc26d53c9431ebf69b06bb6ac0036484d54.tar.gz linhes_pkgbuild-15471fc26d53c9431ebf69b06bb6ac0036484d54.tar.bz2 | |
util-linux 2.2.4
update binary path to /usr/bin
refs #961
Diffstat (limited to 'abs/core/util-linux/0001-lsblk-fix-D-segfault.patch')
| -rw-r--r-- | abs/core/util-linux/0001-lsblk-fix-D-segfault.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch b/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch new file mode 100644 index 0000000..8e4d7c6 --- /dev/null +++ b/abs/core/util-linux/0001-lsblk-fix-D-segfault.patch @@ -0,0 +1,45 @@ +From 71d842c01992b3678de4da4773ed54f08c0ab4f6 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Mon, 18 Nov 2013 11:27:35 +0100 +Subject: [PATCH] lsblk: fix -D segfault + +References: https://bugzilla.redhat.com/show_bug.cgi?id=1031262 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + misc-utils/lsblk.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c +index 9f7f1b6..9b53be3 100644 +--- a/misc-utils/lsblk.c ++++ b/misc-utils/lsblk.c +@@ -903,7 +903,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line + if (cxt->discard && p) + tt_line_set_data(ln, col, p); + else +- tt_line_set_data(ln, col, "0"); ++ tt_line_set_data(ln, col, xstrdup("0")); + break; + case COL_DGRAN: + if (lsblk->bytes) +@@ -936,7 +936,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line + if (cxt->discard && p) + tt_line_set_data(ln, col, p); + else +- tt_line_set_data(ln, col, "0"); ++ tt_line_set_data(ln, col, xstrdup("0")); + break; + case COL_WSAME: + if (lsblk->bytes) +@@ -948,7 +948,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line + "queue/write_same_max_bytes", &x) == 0) + p = size_to_human_string(SIZE_SUFFIX_1LETTER, x); + } +- tt_line_set_data(ln, col, p ? p : "0"); ++ tt_line_set_data(ln, col, p ? p : xstrdup("0")); + break; + }; + } +-- +1.8.4.2 + |