Updated textproc/qore-json-module to version 1.7 .

Removed patch-src_ql__json.qpp fixed upstream.

Changes from release notes:
* deprecated support for the non-published JSON-RPC 1.1 protocol
* added support for JSON-RPC 2.0
* added the JsonRpcConnection user module
* improved argument error messages with RPC calls in the
  JsonRpcHandler module
* fixed date serialization to use ISO-8601 format
  (instead of near-ISO-8601 format)
* parse_json() now ignores UTF-8 and Unicode BOMs at the
  start of passed JSON string
* fixed a bug in request logging in the JsonRpcHandler module
* fixed a bug serializing hash keys with embedded quotes

5 files changed, 129 insertions, 33 deletions

diff --git a/textproc/qore-json-module/Makefile b/textproc/qore-json-module/Makefile
index 83a1aef4816..c3e38697ef9 100644
--- a/textproc/qore-json-module/Makefile
+++ b/textproc/qore-json-module/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2018/01/28 16:24:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/06/08 19:53:30 nros Exp $
 
-DISTNAME=	qore-json-module-1.5
-PKGREVISION=	2
+DISTNAME=	qore-json-module-1.7
 CATEGORIES=	textproc
 MASTER_SITES=   ${MASTER_SITE_GITHUB:=qorelanguage/}
 EXTRACT_SUFX=   .tar.bz2
diff --git a/textproc/qore-json-module/PLIST b/textproc/qore-json-module/PLIST
index 4faa8d586d6..df27432fc61 100644
--- a/textproc/qore-json-module/PLIST
+++ b/textproc/qore-json-module/PLIST
@@ -1,13 +1,103 @@
-@comment $NetBSD: PLIST,v 1.2 2016/07/20 13:05:12 nros Exp $
-${QORE_USER_MODULE_DIR}/JsonRpcHandler.qm
+@comment $NetBSD: PLIST,v 1.3 2018/06/08 19:53:30 nros Exp $
 ${QORE_MODULE_DIR}/json-api-${QORE_LATEST_MODULE_API}.qmod
 share/doc/qore-json-module/COPYING.LGPL
 share/doc/qore-json-module/COPYING.MIT
