| 1 |
commit: c73313ba294602d3ec781bbfafc4c63b9e518062 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Wed Dec 5 21:56:11 2018 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 5 21:56:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73313ba |
| 7 |
|
| 8 |
app-misc/jq: Revision bump, segfault fix with -ar params |
| 9 |
|
| 10 |
Copyright: Sony Interactive Entertainment Inc. |
| 11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 13 |
|
| 14 |
app-misc/jq/files/jq-1.6-segfault-fix.patch | 22 ++++++++++++++++++++++ |
| 15 |
app-misc/jq/{jq-1.6.ebuild => jq-1.6-r1.ebuild} | 1 + |
| 16 |
2 files changed, 23 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-misc/jq/files/jq-1.6-segfault-fix.patch b/app-misc/jq/files/jq-1.6-segfault-fix.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..8eb7d456bc6 |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-misc/jq/files/jq-1.6-segfault-fix.patch |
| 23 |
@@ -0,0 +1,22 @@ |
| 24 |
+From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001 |
| 25 |
+From: William Langford <wlangfor@×××××.com> |
| 26 |
+Date: Tue, 20 Nov 2018 09:58:25 -0500 |
| 27 |
+Subject: [PATCH] Add missing jv_copy when printing with -ar |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ src/main.c | 2 +- |
| 31 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 32 |
+ |
| 33 |
+diff --git a/src/main.c b/src/main.c |
| 34 |
+index b154689e..61ae43f9 100644 |
| 35 |
+--- a/src/main.c |
| 36 |
++++ b/src/main.c |
| 37 |
+@@ -168,7 +168,7 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts) { |
| 38 |
+ while (jv_is_valid(result = jq_next(jq))) { |
| 39 |
+ if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) { |
| 40 |
+ if (options & ASCII_OUTPUT) { |
| 41 |
+- jv_dumpf(result, stdout, JV_PRINT_ASCII); |
| 42 |
++ jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII); |
| 43 |
+ } else { |
| 44 |
+ fwrite(jv_string_value(result), 1, jv_string_length_bytes(jv_copy(result)), stdout); |
| 45 |
+ } |
| 46 |
|
| 47 |
diff --git a/app-misc/jq/jq-1.6.ebuild b/app-misc/jq/jq-1.6-r1.ebuild |
| 48 |
similarity index 97% |
| 49 |
rename from app-misc/jq/jq-1.6.ebuild |
| 50 |
rename to app-misc/jq/jq-1.6-r1.ebuild |
| 51 |
index 43d94479124..e5e7da47aca 100644 |
| 52 |
--- a/app-misc/jq/jq-1.6.ebuild |
| 53 |
+++ b/app-misc/jq/jq-1.6-r1.ebuild |
| 54 |
@@ -29,6 +29,7 @@ src_prepare() { |
| 55 |
local PATCHES=( |
| 56 |
"${FILESDIR}"/jq-1.6-never-bundle-oniguruma.patch |
| 57 |
"${FILESDIR}"/jq-1.6-runpath.patch |
| 58 |
+ "${FILESDIR}"/jq-1.6-segfault-fix.patch |
| 59 |
) |
| 60 |
use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; } |
| 61 |
sed -i '/^dist_doc_DATA/d' Makefile.am || die |
Archives