diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -5,10 +5,14 @@ libjq.so.1:jq_get_attr libjq.so.1:jq_get_debug_cb libjq.so.1:jq_get_error_cb +libjq.so.1:jq_get_error_message +libjq.so.1:jq_get_exit_code libjq.so.1:jq_get_input_cb libjq.so.1:jq_get_jq_origin libjq.so.1:jq_get_lib_dirs libjq.so.1:jq_get_prog_origin +libjq.so.1:jq_halt +libjq.so.1:jq_halted libjq.so.1:jq_init libjq.so.1:jq_next libjq.so.1:jq_parse @@ -17,6 +21,7 @@ libjq.so.1:jq_report_error libjq.so.1:jq_set_attr libjq.so.1:jq_set_attrs +libjq.so.1:jq_set_colors libjq.so.1:jq_set_debug_cb libjq.so.1:jq_set_error_cb libjq.so.1:jq_set_input_cb @@ -84,7 +89,6 @@ libjq.so.1:jv_contains libjq.so.1:jv_copy libjq.so.1:jv_delpaths -libjq.so.1:jv_dels libjq.so.1:jv_dump libjq.so.1:jv_dump_string libjq.so.1:jv_dump_string_trunc @@ -125,6 +129,7 @@ libjq.so.1:jv_object_contains libjq.so.1:jv_object_delete libjq.so.1:jv_object_get +libjq.so.1:jv_object_has libjq.so.1:jv_object_iter libjq.so.1:jv_object_iter_key libjq.so.1:jv_object_iter_next diff --git a/files/security/cve-2015-8863.patch b/files/security/cve-2015-8863.patch deleted file mode 100644 --- a/files/security/cve-2015-8863.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/jv_parse.c b/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/files/security/cve-2016-4074.patch b/files/security/cve-2016-4074.patch deleted file mode 100644 --- a/files/security/cve-2016-4074.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/jv_parse.c b/jv_parse.c -index 3102ed4..266e82c 100644 ---- a/jv_parse.c -+++ b/jv_parse.c -@@ -10,6 +10,10 @@ - - typedef const char* presult; - -+#ifndef MAX_PARSING_DEPTH -+#define MAX_PARSING_DEPTH (256) -+#endif -+ - #define TRY(x) do {presult msg__ = (x); if (msg__) return msg__; } while(0) - #ifdef __GNUC__ - #define pfunc __attribute__((warn_unused_result)) presult -@@ -147,11 +151,13 @@ static void push(struct jv_parser* p, jv v) { - static pfunc parse_token(struct jv_parser* p, char ch) { - switch (ch) { - case '[': -+ if (p->stackpos >= MAX_PARSING_DEPTH) return "Exceeds depth limit for parsing"; - if (jv_is_valid(p->next)) return "Expected separator between values"; - push(p, jv_array()); - break; - - case '{': -+ if (p->stackpos >= MAX_PARSING_DEPTH) return "Exceeds depth limit for parsing"; - if (jv_is_valid(p->next)) return "Expected separator between values"; - push(p, jv_object()); - break; -diff --git a/jv_print.c b/jv_print.c -index 567c737..eda204d 100644 ---- a/jv_print.c -+++ b/jv_print.c -@@ -13,6 +13,10 @@ - #include "jv_dtoa.h" - #include "jv_unicode.h" - -+#ifndef MAX_PRINT_DEPTH -+#define MAX_PRINT_DEPTH (256) -+#endif -+ - #define ESC "\033" - #define COL(c) (ESC "[" c "m") - #define COLRESET (ESC "[0m") -@@ -150,7 +154,9 @@ static void jv_dump_term(struct dtoa_context* C, jv x, int flags, int indent, FI - } - } - } -- switch (jv_get_kind(x)) { -+ if (indent > MAX_PRINT_DEPTH) { -+ put_str("", F, S, flags & JV_PRINT_ISATTY); -+ } else switch (jv_get_kind(x)) { - default: - case JV_KIND_INVALID: - if (flags & JV_PRINT_INVALID) { diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,17 +1,18 @@ name : jq -version : 1.5 -release : 2 +version : 1.6 +release : 3 source : - - https://github.com/stedolan/jq/archive/jq-1.5.tar.gz : d5667641d28c27d0c1e70de83e7f9bd8b2fed7fbf6a1d68731177d400a533c65 + - https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz : 5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72 license : BSD-2-Clause component : programming summary : jq is a lightweight and flexible command-line JSON processor description: | jq is a lightweight and flexible command-line JSON processor. setup : | - %patch -p1 < $pkgfiles/security/cve-2015-8863.patch - %patch -p1 < $pkgfiles/security/cve-2016-4074.patch - %reconfigure --disable-maintainer-mode --disable-static + %configure \ + --disable-maintainer-mode \ + --disable-static \ + --without-oniguruma build : | %make install : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ jq - Ikey Doherty - ikey@solus-project.com + Philipp Trulson + philipp@trulson.de BSD-2-Clause programming @@ -19,10 +19,14 @@ programming - /usr/bin - /usr/lib64/lib*.so.* - /usr/share/doc - /usr/share/man + /usr/bin/jq + /usr/lib64/libjq.so.1 + /usr/lib64/libjq.so.1.0.4 + /usr/share/doc/jq/AUTHORS + /usr/share/doc/jq/COPYING + /usr/share/doc/jq/README + /usr/share/doc/jq/README.md + /usr/share/man/man1/jq.1 @@ -32,20 +36,21 @@ programming.devel - jq + jq - /usr/include/ - /usr/lib64/lib*.so + /usr/include/jq.h + /usr/include/jv.h + /usr/lib64/libjq.so - - 2016-11-17 - 1.5 + + 2018-12-28 + 1.6 Packaging update - Ikey Doherty - ikey@solus-project.com + Philipp Trulson + philipp@trulson.de \ No newline at end of file