mirror of
https://github.com/openwrt/openwrt.git
synced 2026-10-12 06:57:57 +04:00
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 <dev@zpc.st> Link: https://github.com/openwrt/openwrt/pull/25774 Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
1 parent
ac46a4eafd
commit
64901feeea
3 files changed
+9
-27
No files matched your search
@@ -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 <nbd@nbd.name>
|
||||
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
|
||||
|
||||
@@ -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})
|
||||
|
||||
|
||||
@@ -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)
|
||||
Reference in new issue
Block a user