# HG changeset patch

# User Rob Lemley <rob@thunderbird.net>

# Date 1663090875 0

#      Tue Sep 13 17:41:15 2022 +0000

# Node ID adfbf6378df82c8b2e087427a48ddc5cbe13aadd

# Parent  fbc2cf15893e40959b04d22c9efa4d424aeb5c4f

Bug 1790662 - Update json-c vendored source to 0.16. r=dandarnell

Differential Revision: https://phabricator.services.mozilla.com/D157961

diff --git a/comm/third_party/README.json-c b/comm/third_party/README.json-c

--- a/comm/third_party/README.json-c

+++ b/comm/third_party/README.json-c

@@ -1,19 +1,20 @@

-Directory ./json-c contains a copy of version 0.15 of the json-c library,

-which has been obtained from https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15-nodoc.tar.gz .

+Directory ./json-c contains a copy of version 0.16 of the json-c library,

+which has been obtained from https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16-nodoc.tar.gz .

 (Link at https://github.com/json-c/json-c/wiki).

 For licensing information, please refer to the included documentation.

 The SHA256SUM of the imported file is:

-99bca4f944b8ced8ae0bbc6310d6a3528ca715e69541793a1ef51f8c5b4b0878  json-c-0.15-nodoc.tar.gz

+ac8a3dd6820daaca579b23fbc74664310fbc3d67f52f6707cda67d21dde5570f  json-c-0.16-nodoc.tar.gz

 The following files and directories were removed from the source distribution's root:

 .github/

 apps/

 bench/

 cmake/

+doc/

 fuzz/

 tests/

 .clang-format

 .editorconfig

 .gitignore

@@ -21,10 +22,12 @@ tests/

 Android.configure.mk

 CMakeLists.txt

 README

 appveyor.yml

 cmake-configure

+issues_closed_for_0.{13,14,15,16}.md

+json_config.h.win32

 json-c.pc.in

 json-c.sym

 The following files were added to the source's root by MZLA Technologies:

 config.h.in (modified copy from cmake/config.h.in)

diff --git a/comm/third_party/json-c/AUTHORS b/comm/third_party/json-c/AUTHORS

--- a/comm/third_party/json-c/AUTHORS

+++ b/comm/third_party/json-c/AUTHORS

@@ -1,30 +1,61 @@

+Alan Coopersmith <alan.coopersmith@oracle.com>

 Alexander Dahl <post@lespocky.de>

+Alexandru Ardelean <ardeleanalex@gmail.com>

 andy5995 <andy400-dev@yahoo.com>

+Aram Poghosyan <Aram.Poghosyan@teamviewer.com>

 Björn Esser <besser82@fedoraproject.org>

+BonsaY <bonsay@posteo.de>

 changyong guo <guo1487@163.com>

 chenguoping <chenguopingdota@163.com>

+Chris Lamb <lamby@debian.org>

 Christopher Head <chead@chead.ca>

 Chris Wolfe <chriswwolfe@gmail.com>

 C. Watford (christopher.watford@gmail.com)

 Darjan Krijan <darjan_krijan@gmx.de>

+David McCann <mccannd@uk.ibm.com>

+DeX77 <dex@dragonslave.de>

+dota17 <chenguopingdota@163.com>

+Eric Haszlakiewicz <erh+git@nimenees.com>

 Eric Hawicz <erh+git@nimenees.com>

+Even Rouault <even.rouault@spatialys.com>

+Gianluigi Tiesi <sherpya@netfarm.it>

 grdowns <grdowns@microsoft.com>

+Hex052 <elijahiff@gmail.com>

+hofnarr <hofnarr@hofnarr.fi>

+ihsinme <61293369+ihsinme@users.noreply.github.com>

 Ivan Romanov <drizt@land.ru>

 Jaap Keuter <jaap.keuter@xs4all.nl>

+Jakov Smolic <jakov.smolic@sartura.hr>

 janczer <menshikov.ivn@gmail.com>

 Jehan <jehan@girinstud.io>

 Jehiah Czebotar <jehiah@gmail.com>

 Jonathan Wiens <j.wiens@teles.com>

 Jose Bollo <jose.bollo@iot.bzh>

+José Bollo <jose.bollo@iot.bzh>

+Juuso Alasuutari <juuso.alasuutari@gmail.com>

 Keith Holman <keith.holman@windriver.com>

+Kizuna-Meraki <z9@kizunameraki.de>

+Leon Gross <leon.gross@rub.de>

 Liang, Gao <liang.gao@intel.com>

+Marc <34656315+MarcT512@users.noreply.github.com>

 max <mpano91@gmail.com>

+Micah Snyder <micasnyd@cisco.com>

 Michael Clark <michael@metaparadigm.com>

 myd7349 <myd7349@gmail.com>

+Pascal Cuoq <cuoq@trust-in-soft.com>

+Pawday <pawday@mail.ru>

+Philosoph228 <philosoph228@gmail.com>

 Pierce Lopez <pierce.lopez@gmail.com>

 Po-Chuan Hsieh <sunpoet@sunpoet.net>

 Ramiro Polla <ramiro.polla@gmail.com>

 Rikard Falkeborn <rikard.falkeborn@gmail.com>

+Robert Bielik <robert.bielik@dirac.com>

 Robert <roby_p97@yahoo.com>

+Rosen Penev <rosenp@gmail.com>

 Rubasri Kalidas <rubasri.kalidas@intel.com>

+Simon McVittie <smcv@collabora.com>

+ssrlive <30760636+ssrlive@users.noreply.github.com>

+Tobias Nießen <tniessen@users.noreply.github.com>

+Tobias Stoeckmann <tobias@stoeckmann.org>

+Tudor Brindus <me@tbrindus.ca>

 Unmanned Player <36690541+unmanned-player@users.noreply.github.com>

diff --git a/comm/third_party/json-c/ChangeLog b/comm/third_party/json-c/ChangeLog

--- a/comm/third_party/json-c/ChangeLog

+++ b/comm/third_party/json-c/ChangeLog

@@ -1,8 +1,62 @@

-Next Release 0.15

-=====================

+0.16 (up to commit 66dcdf5, 2022-04-13)

+========================================

+

+Deprecated and removed features:

+--------------------------------

+* JSON_C_OBJECT_KEY_IS_CONSTANT is deprecated in favor of

+  JSON_C_OBJECT_ADD_CONSTANT_KEY

+* Direct access to lh_table and lh_entry structure members is deprecated.  

+  Use access functions instead, lh_table_head(), lh_entry_next(), etc...

+* Drop REFCOUNT_DEBUG code.

+

+New features

+------------

+* The 0.16 release introduces no new features

+

+Build changes

+-------------

+* Add a DISABLE_EXTRA_LIBS option to skip using libbsd

+* Add a DISABLE_JSON_POINTER option to skip compiling in json_pointer support.

+

+Significant changes and bug fixes

+---------------------------------

+* Cap string length at INT_MAX to avoid various issues with very long strings.

+* json_object_deep_copy: fix deep copy of strings containing '\0'

+* Fix read past end of buffer in the "json_parse" command

+* Avoid out of memory accesses in the locally provided vasprintf() function

+  (for those platforms that use it)

+* Handle allocation failure in json_tokener_new_ex

+* Fix use-after-free in json_tokener_new_ex() in the event of printbuf_new() returning NULL

+* printbuf_memset(): set gaps to zero - areas within the print buffer which

+  have not been initialized by using printbuf_memset

+* printbuf: return -1 on invalid arguments (len < 0 or total buffer > INT_MAX)

+* sprintbuf(): propagate printbuf_memappend errors back to the caller

+

+Optimizations

+--------------

+* Speed up parsing by replacing ctype functions with simplified, faster 

+  non-locale-sensitive ones in json_tokener and json_object_to_json_string.

+* Neither vertical tab nor formfeed are considered whitespace per the JSON spec

+* json_object: speed up creation of objects, calloc() -> malloc() + set fields

+* Avoid needless extra strlen() call in json_c_shallow_copy_default() and

+  json_object_equal() when the object is known to be a json_type_string.

+

+Other changes

+-------------

+* Validate size arguments in arraylist functions.

+* Use getrandom() if available; with GRND_NONBLOCK to allow use of json-c

+  very early during boot, such as part of cryptsetup.

+* Use arc4random() if it's available.

+* random_seed: on error, continue to next method instead of exiting the process

+* Close file when unable to read from /dev/urandom in get_dev_random_seed()

+

+***

+

+0.15 (up to commit 870965e, 2020/07/26)

+========================================

 Deprecated and removed features:

 --------------------------------

 * Deprecate `array_list_new()` in favor of `array_list_new2()`

 * Remove the THIS_FUNCTION_IS_DEPRECATED define.

@@ -57,11 +111,11 @@ Significant changes and bug fixes

 Other changes

 -------------

 * #589 - Detect broken RDRAND during initialization; also, fix segfault

     in the CPUID check.

 * #592 - Fix integer overflows to prevert out of bounds write on large input.

-* Protect against division by zero in linkhash, when creaed with zero size.

+* Protect against division by zero in linkhash, when created with zero size.

 * #602 - Fix json_parse_uint64() internal error checking, leaving the retval

     untouched in more failure cases.

 * #614 - Prevent truncation when custom double formatters insert extra \0's

@@ -183,11 +237,11 @@ Behavior changes:

 	 See commit 99d8fc

 * Use size_t for array length and size.  Platforms where sizeof(size_t) != sizeof(int) may not be backwards compatible

 	See commits 45c56b, 92e9a5 and others.

-* Check for failue when allocating memory, returning NULL and errno=ENOMEM.

+* Check for failure when allocating memory, returning NULL and errno=ENOMEM.

 	 See commit 2149a04.

 * Change json_object_object_add() return type from void to int, and will return -1 on failures, instead of exiting. (Note: this is not an ABI change)

 New features:

@@ -374,11 +428,11 @@ 0.10

   * Add json_object_object_get_ex(), a NULL-safe get object method, to be able

      to distinguish between a key not present and the value being NULL.

   * Add an alternative iterator implementation, see json_object_iterator.h

   * Make json_object_iter public to enable external use of the

      json_object_object_foreachC macro.

-  * Add a printbuf_memset() function to provide an effecient way to set and

+  * Add a printbuf_memset() function to provide an efficient way to set and

      append things like whitespace indentation.

   * Adjust json_object_is_type and json_object_get_type so they return

       json_type_null for NULL objects and handle NULL passed to

       json_objct_object_get().

   * Rename boolean type to json_bool.

@@ -460,11 +514,11 @@ 0.8

     Geoffrey Young, geoff at modperlcookbook dot org

 0.7

 ===

   * Add escaping of backslash to json output

-  * Add escaping of foward slash on tokenizing and output

+  * Add escaping of forward slash on tokenizing and output

   * Changes to internal tokenizer from using recursion to

     using a depth state structure to allow incremental parsing

 0.6

 ===

diff --git a/comm/third_party/json-c/README.html b/comm/third_party/json-c/README.html

--- a/comm/third_party/json-c/README.html

+++ b/comm/third_party/json-c/README.html

@@ -24,16 +24,16 @@

 		
msbuild "json-c.vcxproj" /m /verbosity:normal /p:OutDir=lib\

 		
Or, open the project in Visual Studio

 		
Documentation

-		
Doxygen generated documentation exists here.

+		
Doxygen generated documentation exists here.

 		
GIT Reposository

 		
git clone https://github.com/json-c/json-c.git

-		
Mailing List

+		
Mailing List

                 <pi>Send email to json-c <at> googlegroups <dot> com

 		
License

 		
This program is free software; you can redistribute it and/or modify it under the terms of the MIT License.

diff --git a/comm/third_party/json-c/README.md b/comm/third_party/json-c/README.md

--- a/comm/third_party/json-c/README.md

+++ b/comm/third_party/json-c/README.md

@@ -14,32 +14,39 @@ 6. [Linking to libjson-c](#linking)

 7. [Using json-c](#using)

 JSON-C - A JSON implementation in C 

 -----------------------------------

+JSON-C implements a reference counting object model that allows you to easily

+construct JSON objects in C, output them as JSON formatted strings and parse

+JSON formatted strings back into the C representation of JSON objects.

+It aims to conform to [RFC 7159](https://tools.ietf.org/html/rfc7159).

+

+Skip down to [Using json-c](#using)

+or check out the [API docs](https://json-c.github.io/json-c/),

+if you already have json-c installed and ready to use.

+

+Home page for json-c: https://github.com/json-c/json-c/wiki

+

 Build Status

 * [AppVeyor Build](https://ci.appveyor.com/project/hawicz/json-c) ![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/json-c/json-c?branch=master&svg=true)

 * [Travis Build](https://travis-ci.org/json-c/json-c) ![Travis Build Status](https://travis-ci.org/json-c/json-c.svg?branch=master)

 Test Status

 * [Coveralls](https://coveralls.io/github/json-c/json-c?branch=master) [![Coverage Status](https://coveralls.io/repos/github/json-c/json-c/badge.svg?branch=master)](https://coveralls.io/github/json-c/json-c?branch=master)

-JSON-C implements a reference counting object model that allows you to easily

-construct JSON objects in C, output them as JSON formatted strings and parse

-JSON formatted strings back into the C representation of JSON objects.

-It aims to conform to [RFC 7159](https://tools.ietf.org/html/rfc7159).

-

 Building on Unix with `git`, `gcc` and `cmake` 

 --------------------------------------------------

-Home page for json-c: https://github.com/json-c/json-c/wiki

+If you already have json-c installed, see [Linking to `libjson-c`](#linking)

+for how to build and link your program against it.

 ### Prerequisites: 

  - `gcc`, `clang`, or another C compiler

- - cmake>=2.8, >=3.16 recommended

+ - `cmake>=2.8`, `>=3.16` recommended, `cmake=>3.1` for tests

 To generate docs you'll also need:

  - `doxygen>=1.8.13`

 If you are on a relatively modern system, you'll likely be able to install

@@ -78,11 +85,11 @@ Then:

 ```

 ### Generating documentation with Doxygen:

-The libray documentation can be generated directly from the source codes using Doxygen tool:

+The library documentation can be generated directly from the source code using Doxygen tool:

 ```sh

 # in build directory

 make doc

 google-chrome doc/html/index.html

@@ -184,11 +191,11 @@ make USE_VALGRIND=0 test   # optionally 

 If a test fails, check `Testing/Temporary/LastTest.log`,

 `tests/testSubDir/${testname}/${testname}.vg.out`, and other similar files.

 If there is insufficient output try:

 ```sh

-VERBOSE=1 make test

+VERBOSE=1 CTEST_OUTPUT_ON_FAILURE=1 make test

 ```

 or

 ```sh

 JSONC_TEST_TRACE=1 make test

 ```

@@ -218,42 +225,59 @@ then you can just add this to your `make

 ```make

 CFLAGS += $(shell pkg-config --cflags json-c)

 LDFLAGS += $(shell pkg-config --libs json-c)

 ```

-Without `pkgconfig`, you would do something like this:

+Without `pkgconfig`, you might do something like this:

 ```make

 JSON_C_DIR=/path/to/json_c/install

 CFLAGS += -I$(JSON_C_DIR)/include/json-c

+# Or to use lines like: #include <json-c/json_object.h>

+#CFLAGS += -I$(JSON_C_DIR)/include

 LDFLAGS+= -L$(JSON_C_DIR)/lib -ljson-c

 ```

+If your project uses cmake:

+

+* Add to your CMakeLists.txt file:

+

+```cmake

+find_package(json-c CONFIG)

+target_link_libraries(${PROJECT_NAME} PRIVATE json-c::json-c)

+```

+

+* Then you might run in your project:

+

+```sh

+cd build

+cmake -DCMAKE_PREFIX_PATH=/path/to/json_c/install/lib64/cmake ..

+```

 Using json-c 

 ------------

-To use json-c you can either include json.h, or preferrably, one of the

+To use json-c you can either include json.h, or preferably, one of the

 following more specific header files:

 * json_object.h  - Core types and methods.

 * json_tokener.h - Methods for parsing and serializing json-c object trees.

 * json_pointer.h - JSON Pointer (RFC 6901) implementation for retrieving

                    objects from a json-c object tree.

 * json_object_iterator.h - Methods for iterating over single json_object instances.  (See also `json_object_object_foreach()` in json_object.h)

 * json_visit.h   - Methods for walking a tree of json-c objects.

-* json_util.h    - Miscelleanous utility functions.

+* json_util.h    - Miscellaneous utility functions.

-For a full list of headers see [files.html](http://json-c.github.io/json-c/json-c-current-release/doc/html/files.html)

+For a full list of headers see [files.html](https://json-c.github.io/json-c/json-c-current-release/doc/html/files.html)

 The primary type in json-c is json_object.  It describes a reference counted

 tree of json objects which are created by either parsing text with a

 json_tokener (i.e. `json_tokener_parse_ex()`), or by creating

 (with `json_object_new_object()`, `json_object_new_int()`, etc...) and adding

 (with `json_object_object_add()`, `json_object_array_add()`, etc...) them 

 individually.

-Typically, every object in the tree will have one reference, from it's parent.

+Typically, every object in the tree will have one reference, from its parent.

 When you are done with the tree of objects, you call json_object_put() on just

 the root object to free it, which recurses down through any child objects

 calling json_object_put() on each one of those in turn.

 You can get a reference to a single child 

@@ -264,11 +288,11 @@ increment the child's refcount (`json_ob

 the parent being freed or it being removed from its parent

 (`json_object_object_del()` or `json_object_array_del_idx()`)

 When parsing text, the json_tokener object is independent from the json_object

 that it returns.  It can be allocated (`json_tokener_new()`)

-used ones or multiple times (`json_tokener_parse_ex()`, and

+used one or multiple times (`json_tokener_parse_ex()`, and

 freed (`json_tokener_free()`) while the json_object objects live on.

 A json_object tree can be serialized back into a string with 

 `json_object_to_json_string_ext()`.  The string that is returned 

 is only valid until the next "to_json_string" call on that same object.

diff --git a/comm/third_party/json-c/RELEASE_CHECKLIST.txt b/comm/third_party/json-c/RELEASE_CHECKLIST.txt

--- a/comm/third_party/json-c/RELEASE_CHECKLIST.txt

+++ b/comm/third_party/json-c/RELEASE_CHECKLIST.txt

@@ -18,11 +18,18 @@

         * https://github.com/lvc/abi-compliance-checker

         * If the new release is not backwards compatible, then this is a MAJOR release.

         * Mention removed features in ChangeLog

 		* Consider re-adding backwards compatible support, through symbol

 		  aliases and appropriate entries in json-c.sym

+		* Be sure any new symbols are listed in json-c.sym as part of

+		  the _new_ release version.

     * Update the AUTHORS file

+

+        PREV=$(git tag | tail -1)

+        ( git log -r ${PREV}..HEAD | grep Author: | sed -e's/Author: //' ; cat AUTHORS ) | sort -u > A1

+        mv A1 AUTHORS

+

     * Exclude mentioning changes that have already been included in a point 

       release of the previous release branch.

 * Update ChangeLog with relevant notes before branching.

@@ -31,18 +38,18 @@

 * Check that the compile works on Windows - automatic through AppVeyor

 ## Release creation

 Start creating the new release:

-    release=0.15

+    release=0.16

     git clone https://github.com/json-c/json-c json-c-${release}

     mkdir distcheck

     cd distcheck

     # Note, the build directory *must* be entirely separate from

     # the source tree for distcheck to work properly.

-    cmake ../json-c-${release}

+    cmake -DCMAKE_BUILD_TYPE=Release ../json-c-${release}

     make distcheck

     cd ..

 Make any fixes/changes *before* branching.

@@ -53,11 +60,10 @@ Make any fixes/changes *before* branchin

 ------------

 Using ${release}:

 	Update the version in json_c_version.h

 	Update the version in CMakeLists.txt (VERSION in the project(...) line)

-	Update the version in config.h.win32 (several places)

 Update the set_target_properties() line in CmakeLists.txt to set the shared

 library version.  Generally, unless we're doing a major release, change:

 	VERSION x.y.z

 to

@@ -72,23 +78,25 @@ If we're doing a major release (SONAME b

 ------------

 Generate the doxygen documentation:

-    doxygen

+    (cd ../distcheck && make doc)

+    cp -r -p ../distcheck/doc/{html,Doxyfile} doc/.

+	rm doc/Doxyfile   # Remove generated file w/ hardcoded paths

     git add -f doc

-    git commit doc

+    git commit doc -m "Generate docs for the ${release} release"

 ------------

 Create the release tarballs:

     cd ..

     echo .git > excludes

     tar -czf json-c-${release}.tar.gz -X excludes json-c-${release}

-    echo doc >> excludes

+    echo 'doc/*' >> excludes

     tar -czf json-c-${release}-nodoc.tar.gz -X excludes json-c-${release}

 ------------

 Tag the branch:

@@ -102,11 +110,11 @@ Tag the branch:

 ------------

 Go to Amazon S3 service at:

     https://console.aws.amazon.com/s3/

-Upload the two tarballs in the json-c_releases folder.

+Upload the two tarballs in the json-c_releases/releases folder.

 	When uploading, use "Standard" storage class, and make the uploaded files publicly accessible.

 Logout of Amazon S3, and verify that the files are visible.

     https://s3.amazonaws.com/json-c_releases/releases/index.html

@@ -119,17 +127,18 @@ Post-release checklist:

 Add new section to ChangeLog for ${release}+1

 Use ${release}.99 to indicate a version "newer" than anything on the branch:

 	Update the version in json_c_version.h

 	Update the version in CMakeLists.txt

-	Update the version in config.h.win32

 Update RELEASE_CHECKLIST.txt, set release=${release}+1

+Add a new empty section to the json-c.sym file, for ${release}+1

+

 Update the set_target_properties() line in CmakeLists.txt to match the release branch.

-    git commit -a -m "Update the master branch to version 0.${release}.99"

+    git commit -a -m "Update the master branch to version ${release}.99"

     git push

 ------------

 Update the gh-pages branch with new docs:

@@ -141,10 +150,12 @@ Update the gh-pages branch with new docs

     git clone -b gh-pages https://github.com/json-c/json-c json-c-pages

     cd json-c-pages

     mkdir json-c-${release}

     cp -R ../json-c-${release}/doc json-c-${release}/.

     git add json-c-${release}

+    rm json-c-current-release

+    ln -s json-c-${release} json-c-current-release

     git commit -a -m "Add the ${release} docs."

     vi index.html

     # Add/change links to current release.

diff --git a/comm/third_party/json-c/arraylist.c b/comm/third_party/json-c/arraylist.c

--- a/comm/third_party/json-c/arraylist.c

+++ b/comm/third_party/json-c/arraylist.c

@@ -43,10 +43,12 @@ struct array_list *array_list_new(array_

 struct array_list *array_list_new2(array_list_free_fn *free_fn, int initial_size)

 {

 	struct array_list *arr;

+	if (initial_size < 0 || (size_t)initial_size >= SIZE_T_MAX / sizeof(void *))

+		return NULL;

 	arr = (struct array_list *)malloc(sizeof(struct array_list));

 	if (!arr)

 		return NULL;

 	arr->size = initial_size;

 	arr->length = 0;

@@ -104,10 +106,12 @@ static int array_list_expand_internal(st

 int array_list_shrink(struct array_list *arr, size_t empty_slots)

 {

 	void *t;

 	size_t new_size;

+	if (empty_slots >= SIZE_T_MAX / sizeof(void *) - arr->length)

+		return -1;

 	new_size = arr->length + empty_slots;

 	if (new_size == arr->size)

 		return 0;

 	if (new_size > arr->size)

 		return array_list_expand_internal(arr, new_size);

diff --git a/comm/third_party/json-c/arraylist.h b/comm/third_party/json-c/arraylist.h

--- a/comm/third_party/json-c/arraylist.h

+++ b/comm/third_party/json-c/arraylist.h

@@ -13,12 +13,12 @@

  * @file

  * @brief Internal methods for working with json_type_array objects.

  *        Although this is exposed by the json_object_get_array() method,

  *        it is not recommended for direct use.

  */

-#ifndef _arraylist_h_

-#define _arraylist_h_

+#ifndef _json_c_arraylist_h_

+#define _json_c_arraylist_h_

 #ifdef __cplusplus

 extern "C" {

 #endif

diff --git a/comm/third_party/json-c/config.h.in b/comm/third_party/json-c/config.h.in

--- a/comm/third_party/json-c/config.h.in

+++ b/comm/third_party/json-c/config.h.in

@@ -55,10 +55,13 @@

 #undef HAVE_SYS_CDEFS_H

 /* Define to 1 if you have the <sys/param.h> header file. */

 #undef HAVE_SYS_PARAM_H

+/* Define to 1 if you have the <sys/random.h> header file. */

+#undef HAVE_SYS_RANDOM_H

+

 /* Define to 1 if you have the <sys/resource.h> header file. */

 #undef HAVE_SYS_RESOURCE_H

 /* Define to 1 if you have the <sys/stat.h> header file. */

 #undef HAVE_SYS_STAT_H

@@ -70,10 +73,16 @@

 #undef HAVE_UNISTD_H

 /* Define to 1 if you have the <xlocale.h> header file. */

 #undef HAVE_XLOCALE_H

+/* Define to 1 if you have the <bsd/stdlib.h> header file. */

+#undef HAVE_BSD_STDLIB_H

+

+/* Define to 1 if you have `arc4random' */

+#undef HAVE_ARC4RANDOM

+

 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */

 #undef HAVE_DOPRNT

 /* Has atomic builtins */

 #undef HAVE_ATOMIC_BUILTINS

@@ -139,10 +148,13 @@

 #undef HAVE_VSNPRINTF

 /* Define to 1 if you have the `vsyslog' function. */

 #undef HAVE_VSYSLOG

+/* Define if you have the `getrandom' function. */

+#undef HAVE_GETRANDOM

+

 /* Define if you have the `getrusage' function. */

 #undef HAVE_GETRUSAGE

 /* Have __thread */

 #undef HAVE___THREAD

diff --git a/comm/third_party/json-c/debug.h b/third_party/json-c/deb/commug.h

--- a/comm/third_party/json-c/debug.h

+++ b/comm/third_party/json-c/debug.h

@@ -12,21 +12,21 @@

 /**

  * @file

  * @brief Do not use, json-c internal, may be changed or removed at any time.

  */

-#ifndef _DEBUG_H_

-#define _DEBUG_H_

+#ifndef _JSON_C_DEBUG_H_

+#define _JSON_C_DEBUG_H_

 #include <stdlib.h>

 #ifdef __cplusplus

 extern "C" {

 #endif

 #ifndef JSON_EXPORT

-#if defined(_MSC_VER)

+#if defined(_MSC_VER) && defined(JSON_C_DLL)

 #define JSON_EXPORT __declspec(dllexport)

 #else

 #define JSON_EXPORT extern

 #endif

 #endif

diff --git a/comm/third_party/json-c/issues_closed_for_0.13.md b/comm/third_party/json-c/issues_closed_for_0.13.md

deleted file mode 100644

--- a/comm/third_party/json-c/issues_closed_for_0.13.md

+++ /dev/null

@@ -1,270 +0,0 @@

-

-This list was created with:

-

-```

-curl https://api.github.com/search/issues?q="repo%3Ajson-c%2Fjson-c+closed%3A>2014-04-10+created%3A<2017-12-01&sort=created&order=asc&per_page=400&page=1" > issues1.out

-curl https://api.github.com/search/issues?q="repo%3Ajson-c%2Fjson-c+closed%3A>2014-04-10+created%3A<2017-12-01&sort=created&order=asc&per_page=400&page=2" > issues2.out

-curl https://api.github.com/search/issues?q="repo%3Ajson-c%2Fjson-c+closed%3A>2014-04-10+created%3A<2017-12-01&sort=created&order=asc&per_page=400&page=3" > issues3.out

-jq -r '.items[] | "[" + .title + "](" + .url + ")" | tostring' issues?.out  > issues.md

-sed -e's,^\[ *\(.*\)\](https://api.github.com/.*/\([0-9].*\)),[Issue #\2](https://github.com/json-c/json-c/issues/\2) - \1,' -i issues.md

-#... manual editing ...

-```

-

-----

-

-Issues and Pull Requests closed for the 0.13 release

-(since commit f84d9c, the 0.12 branch point, 2014-04-10)

-

-

-* [Issue #61](https://github.com/json-c/json-c/issues/61) - Make json_object_object_add() indicate success or failure, test fix \

-* [Issue #113](https://github.com/json-c/json-c/issues/113) - Build fixes (make dist and make distcheck) \

-* [Issue #124](https://github.com/json-c/json-c/issues/124) - Fixing build \

-* [Issue #125](https://github.com/json-c/json-c/issues/125) - Fix compile error(variable size set but not used) on g++4.6 \

-* [Issue #126](https://github.com/json-c/json-c/issues/126) - Removed unused size variable. \

-* [Issue #127](https://github.com/json-c/json-c/issues/127) - remove unused `size` variable \

-* [Issue #128](https://github.com/json-c/json-c/issues/128) - Remove unused variable from json_tokenizer.c \

-* [Issue #130](https://github.com/json-c/json-c/issues/130) - Failed to compile under Ubuntu 13.10 32bit \

-* [Issue #131](https://github.com/json-c/json-c/issues/131) - undefined symbol: __sync_val_compare_and_swap_4 \

-* [Issue #132](https://github.com/json-c/json-c/issues/132) - Remove unused variable 'size' \

-* [Issue #133](https://github.com/json-c/json-c/issues/133) - Update and rename README to README.md \

-* [Issue #134](https://github.com/json-c/json-c/issues/134) - Must remove variable size... \

-* [Issue #135](https://github.com/json-c/json-c/issues/135) - bits.h uses removed json_tokener_errors\[error\] \

-* [Issue #136](https://github.com/json-c/json-c/issues/136) - Error when running make check \

-* [Issue #137](https://github.com/json-c/json-c/issues/137) - config.h.in should not be in git \

-* [Issue #138](https://github.com/json-c/json-c/issues/138) - Can't build on RHEL 6.5 due to dependency on automake-1.14 \

-* [Issue #140](https://github.com/json-c/json-c/issues/140) - Code bug in random_test.c evaluating same expression twice \

-* [Issue #141](https://github.com/json-c/json-c/issues/141) - Removed duplicate check in random_seed test - bug #140 \

-* [Issue #142](https://github.com/json-c/json-c/issues/142) - Please undeprecate json_object_object_get \

-* [Issue #144](https://github.com/json-c/json-c/issues/144) - Introduce json_object_from_fd \

-* [Issue #145](https://github.com/json-c/json-c/issues/145) - Handle % character properly \

-* [Issue #146](https://github.com/json-c/json-c/issues/146) - TAGS rename \

-* [Issue #148](https://github.com/json-c/json-c/issues/148) - Bump the soname \

-* [Issue #149](https://github.com/json-c/json-c/issues/149) - SONAME bump \

-* [Issue #150](https://github.com/json-c/json-c/issues/150) - Fix build using MinGW. \

-* [Issue #151](https://github.com/json-c/json-c/issues/151) - Remove json_type enum trailing comma \

-* [Issue #152](https://github.com/json-c/json-c/issues/152) - error while compiling json-c library version 0.11 \

-* [Issue #153](https://github.com/json-c/json-c/issues/153) - improve doc for json_object_to_json_string() \