3 files changed, 119 insertions, 0 deletions
diff --git a/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch b/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
new file mode 100644
index 000000000000..0b0e92600507
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-never-bundle-oniguruma.patch
@@ -0,0 +1,80 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6344b4e..5f0c74d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -48,7 +48,7 @@ AM_YFLAGS = --warnings=all -d
+ lib_LTLIBRARIES = libjq.la
+ libjq_la_SOURCES = ${LIBJQ_SRC}
+ libjq_la_LIBADD = -lm
+-libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
++libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+ 
+ if WIN32
+ libjq_la_LIBADD += -lshlwapi
+@@ -137,15 +137,6 @@ jq.1: $(srcdir)/jq.1.prebuilt
+ endif
+ 
+ 
+-### Build oniguruma
+-
+-if BUILD_ONIGURUMA
+-libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la
+-SUBDIRS = modules/oniguruma
+-endif
+-
+-AM_CFLAGS += $(onig_CFLAGS)
+-
+ ### Packaging
+ 
+ docs/site.yml: configure.ac
+diff --git a/configure.ac b/configure.ac
+index 280694c..0c5d86f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,45 +236,20 @@ AC_ARG_WITH([oniguruma],
+       [try this for a non-standard install prefix of the oniguruma library])], ,
+    [with_oniguruma=yes])
+ 
+-onig_CFLAGS=
+-onig_LDFLAGS=
+-build_oniguruma=no
+ AS_IF([test "x$with_oniguruma" != xno], [
+    save_CFLAGS="$CFLAGS"
+    save_LDFLAGS="$LDFLAGS"
+-   AS_IF([test "x$with_oniguruma" != xyes], [
+-      AS_IF([test "x$with_oniguruma" = xbuiltin], [
+-          build_oniguruma=yes
+-      ], [
+-          onig_CFLAGS="-I${with_oniguruma}/include"
+-          onig_LDFLAGS="-L${with_oniguruma}/lib"
+-      ])
+-   ])
+    AS_IF([test "x$build_oniguruma" = xno], [
+        # check for ONIGURUMA library, either in /usr or where requested
+-       CFLAGS="$CFLAGS $onig_CFLAGS"
+-       LDFLAGS="$LDFLAGS $onig_LDFLAGS"
+        AC_CHECK_HEADER("oniguruma.h",
+           AC_CHECK_LIB([onig],[onig_version]))
+        # handle check results
+        AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [
+-          build_oniguruma=yes
+-          AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.])
++          AC_MSG_ERROR(oniguruma.h not found)
+        ])
+    ])
+-   AS_IF([test "x$build_oniguruma" = xyes -a -f "${srcdir}/modules/oniguruma/configure.ac" ], [
+-       onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
+-       onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
+-       AC_CONFIG_SUBDIRS([modules/oniguruma])
+-       AC_DEFINE([HAVE_LIBONIG],1,[Define to 1 if the system includes libonig])
+-   ])
+-   CFLAGS="$save_CFLAGS"
+-   LDFLAGS="$save_LDFLAGS"
+ ])
+-AC_SUBST(onig_CFLAGS)
+-AC_SUBST(onig_LDFLAGS)
+ 
+-AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes])
+ AC_SUBST([BUNDLER], ["$bundle_cmd"])
+ 
+ AC_CONFIG_MACRO_DIR([config/m4])
diff --git a/app-misc/jq/files/jq-1.6-runpath.patch b/app-misc/jq/files/jq-1.6-runpath.patch
new file mode 100644
index 000000000000..40a2ed02f3db
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-runpath.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 280694c..7227c9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -280,4 +280,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
+ AC_CONFIG_MACRO_DIR([config/m4])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+-
++AC_ARG_ENABLE([rpathhack],
++	[AC_HELP_STRING([--enable-rpathhack], [patch libtool to remove RPATH])],
++	[
++AC_MSG_RESULT([patching libtool to fix rpath])
++sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
++sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
++	],
++	[])
diff --git a/app-misc/jq/files/jq-1.6-segfault-fix.patch b/app-misc/jq/files/jq-1.6-segfault-fix.patch
new file mode 100644
index 000000000000..8eb7d456bc6b
--- /dev/null
+++ b/app-misc/jq/files/jq-1.6-segfault-fix.patch
@@ -0,0 +1,22 @@
+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);
+       }