+share/doc/qore-json-module/JsonRpcConnection/html/_json_rpc_connection_8qm_8dox_8h_source.html
+share/doc/qore-json-module/JsonRpcConnection/html/annotated.html
+share/doc/qore-json-module/JsonRpcConnection/html/annotated_dup.js
+share/doc/qore-json-module/JsonRpcConnection/html/bc_s.png
+share/doc/qore-json-module/JsonRpcConnection/html/bdwn.png
+share/doc/qore-json-module/JsonRpcConnection/html/class_json_rpc_connection_1_1_json_rpc_connection-members.html
+share/doc/qore-json-module/JsonRpcConnection/html/class_json_rpc_connection_1_1_json_rpc_connection.html
+share/doc/qore-json-module/JsonRpcConnection/html/class_json_rpc_connection_1_1_json_rpc_connection.js
+share/doc/qore-json-module/JsonRpcConnection/html/classes.html
+share/doc/qore-json-module/JsonRpcConnection/html/closed.png
+share/doc/qore-json-module/JsonRpcConnection/html/dir_1935124a1d355a6bc0fee3e0733e48ca.html
+share/doc/qore-json-module/JsonRpcConnection/html/doc.png
+share/doc/qore-json-module/JsonRpcConnection/html/doxygen.css
+share/doc/qore-json-module/JsonRpcConnection/html/doxygen.png
+share/doc/qore-json-module/JsonRpcConnection/html/dynsections.js
+share/doc/qore-json-module/JsonRpcConnection/html/folderclosed.png
+share/doc/qore-json-module/JsonRpcConnection/html/folderopen.png
+share/doc/qore-json-module/JsonRpcConnection/html/functions.html
+share/doc/qore-json-module/JsonRpcConnection/html/functions_func.html
+share/doc/qore-json-module/JsonRpcConnection/html/graph_legend.html
+share/doc/qore-json-module/JsonRpcConnection/html/graph_legend.md5
+share/doc/qore-json-module/JsonRpcConnection/html/graph_legend.png
+share/doc/qore-json-module/JsonRpcConnection/html/index.html
+share/doc/qore-json-module/JsonRpcConnection/html/index.qhp
+share/doc/qore-json-module/JsonRpcConnection/html/jquery.js
+share/doc/qore-json-module/JsonRpcConnection/html/menu.js
+share/doc/qore-json-module/JsonRpcConnection/html/menudata.js
+share/doc/qore-json-module/JsonRpcConnection/html/namespace_json_rpc_connection.html
+share/doc/qore-json-module/JsonRpcConnection/html/namespace_json_rpc_connection.js
+share/doc/qore-json-module/JsonRpcConnection/html/namespaces.html
+share/doc/qore-json-module/JsonRpcConnection/html/namespaces.js
+share/doc/qore-json-module/JsonRpcConnection/html/nav_f.png
+share/doc/qore-json-module/JsonRpcConnection/html/nav_g.png
+share/doc/qore-json-module/JsonRpcConnection/html/nav_h.png
+share/doc/qore-json-module/JsonRpcConnection/html/navtree.css
+share/doc/qore-json-module/JsonRpcConnection/html/navtree.js
+share/doc/qore-json-module/JsonRpcConnection/html/navtreedata.js
+share/doc/qore-json-module/JsonRpcConnection/html/navtreeindex0.js
+share/doc/qore-json-module/JsonRpcConnection/html/open.png
+share/doc/qore-json-module/JsonRpcConnection/html/resize.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_0.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_0.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_1.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_1.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_2.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_2.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_3.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_3.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_4.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_4.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_5.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_5.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_6.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/all_6.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/classes_0.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/classes_0.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/close.png
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_0.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_0.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_1.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_1.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_2.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_2.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_3.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_3.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_4.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/functions_4.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/groups_0.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/groups_0.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/mag_sel.png
+share/doc/qore-json-module/JsonRpcConnection/html/search/namespaces_0.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/namespaces_0.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/namespaces_1.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/namespaces_1.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/nomatches.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/pages_0.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/pages_0.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/search.css
+share/doc/qore-json-module/JsonRpcConnection/html/search/search.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/search_l.png
+share/doc/qore-json-module/JsonRpcConnection/html/search/search_m.png
+share/doc/qore-json-module/JsonRpcConnection/html/search/search_r.png
+share/doc/qore-json-module/JsonRpcConnection/html/search/searchdata.js
+share/doc/qore-json-module/JsonRpcConnection/html/search/variables_0.html
+share/doc/qore-json-module/JsonRpcConnection/html/search/variables_0.js
+share/doc/qore-json-module/JsonRpcConnection/html/splitbar.png
+share/doc/qore-json-module/JsonRpcConnection/html/sync_off.png
+share/doc/qore-json-module/JsonRpcConnection/html/sync_on.png
+share/doc/qore-json-module/JsonRpcConnection/html/tab_a.png
+share/doc/qore-json-module/JsonRpcConnection/html/tab_b.png
+share/doc/qore-json-module/JsonRpcConnection/html/tab_h.png
+share/doc/qore-json-module/JsonRpcConnection/html/tab_s.png
+share/doc/qore-json-module/JsonRpcConnection/html/tabs.css
 share/doc/qore-json-module/JsonRpcHandler/html/_json_rpc_handler_8qm_8dox_8h_source.html
 share/doc/qore-json-module/JsonRpcHandler/html/annotated.html
 share/doc/qore-json-module/JsonRpcHandler/html/annotated_dup.js
