From patchwork Sun Aug 27 10:17:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7119 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RYV4m2Dmjz3wtJ for ; Sun, 27 Aug 2023 10:18:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RYV4f0jKWz2cT; Sun, 27 Aug 2023 10:17:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RYV4d50Zfz307D; Sun, 27 Aug 2023 10:17:53 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RYV4b39GVz2yrV for ; Sun, 27 Aug 2023 10:17:51 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RYV4b113nzZ6; Sun, 27 Aug 2023 10:17:51 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1693131471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q5RD/XtaIaIz4uuVq1TbxIKotPEfmIQudbXBa8cQgmo=; b=Jymcjcrv8vqyMT/uvhd011518vNKAFDxAQKCWYMH5Lva21Nvh3Vy+cGm43AhMdevtINnHE nzX9h6yEf1u5M3DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1693131471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q5RD/XtaIaIz4uuVq1TbxIKotPEfmIQudbXBa8cQgmo=; b=mvMP8uOog733QqULSapUMpdTmw6DLy9V+T/fMDUbhzN97nJCMnJdtgFNVkbLqRsqKQ3nZ7 cVFigdPsV/n6r7uQYDB07Y/V6d+jTxzTqJcxZCMppz85W0meRak9XfcqbSdJ0JuW4i2HTe 09rUmK/JiWDlO1DWoGDp0KjGyktzCcSBSz3EkNAsO+7stnf4hnHGPz3C4uCjQXDf9yP25l 1O07ZTx1fTy3+0pn8VZiIrQARWMDzOFIVlC9M8ntM0yD9USDlH+SdVTs1TMPdopMW0AyJw U9K96deQX3m2BZf70DbBufkisuELyVD6wPeVHvzB6CXgUcQ02nzCPYJl0EPdAw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] json-c: Update to version 0.17 Date: Sun, 27 Aug 2023 12:17:38 +0200 Message-ID: <20230827101745.6483-4-adolf.belka@ipfire.org> In-Reply-To: <20230827101745.6483-1-adolf.belka@ipfire.org> References: <20230827101745.6483-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from version 0.16 to 0.17 - Update of rootfile - Changelog 0.17 (up to commit 077661f, 2023-08-08) Deprecated and removed features: * None New features * json_patch: add first implementation only with patch application * Add --disable-static and --disable-dynamic options to the cmake-configure script. * Add -DBUILD_APPS=NO option to disable app build * Minimum cmake version is now 3.9 Significant changes and bug fixes * When serializing with JSON_C_TO_STRING_PRETTY set, keep the opening and closing curly or square braces on same line for empty objects or arrays. * Disable locale handling when targeting a uClibc system due to problems with its duplocale() function. * When parsing with JSON_TOKENER_STRICT set, integer overflow/underflow now result in a json_tokener_error_parse_number. Without that flag values are capped at INT64_MIN/UINT64_MAX. * Fix memory leak with emtpy strings in json_object_set_string * json_object_from_fd_ex: fail if file is too large (>=INT_MAX bytes) * Add back json_number_chars, but only because it's part of the public API. * Entirely drop mode bits from open(O_RDONLY) to avoid warnings on certain platforms. * Specify dependent libraries, including -lbsd, in a more consistent way so linking against a static json-c works better * Fix a variety of build problems and add & improve tests * Update RFC reference to https://www.rfc-editor.org/rfc/rfc8259 Signed-off-by: Adolf Belka --- config/rootfiles/common/json-c | 3 ++- lfs/json-c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/json-c b/config/rootfiles/common/json-c index 58b6916af..f050376cb 100644 --- a/config/rootfiles/common/json-c +++ b/config/rootfiles/common/json-c @@ -7,6 +7,7 @@ #usr/include/json-c/json_inttypes.h #usr/include/json-c/json_object.h #usr/include/json-c/json_object_iterator.h +#usr/include/json-c/json_patch.h #usr/include/json-c/json_pointer.h #usr/include/json-c/json_tokener.h #usr/include/json-c/json_types.h @@ -20,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.2.0 +usr/lib/libjson-c.so.5.3.0 #usr/lib/pkgconfig/json-c.pc diff --git a/lfs/json-c b/lfs/json-c index 642afd26a..e529eb141 100644 --- a/lfs/json-c +++ b/lfs/json-c @@ -24,7 +24,7 @@ include Config -VER = 0.16 +VER = 0.17 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 = 11457fa39330338c85bfdfb0dd38fc703ad6942e730ba090c9fe017dfb81ef905d7b1bb1c768b9b51f6445a8cf3cf4007d7740be3a9878f8062edc62ba554c66 +$(DL_FILE)_BLAKE2 = 26be25141447f2b652fa09d7096141a8bf7992469bcc53b275c1bc0108fc36a8898a8185c381218d3146d00fa03bdd0b837be073410fc93af943b5f083dbaa69 install : $(TARGET)