From 64901feeea93b317428b786a4949c00527602437 Mon Sep 17 00:00:00 2001 From: Yanase Yuki Date: Sat, 10 Oct 2026 15:51:46 +0900 Subject: [PATCH] libjson-c: update to 0.19 This release includes fix for: - CVE-2026-9146 No longer required patch: - 002-cmake-version.patch This commit also disable unused json_parse app build. Full changelog: https://github.com/json-c/json-c/blob/json-c-0.19-20260627/ChangeLog Signed-off-by: Yanase Yuki Link: https://github.com/openwrt/openwrt/pull/25774 Signed-off-by: Nick Hainke --- package/libs/libjson-c/Makefile | 14 +++++++------ .../patches/001-dont-build-docs.patch | 2 +- .../libjson-c/patches/002-cmake-version.patch | 20 ------------------- 3 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 package/libs/libjson-c/patches/002-cmake-version.patch diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile index 9c32ca500f0..a839e32966f 100644 --- a/package/libs/libjson-c/Makefile +++ b/package/libs/libjson-c/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=json-c -PKG_VERSION:=0.18 +PKG_VERSION:=0.19 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz -PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/ -PKG_HASH:=602cdefc1d2aab8318fc0814b7ce7d59e72514d4276ca3eff92f35f86cf1c160 +PKG_SOURCE_URL:=https://github.com/json-c/json-c/releases/download/json-c-$(PKG_VERSION)-20260627 +PKG_HASH:=704927172443309a8efeb162060bb215548e1286e5568514007dd2cc35a0a164 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=MIT @@ -27,11 +27,13 @@ include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk CMAKE_HOST_OPTIONS += \ - -DDISABLE_EXTRA_LIBS=TRUE \ - -DBUILD_SHARED_LIBS=FALSE + -DDISABLE_EXTRA_LIBS:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DBUILD_APPS:BOOL=OFF CMAKE_OPTIONS += \ - -DDISABLE_EXTRA_LIBS=TRUE + -DDISABLE_EXTRA_LIBS:BOOL=ON \ + -DBUILD_APPS:BOOL=OFF define Package/libjson-c SECTION:=libs diff --git a/package/libs/libjson-c/patches/001-dont-build-docs.patch b/package/libs/libjson-c/patches/001-dont-build-docs.patch index 68fbc17fd57..39f87a37a67 100644 --- a/package/libs/libjson-c/patches/001-dont-build-docs.patch +++ b/package/libs/libjson-c/patches/001-dont-build-docs.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -449,8 +449,6 @@ configure_file(json.h.cmakein ${PROJECT_ +@@ -522,8 +522,6 @@ configure_file(json.h.cmakein ${PROJECT_ include_directories(${PROJECT_SOURCE_DIR}) include_directories(${PROJECT_BINARY_DIR}) diff --git a/package/libs/libjson-c/patches/002-cmake-version.patch b/package/libs/libjson-c/patches/002-cmake-version.patch deleted file mode 100644 index e5ad129f0be..00000000000 --- a/package/libs/libjson-c/patches/002-cmake-version.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,7 @@ - # and many OpenWRT packages require, much newer CMake packages. - # We're stopping before 3.10 because that version starts requiring - # c++11, which isn't available on e.g HPUX. --cmake_minimum_required(VERSION 3.9...3.12) -+cmake_minimum_required(VERSION 3.10) - - # JSON-C library is C only project. - # PROJECT_VERSION{,_MAJOR,_MINOR,_PATCH} set by project(): ---- a/apps/CMakeLists.txt -+++ b/apps/CMakeLists.txt -@@ -1,5 +1,5 @@ - --cmake_minimum_required(VERSION 2.8) # see ../CMakeLists.txt for why 2.8 -+cmake_minimum_required(VERSION 3.10) - - if(POLICY CMP0075) - cmake_policy(SET CMP0075 NEW)