-share/doc/qore-json-module/JsonRpcHandler/html/arrowdown.png
-share/doc/qore-json-module/JsonRpcHandler/html/arrowright.png
 share/doc/qore-json-module/JsonRpcHandler/html/bc_s.png
 share/doc/qore-json-module/JsonRpcHandler/html/bdwn.png
 share/doc/qore-json-module/JsonRpcHandler/html/class_json_rpc_handler_1_1_json_rpc_handler-members.html
@@ -16,9 +106,6 @@ share/doc/qore-json-module/JsonRpcHandler/html/class_json_rpc_handler_1_1_json_r
 share/doc/qore-json-module/JsonRpcHandler/html/classes.html
 share/doc/qore-json-module/JsonRpcHandler/html/closed.png
 share/doc/qore-json-module/JsonRpcHandler/html/dir_1935124a1d355a6bc0fee3e0733e48ca.html
-share/doc/qore-json-module/JsonRpcHandler/html/dir_1935124a1d355a6bc0fee3e0733e48ca_dep.map
-share/doc/qore-json-module/JsonRpcHandler/html/dir_1935124a1d355a6bc0fee3e0733e48ca_dep.md5
-share/doc/qore-json-module/JsonRpcHandler/html/dir_1935124a1d355a6bc0fee3e0733e48ca_dep.png
 share/doc/qore-json-module/JsonRpcHandler/html/doc.png
 share/doc/qore-json-module/JsonRpcHandler/html/doxygen.css
 share/doc/qore-json-module/JsonRpcHandler/html/doxygen.png
@@ -34,6 +121,8 @@ share/doc/qore-json-module/JsonRpcHandler/html/graph_legend.png
 share/doc/qore-json-module/JsonRpcHandler/html/index.html
 share/doc/qore-json-module/JsonRpcHandler/html/index.qhp
 share/doc/qore-json-module/JsonRpcHandler/html/jquery.js
+share/doc/qore-json-module/JsonRpcHandler/html/menu.js
+share/doc/qore-json-module/JsonRpcHandler/html/menudata.js
 share/doc/qore-json-module/JsonRpcHandler/html/namespace_json_rpc_handler.html
 share/doc/qore-json-module/JsonRpcHandler/html/namespace_json_rpc_handler.js
 share/doc/qore-json-module/JsonRpcHandler/html/namespaces.html
@@ -61,6 +150,12 @@ share/doc/qore-json-module/JsonRpcHandler/html/search/all_5.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/all_5.js
 share/doc/qore-json-module/JsonRpcHandler/html/search/all_6.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/all_6.js
+share/doc/qore-json-module/JsonRpcHandler/html/search/all_7.html
+share/doc/qore-json-module/JsonRpcHandler/html/search/all_7.js
+share/doc/qore-json-module/JsonRpcHandler/html/search/all_8.html
+share/doc/qore-json-module/JsonRpcHandler/html/search/all_8.js
+share/doc/qore-json-module/JsonRpcHandler/html/search/all_9.html
+share/doc/qore-json-module/JsonRpcHandler/html/search/all_9.js
 share/doc/qore-json-module/JsonRpcHandler/html/search/classes_0.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/classes_0.js
 share/doc/qore-json-module/JsonRpcHandler/html/search/close.png
@@ -72,9 +167,17 @@ share/doc/qore-json-module/JsonRpcHandler/html/search/functions_2.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/functions_2.js
 share/doc/qore-json-module/JsonRpcHandler/html/search/functions_3.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/functions_3.js
+share/doc/qore-json-module/JsonRpcHandler/html/search/functions_4.html
+share/doc/qore-json-module/JsonRpcHandler/html/search/functions_4.js
+share/doc/qore-json-module/JsonRpcHandler/html/search/functions_5.html
+share/doc/qore-json-module/JsonRpcHandler/html/search/functions_5.js
+share/doc/qore-json-module/JsonRpcHandler/html/search/groups_0.html
+share/doc/qore-json-module/JsonRpcHandler/html/search/groups_0.js
 share/doc/qore-json-module/JsonRpcHandler/html/search/mag_sel.png
 share/doc/qore-json-module/JsonRpcHandler/html/search/namespaces_0.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/namespaces_0.js
