From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aLGzKBGfol+VdQAA0tVLHw (envelope-from ) for ; Wed, 04 Nov 2020 12:31:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id kPScJBGfol9ZYwAA1q6Kng (envelope-from ) for ; Wed, 04 Nov 2020 12:31:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8FD0A9405D2 for ; Wed, 4 Nov 2020 12:31:12 +0000 (UTC) Received: from localhost ([::1]:45842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaHwT-0004M5-JJ for larch@yhetil.org; Wed, 04 Nov 2020 07:31:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaHwM-0004LH-I7 for guix-patches@gnu.org; Wed, 04 Nov 2020 07:31:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kaHwM-0001U2-84 for guix-patches@gnu.org; Wed, 04 Nov 2020 07:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kaHwM-0005Kq-5F for guix-patches@gnu.org; Wed, 04 Nov 2020 07:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44432] [PATCH 1/3] gnu: jsoncpp: Update to 1.9.4 Resent-From: Martin Becze Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Nov 2020 12:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44432 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44432@debbugs.gnu.org Cc: Martin Becze X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160449301117220 (code B ref -1); Wed, 04 Nov 2020 12:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Nov 2020 12:30:11 +0000 Received: from localhost ([127.0.0.1]:47783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kaHvT-0004PT-FM for submit@debbugs.gnu.org; Wed, 04 Nov 2020 07:30:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:34276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kaHvN-0004Kt-2R for submit@debbugs.gnu.org; Wed, 04 Nov 2020 07:30:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaHvM-00044X-9H for guix-patches@gnu.org; Wed, 04 Nov 2020 07:30:00 -0500 Received: from mx1.riseup.net ([198.252.153.129]:33146) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaHvG-0001CR-31 for guix-patches@gnu.org; Wed, 04 Nov 2020 07:29:59 -0500 Received: from bell.riseup.net (bell-pn.riseup.net [10.0.1.178]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4CR5ZS3BMdzFdtT for ; Wed, 4 Nov 2020 04:29:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1604492992; bh=QP5WYN6cfYik7t3jc1IEw1DOocLJzgEcvn1gVhclb0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fuwsfdikCK6DMYhBVzkmGgWC37J+Dwi7jZ5ZJ7lSofGRIoZt7+Py0B47ckWkpDmoF lAOJgRo5xWPsmaEQKm7FJIOj37kRXzOtY26K418rl+iYuYMwFloNLvcoPEBGM5G+kU XksBDph2I1Xbh3ogcPwemoENeH9t4YkPpryvZHO0= X-Riseup-User-ID: E2C288FDB88C71DFA0633F0BD2ED435F8A80B840236CF43C8E57405B057BF673 Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 4CR5ZR40PtzJnhs; Wed, 4 Nov 2020 04:29:51 -0800 (PST) From: Martin Becze Date: Wed, 4 Nov 2020 06:29:26 -0600 Message-Id: <20201104122928.30408-2-mjbecze@riseup.net> In-Reply-To: <20201104122928.30408-1-mjbecze@riseup.net> References: <20201104122928.30408-1-mjbecze@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=198.252.153.129; envelope-from=mjbecze@riseup.net; helo=mx1.riseup.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/04 07:29:48 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.4 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=riseup.net header.s=squak header.b=fuwsfdik; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 2.59 X-TUID: 0n/ZFPldCu1r * gnu/packages/serialization.scm (jsoncpp): Update to 1.9.4. * gnu/packages/patches/jsoncpp-fix-inverted-case.patch: Removed old patch. * gnu/local.mk (dist_patch_DATA): Remove old patch. --- gnu/local.mk | 1 - .../patches/jsoncpp-fix-inverted-case.patch | 22 ------------------- gnu/packages/serialization.scm | 6 ++--- 3 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 gnu/packages/patches/jsoncpp-fix-inverted-case.patch diff --git a/gnu/local.mk b/gnu/local.mk index d4d04c01b8..08a82c45f1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1180,7 +1180,6 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jfsutils-add-sysmacros.patch \ %D%/packages/patches/jfsutils-include-systypes.patch \ - %D%/packages/patches/jsoncpp-fix-inverted-case.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ diff --git a/gnu/packages/patches/jsoncpp-fix-inverted-case.patch b/gnu/packages/patches/jsoncpp-fix-inverted-case.patch deleted file mode 100644 index e4897de1b8..0000000000 --- a/gnu/packages/patches/jsoncpp-fix-inverted-case.patch +++ /dev/null @@ -1,22 +0,0 @@ -This patch fixes a bug and related test failure on platforms where 'char' -is unsigned. - -Taken from upstream: -https://github.com/open-source-parsers/jsoncpp/commit/f11611c8785082ead760494cba06196f14a06dcb - -diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp -index 8e06cca2..56195dc1 100644 ---- a/src/lib_json/json_writer.cpp -+++ b/src/lib_json/json_writer.cpp -@@ -178,8 +178,9 @@ static bool isAnyCharRequiredQuoting(char const* s, size_t n) { - - char const* const end = s + n; - for (char const* cur = s; cur < end; ++cur) { -- if (*cur == '\\' || *cur == '\"' || *cur < ' ' || -- static_cast(*cur) < 0x80) -+ if (*cur == '\\' || *cur == '\"' || -+ static_cast(*cur) < ' ' || -+ static_cast(*cur) >= 0x80) - return true; - } - return false; diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index fc0102caf0..86f6ac6a1c 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Joshua Sierles, Nextjournal +;;; Copyright © 2020 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -285,16 +286,15 @@ that implements both the msgpack and msgpack-rpc specifications.") (define-public jsoncpp (package (name "jsoncpp") - (version "1.9.2") + (version "1.9.4") (home-page "https://github.com/open-source-parsers/jsoncpp") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit version))) (file-name (git-file-name name version)) - (patches (search-patches "jsoncpp-fix-inverted-case.patch")) (sha256 (base32 - "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg")))) + "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS:BOOL=YES" -- 2.29.1