[ptxdist] [PATCH] jq: version bump 1.5 -> 1.6

[Alexander Dahl <ada@thorsis.com>]

* New release 1.6 fixes security issues and bugs.
* Dropped patch was a backport from post 1.5 upstream, included in 1.6.
* Changes in COPYING were whitespace and http to https in an URL.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 .../jq-1.5/0001-Support-without-oniguruma.patch    | 60 ----------------------
 patches/jq-1.5/autogen.sh                          |  1 -
 patches/jq-1.5/series                              |  4 --
 rules/jq.make                                      |  6 +--
 4 files changed, 3 insertions(+), 68 deletions(-)
 delete mode 100644 patches/jq-1.5/0001-Support-without-oniguruma.patch
 delete mode 120000 patches/jq-1.5/autogen.sh
 delete mode 100644 patches/jq-1.5/series

diff --git a/patches/jq-1.5/0001-Support-without-oniguruma.patch b/patches/jq-1.5/0001-Support-without-oniguruma.patch
deleted file mode 100644
index 7e85d1b40..000000000
--- a/patches/jq-1.5/0001-Support-without-oniguruma.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: David Tolnay <dtolnay@gmail.com>
-Date: Sat, 21 Nov 2015 10:05:37 -0800
-Subject: [PATCH] Support --without-oniguruma
-
----
- configure.ac | 41 ++++++++++++++++++++---------------------
- 1 file changed, 20 insertions(+), 21 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4bb436ee34d6..f802ecfca45b 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/patches/jq-1.5/autogen.sh b/patches/jq-1.5/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/jq-1.5/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/jq-1.5/series b/patches/jq-1.5/series
deleted file mode 100644
index e9b5518ab..000000000
--- a/patches/jq-1.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Support-without-oniguruma.patch
-# b1ba38754fe362c3d5862f8f541586c8  - git-ptx-patches magic
diff --git a/rules/jq.make b/rules/jq.make
index 9f0f87511..36753b53c 100644
--- a/rules/jq.make
+++ b/rules/jq.make
@@ -16,15 +16,15 @@ PACKAGES-$(PTXCONF_JQ) += jq
 #
 # Paths and names
 #
-JQ_VERSION	:= 1.5
-JQ_MD5		:= 0933532b086bd8b6a41c1b162b1731f9
+JQ_VERSION	:= 1.6
+JQ_MD5		:= e68fbd6a992e36f1ac48c99bbf825d6b
 JQ		:= jq-$(JQ_VERSION)
 JQ_SUFFIX	:= tar.gz
 JQ_URL		:= https://github.com/stedolan/jq/releases/download/$(JQ)/$(JQ).$(JQ_SUFFIX)
 JQ_SOURCE	:= $(SRCDIR)/$(JQ).$(JQ_SUFFIX)
 JQ_DIR		:= $(BUILDDIR)/$(JQ)
 JQ_LICENSE	:= MIT AND CC-BY-3.0
-JQ_LICENSE_FILES := file://COPYING;md5=29dd0c35d7e391bb8d515eacf7592e00
+JQ_LICENSE_FILES := file://COPYING;md5=15d03e360fa7399f76d5a4359fc72cbf
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de