+share/doc/qore-json-module/JsonRpcHandler/html/search/namespaces_1.html
+share/doc/qore-json-module/JsonRpcHandler/html/search/namespaces_1.js
 share/doc/qore-json-module/JsonRpcHandler/html/search/nomatches.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/pages_0.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/pages_0.js
@@ -88,6 +191,8 @@ share/doc/qore-json-module/JsonRpcHandler/html/search/variables_0.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/variables_0.js
 share/doc/qore-json-module/JsonRpcHandler/html/search/variables_1.html
 share/doc/qore-json-module/JsonRpcHandler/html/search/variables_1.js
+share/doc/qore-json-module/JsonRpcHandler/html/search/variables_2.html
+share/doc/qore-json-module/JsonRpcHandler/html/search/variables_2.js
 share/doc/qore-json-module/JsonRpcHandler/html/splitbar.png
 share/doc/qore-json-module/JsonRpcHandler/html/sync_off.png
 share/doc/qore-json-module/JsonRpcHandler/html/sync_on.png
@@ -98,8 +203,6 @@ share/doc/qore-json-module/JsonRpcHandler/html/tab_s.png
 share/doc/qore-json-module/JsonRpcHandler/html/tabs.css
 share/doc/qore-json-module/json/html/annotated.html
 share/doc/qore-json-module/json/html/annotated_dup.js
-share/doc/qore-json-module/json/html/arrowdown.png
-share/doc/qore-json-module/json/html/arrowright.png
 share/doc/qore-json-module/json/html/bc_s.png
 share/doc/qore-json-module/json/html/bdwn.png
 share/doc/qore-json-module/json/html/classQore_1_1Json_1_1JsonRpcClient-members.html
@@ -125,6 +228,8 @@ share/doc/qore-json-module/json/html/group__json__rpc__functions.html
 share/doc/qore-json-module/json/html/group__json__rpc__functions.js
 share/doc/qore-json-module/json/html/index.html
 share/doc/qore-json-module/json/html/jquery.js
+share/doc/qore-json-module/json/html/menu.js
+share/doc/qore-json-module/json/html/menudata.js
 share/doc/qore-json-module/json/html/modules.html
 share/doc/qore-json-module/json/html/modules.js
 share/doc/qore-json-module/json/html/namespaceQore.html
@@ -160,6 +265,8 @@ share/doc/qore-json-module/json/html/search/all_5.html
 share/doc/qore-json-module/json/html/search/all_5.js
 share/doc/qore-json-module/json/html/search/all_6.html
 share/doc/qore-json-module/json/html/search/all_6.js
+share/doc/qore-json-module/json/html/search/all_7.html
+share/doc/qore-json-module/json/html/search/all_7.js
 share/doc/qore-json-module/json/html/search/classes_0.html
 share/doc/qore-json-module/json/html/search/classes_0.js
 share/doc/qore-json-module/json/html/search/close.png
@@ -171,6 +278,8 @@ share/doc/qore-json-module/json/html/search/functions_2.html
 share/doc/qore-json-module/json/html/search/functions_2.js
 share/doc/qore-json-module/json/html/search/functions_3.html
 share/doc/qore-json-module/json/html/search/functions_3.js
+share/doc/qore-json-module/json/html/search/functions_4.html
+share/doc/qore-json-module/json/html/search/functions_4.js
 share/doc/qore-json-module/json/html/search/groups_0.html
 share/doc/qore-json-module/json/html/search/groups_0.js
 share/doc/qore-json-module/json/html/search/mag_sel.png
@@ -197,3 +306,5 @@ share/doc/qore-json-module/json/html/tab_b.png
 share/doc/qore-json-module/json/html/tab_h.png
 share/doc/qore-json-module/json/html/tab_s.png
 share/doc/qore-json-module/json/html/tabs.css
