jq: bump version to 1.6

https://github.com/stedolan/jq/releases/tag/jq-1.6 https://nvd.nist.gov/vuln/detail/CVE-2015-8863 https://nvd.nist.gov/vuln/detail/CVE-2016-4074
dirk-dhu · Mar 25, 2019 · bf3ef32 · bf3ef32
1 parent c52a687
commit bf3ef32
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -56,7 +56,7 @@ Latest changes:
     * iksemel 1.5-git
     * iperf 3.6
     * jansson 2.7
-    * jq 1.5
+    * jq 1.6
     * libavmacl2 (taken from AVM's 7490.06.30 open-source package)
     * libcap 2.24
     * libgsm-1.0.13

diff --git a/make/jq/Config.in b/make/jq/Config.in
@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_JQ
-	bool "jq 1.5 (binary only)"
+	bool "jq 1.6 (binary only)"
 	default n
 	select FREETZ_LIB_libm      if !FREETZ_PACKAGE_JQ_STATIC
 	select FREETZ_LIB_libonig   if !FREETZ_PACKAGE_JQ_STATIC && FREETZ_PACKAGE_JQ_WITH_RE_SUPPORT

diff --git a/make/jq/jq.mk b/make/jq/jq.mk
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 1.5)
+$(call PKG_INIT_BIN, 1.6)
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
-$(PKG)_SOURCE_MD5:=0933532b086bd8b6a41c1b162b1731f9
+$(PKG)_SOURCE_SHA256:=5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72
 $(PKG)_SITE:=https://github.com/stedolan/jq/releases/download/jq-$($(PKG)_VERSION)
 
 $(PKG)_BINARY := $($(PKG)_DIR)/jq
@@ -19,6 +19,7 @@ $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_JQ_STATIC
 ifeq ($(strip $(FREETZ_PACKAGE_JQ_WITH_RE_SUPPORT)),y)
 $(PKG)_DEPENDS_ON += libonig
 else
+$(PKG)_CONFIGURE_OPTIONS += --without-oniguruma
 $(PKG)_CONFIGURE_ENV += ac_cv_header_oniguruma_h=no
 endif
 
@@ -35,6 +36,7 @@ $(PKG)_CONFIGURE_OPTIONS += --disable-silent-rules
 $(PKG)_CONFIGURE_OPTIONS += --disable-shared
 $(PKG)_CONFIGURE_OPTIONS += --disable-docs
 $(PKG)_CONFIGURE_OPTIONS += --disable-valgrind
+$(PKG)_CONFIGURE_OPTIONS += --disable-maintainer-mode
 
 $(PKG_SOURCE_DOWNLOAD)
 $(PKG_UNPACKED)

diff --git a/make/jq/patches/100-link-oniguruma-dynamically.patch b/make/jq/patches/100-link-oniguruma-dynamically.patch
@@ -1,11 +1,11 @@
 --- Makefile.in
 +++ Makefile.in
-@@ -681,7 +681,7 @@
+@@ -725,7 +725,7 @@
  @ENABLE_ERROR_INJECTION_TRUE@libinject_errors_la_LDFLAGS = -module
  generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\#define JQ_VERSION \"&\"/'`"
- jq_SOURCES = main.c version.h
--jq_LDFLAGS = -static-libtool-libs $(am__append_3)
-+jq_LDFLAGS =                      $(am__append_3)
- jq_LDADD = libjq.la -lm
+ jq_SOURCES = src/main.c src/version.h
+-jq_LDFLAGS = -static-libtool-libs $(am__append_7)
++jq_LDFLAGS =                      $(am__append_7)
+ jq_LDADD = libjq.la -lm $(am__append_6)
 
  ### Tests (make check)