diff options
Diffstat (limited to 'app-misc/jq/files')
-rw-r--r-- | app-misc/jq/files/jq-1.5-dynamic-link.patch | 13 | ||||
-rw-r--r-- | app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch | 34 | ||||
-rw-r--r-- | app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch | 58 | ||||
-rw-r--r-- | app-misc/jq/files/jq-1.6-segfault-fix.patch | 22 | ||||
-rw-r--r-- | app-misc/jq/files/jq-1.7-runpath.patch (renamed from app-misc/jq/files/jq-1.6-runpath.patch) | 6 |
5 files changed, 3 insertions, 130 deletions
diff --git a/app-misc/jq/files/jq-1.5-dynamic-link.patch b/app-misc/jq/files/jq-1.5-dynamic-link.patch deleted file mode 100644 index dbc2f11acb7f..000000000000 --- a/app-misc/jq/files/jq-1.5-dynamic-link.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index c3a771f..274c01e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -84,7 +84,7 @@ main.c: version.h - - bin_PROGRAMS = jq - jq_SOURCES = main.c version.h --jq_LDFLAGS = -static-libtool-libs -+jq_LDFLAGS = - jq_LDADD = libjq.la -lm - - if ENABLE_ALL_STATIC diff --git a/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch deleted file mode 100644 index edb07d8388b5..000000000000 --- a/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001 -From: Nicolas Williams <nico@cryptonector.com> -Date: Sat, 24 Oct 2015 17:24:57 -0500 -Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105) - -This was an off-by one: the NUL terminator byte was not allocated on -resize. This was triggered by JSON-encoded numbers longer than 256 -bytes. ---- - src/jv_parse.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/jv_parse.c b/src/jv_parse.c -index 3102ed4..84245b8 100644 ---- a/jv_parse.c -+++ b/jv_parse.c -@@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) { - - static void tokenadd(struct jv_parser* p, char c) { - assert(p->tokenpos <= p->tokenlen); -- if (p->tokenpos == p->tokenlen) { -+ if (p->tokenpos >= (p->tokenlen - 1)) { - p->tokenlen = p->tokenlen*2 + 256; - p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen); - } -@@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) { - TRY(value(p, v)); - } else { - // FIXME: better parser -- p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid -+ p->tokenbuf[p->tokenpos] = 0; - char* end = 0; - double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end); - if (end == 0 || *end != 0) diff --git a/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch b/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch deleted file mode 100644 index 95ba0e058056..000000000000 --- a/app-misc/jq/files/jq-1.5-remove-automagic-dep-on-oniguruma.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit 18b4b18b41f5ed396d73449ce8d6ec408d95d6b2 -Author: David Tolnay <dtolnay@gmail.com> -Date: Sat Nov 21 10:05:37 2015 -0800 - - Support --without-oniguruma - -diff --git a/configure.ac b/configure.ac -index 9e2c8cf..7f6be34 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,27 +52,26 @@ fi - AC_ARG_WITH([oniguruma], - [AS_HELP_STRING([--with-oniguruma=prefix], - [try this for a non-standard install prefix of the oniguruma library])], -- [ONIGURUMAPATHSET=1], -- [ONIGURUMAPATHSET=0]) -- --if test $ONIGURUMAPATHSET = 1; then -- CFLAGS="$CFLAGS -I${with_oniguruma}/include" -- LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib" --fi -- --# check for ONIGURUMA library --HAVE_ONIGURUMA=0 --AC_CHECK_HEADER("oniguruma.h", -- AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;])) -- --# handle check results --if test $HAVE_ONIGURUMA != 1; then -- AC_MSG_NOTICE([Oniguruma was not found.]) -- AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ]) --else -- AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed]) --fi -- -+ [], -+ [with_oniguruma=yes]) -+ -+AS_IF([test "x$with_oniguruma" != xno], [ -+ AS_IF([test "x$with_oniguruma" != xyes], [ -+ CFLAGS="$CFLAGS -I${with_oniguruma}/include" -+ LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib" -+ ]) -+ # check for ONIGURUMA library -+ have_oniguruma=0 -+ AC_CHECK_HEADER("oniguruma.h", -+ AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; have_oniguruma=1;])) -+ # handle check results -+ AS_IF([test $have_oniguruma = 1], [ -+ AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is installed]) -+ ], [ -+ AC_MSG_NOTICE([Oniguruma was not found.]) -+ AC_MSG_NOTICE([Try setting the location using '--with-oniguruma=PREFIX']) -+ ]) -+]) - - dnl Check for valgrind - AC_CHECK_PROGS(valgrind_cmd, valgrind) diff --git a/app-misc/jq/files/jq-1.6-segfault-fix.patch b/app-misc/jq/files/jq-1.6-segfault-fix.patch deleted file mode 100644 index 8eb7d456bc6b..000000000000 --- a/app-misc/jq/files/jq-1.6-segfault-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001 -From: William Langford <wlangfor@gmail.com> -Date: Tue, 20 Nov 2018 09:58:25 -0500 -Subject: [PATCH] Add missing jv_copy when printing with -ar - ---- - src/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main.c b/src/main.c -index b154689e..61ae43f9 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -168,7 +168,7 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts) { - while (jv_is_valid(result = jq_next(jq))) { - if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) { - if (options & ASCII_OUTPUT) { -- jv_dumpf(result, stdout, JV_PRINT_ASCII); -+ jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII); - } else { - fwrite(jv_string_value(result), 1, jv_string_length_bytes(jv_copy(result)), stdout); - } diff --git a/app-misc/jq/files/jq-1.6-runpath.patch b/app-misc/jq/files/jq-1.7-runpath.patch index 40a2ed02f3db..a8f76f7c90e1 100644 --- a/app-misc/jq/files/jq-1.6-runpath.patch +++ b/app-misc/jq/files/jq-1.7-runpath.patch @@ -1,10 +1,10 @@ diff --git a/configure.ac b/configure.ac -index 280694c..7227c9d 100644 +index 0441d4a..8f1aa23 100644 --- a/configure.ac +++ b/configure.ac -@@ -280,4 +280,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"]) +@@ -283,4 +283,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"]) AC_CONFIG_MACRO_DIR([config/m4]) - AC_CONFIG_FILES([Makefile]) + AC_CONFIG_FILES([Makefile libjq.pc]) AC_OUTPUT - +AC_ARG_ENABLE([rpathhack], |