+${QORE_USER_MODULE_DIR}/JsonRpcConnection.qm
+${QORE_USER_MODULE_DIR}/JsonRpcHandler.qm
diff --git a/textproc/qore-json-module/buildlink3.mk b/textproc/qore-json-module/buildlink3.mk
index 73e60dc2726..d530ce13f39 100644
--- a/textproc/qore-json-module/buildlink3.mk
+++ b/textproc/qore-json-module/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2018/01/28 16:24:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/06/08 19:53:30 nros Exp $
 
 BUILDLINK_TREE+=	qore-json-module
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qore-json-module
 QORE_JSON_MODULE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qore-json-module+=	qore-json-module>=1.4
-BUILDLINK_ABI_DEPENDS.qore-json-module?=	qore-json-module>=1.5nb2
+BUILDLINK_ABI_DEPENDS.qore-json-module?=	qore-json-module>=1.7
 BUILDLINK_PKGSRCDIR.qore-json-module?=		../../textproc/qore-json-module
 
 .include "../../lang/qore/buildlink3.mk"
diff --git a/textproc/qore-json-module/distinfo b/textproc/qore-json-module/distinfo
index c8d003d7cdf..29b531c3c08 100644
--- a/textproc/qore-json-module/distinfo
+++ b/textproc/qore-json-module/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2017/10/12 18:38:47 nros Exp $
+$NetBSD: distinfo,v 1.5 2018/06/08 19:53:30 nros Exp $
 
-SHA1 (qore-json-module-1.5.tar.bz2) = d57041166648d8a6b2083e129e5bde6cda8a870d
-RMD160 (qore-json-module-1.5.tar.bz2) = 3e230f7c9e0fed96db0ad707a24af74c514a0411
-SHA512 (qore-json-module-1.5.tar.bz2) = 5b33fa47439090c798ac62a425e9bacd9bfae98b67e80781017cdf2b364a29c4d8cef04858fe2278828e68deb1d8511c2e4b782e35a6142013253ad8e4a91dd3
-Size (qore-json-module-1.5.tar.bz2) = 464088 bytes
-SHA1 (patch-src_ql__json.qpp) = 7067e0d4452329f1d9c5387aa6706b61249bdd0b
+SHA1 (qore-json-module-1.7.tar.bz2) = c90dec0efd068e36ec9504cadbdc557bfd5e0f83
+RMD160 (qore-json-module-1.7.tar.bz2) = 1eb0936c7bbf8a6820e38aaf2dfe5c5aa9724d72
+SHA512 (qore-json-module-1.7.tar.bz2) = 1fa4342964f21ac57ac666063390b033e4e6e9d0315191b11389e27d72c51b48a97bbeb56c4094b4d12bd103282b5dfe9eb3dbe08449e422c809f3ba0e13f824
+Size (qore-json-module-1.7.tar.bz2) = 628318 bytes
diff --git a/textproc/qore-json-module/patches/patch-src_ql__json.qpp b/textproc/qore-json-module/patches/patch-src_ql__json.qpp
deleted file mode 100644
index fc85b8d4bd0..00000000000
--- a/textproc/qore-json-module/patches/patch-src_ql__json.qpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_ql__json.qpp,v 1.1 2017/10/12 18:38:48 nros Exp $
-Fix build using c++11
---- src/ql_json.qpp.orig	2017-10-12 17:48:07.000000000 +0000
-+++ src/ql_json.qpp
-@@ -474,7 +474,7 @@ static int do_json_value(QoreString* str
-    if (vtype == NT_FLOAT) {
-       double f = v.getAsFloat();
-       // check for nan, +/-inf and serialize as null
--      if (isnan(f) || isinf(f))
-+      if (std::isnan(f) || std::isinf(f))
-          str->concat("null");
-       else
-          str->sprintf("%.20g", f);