From: Adolf Belka Date: Fri, 3 Jul 2026 19:41:27 +0000 (+0200) Subject: json-c: Update to version 0.19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=295d87133ccf2f365252edbdeead6708e1b6ea87;p=ipfire-2.x.git json-c: Update to version 0.19 - Update from version 0.18 to 0.19 - Update of rootfile - Removal of cmake patch as now included in the tarball. - Changelog 0.19 New features * Add support for Commodore Amiga and MorphOS * Allow builds with CMake 4 - sync minimum version across all CMakeLists.txt files * Update openssl command to work for newer versions of openssl. * Add support for building json-c with meson * Support MSVC in packages that use GNU Autoconf. * Add VERSIONINFO to libjson-c.dll * Make json_tokener_free(NULL) a no-op, to simplify cleanup paths. * Explicitly handle NaN values when converting to int * Set errno=RANGE in json_object_get_int/int64/uint64() when the source value can't be represented in the target type. * Make json_parse a bit more useful by adding -u (validate UTF8) and -P (specify arbitrary tokener parse flags), and read from stdin if no filename is provided. * Fix the apps/json_parse "-s" (strict) option so it actually does something, and default to non-strict. Significant changes and bug fixes * Issue #867 - also disallow control characters in keys in JSON_TOKENER_STRICT mode * Issue #875: cast to unsigned char so bytes above 0x7f aren't interpreted as negative, which was causing the strict-mode control characters check to incorrectly trigger. * Issue #881: don't allow json_tokener_new_ex() with a depth < 1 * Fix linkhash breaking -std=c89 * Fixing Cmake build when using clang-cl, avoids errors about redefining existing symbols * Fix AIX build failure - Add CMake detection for getopt.h * Fix bug involving supplemental code points that look like high surrogates * Fix runtime issue with test_util_file.c in Windows (add O_BINARY) * Fix macro WIN32_LEAN_AND_MEAN redefined * Issue #914: Fix Memory usage regression due to newlocale() on macOS * Issue #916: Fix OOM via large array index in json_pointer_set * Issue #923: Avoid stack recursion in json_object_put() * Issue #927: CVE-2026-9146 - update json_object_iterator documentation * Issue #929: CVE-2026-11322 - fix information disclosure bug in apps/json_parse (not installed by default) * Issue #930: fix locale-dependent strtod in json_object_get_double * Issue #931: deep copy values in json_patch copy op to avoid aliasing and cycles Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/json-c b/config/rootfiles/common/json-c index dbf87f32c..c92c46937 100644 --- a/config/rootfiles/common/json-c +++ b/config/rootfiles/common/json-c @@ -21,5 +21,5 @@ #usr/lib/cmake/json-c/json-c-targets.cmake #usr/lib/libjson-c.so usr/lib/libjson-c.so.5 -usr/lib/libjson-c.so.5.4.0 +usr/lib/libjson-c.so.5.5.0 #usr/lib/pkgconfig/json-c.pc diff --git a/lfs/json-c b/lfs/json-c index 2669e3825..b988e0b0f 100644 --- a/lfs/json-c +++ b/lfs/json-c @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2025 IPFire Team # +# Copyright (C) 2007-2026 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 0.18 +VER = 0.19 THISAPP = json-c-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d39bab289976cb2f76bcf3ad8254f7f5b4d11e2aa4dedebd60dc7d131a3f6ec57beacdc575aeeb191cf449d16c549d424172e78464731eeb66305f47f72371c2 +$(DL_FILE)_BLAKE2 = 9d0d96520f6c3f8708d2ff3dd98de49b34982b88e8b3eecd5bb706a2fbca0dd79b23a40b4e30efb6162dd96ffaf986580814826627dda4719e61b727402911c7 install : $(TARGET) @@ -73,7 +73,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/json-c-0.18_allow_build_with_cmake_4.0.0.patch cd $(DIR_APP) && mkdir -pv build cd $(DIR_APP)/build && cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/src/patches/json-c-0.18_allow_build_with_cmake_4.0.0.patch b/src/patches/json-c-0.18_allow_build_with_cmake_4.0.0.patch deleted file mode 100644 index faff25de5..000000000 --- a/src/patches/json-c-0.18_allow_build_with_cmake_4.0.0.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- json-c-0.18/apps/CMakeLists.txt.orig 2024-09-15 18:15:01.000000000 +0200 -+++ json-c-0.18/apps/CMakeLists.txt 2025-05-06 19:08:35.807635404 +0200 -@@ -1,5 +1,5 @@ - --cmake_minimum_required(VERSION 2.8) # see ../CMakeLists.txt for why 2.8 -+cmake_minimum_required(VERSION 3.9...3.12) - - if(POLICY CMP0075) - cmake_policy(SET CMP0075 NEW)