From patchwork Sun Oct 27 22:15:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Covrig X-Patchwork-Id: 69573 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8788327BBE9; Sun, 27 Oct 2024 22:18:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 929E427BBEA for ; Sun, 27 Oct 2024 22:18:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5BZh-0005qj-83; Sun, 27 Oct 2024 18:17:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5BZf-0005qO-RQ for guix-patches@gnu.org; Sun, 27 Oct 2024 18:17:27 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t5BZf-0005Au-Hm for guix-patches@gnu.org; Sun, 27 Oct 2024 18:17:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=4S3YCloY0ne0Cz/alZZxt/I+0bp4ooDCCTceYOjFMQ4=; b=blI3NJSosn83rrzxmlkG2OkHfcLCZG/h9P1fWF//4TTaETFfyVFf16OWqKRKSPO8WSmUq7xo9D906RHn8ppS3MBlITdanIYoi91LCZ2wNLOLcXA/KcwKuO6FF4uqHPHoGjTzR15wATOrgDIYQUriD8H1WpfvEBN+3t7q9N/80gcRQTbVkC90gk2mWecqfGES9ZGytXvKLToz3EOsG6nuTZvM8eXvZY/GFdrB8/bq09PIViH47GAOIPpKkS+yzEIkPmXIriKosfddFrA8vbdd4MCQa5Qsb6eLE84p59bMR4LIAsRkg5EeCp6eF1hmC70L7e3E3iuOSM0ufq4kTVnqtg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5BaE-0006CH-Pa for guix-patches@gnu.org; Sun, 27 Oct 2024 18:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73794] [PATCH 1/2] gnu: json-c: Update to v0.18 References: <20241013153842.284364-1-aaron.covrig.us@ieee.org> In-Reply-To: <20241013153842.284364-1-aaron.covrig.us@ieee.org> Resent-From: Aaron Covrig Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Oct 2024 22:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73794@debbugs.gnu.org Cc: Aaron Covrig Received: via spool by 73794-submit@debbugs.gnu.org id=B73794.173006745523776 (code B ref 73794); Sun, 27 Oct 2024 22:18:02 +0000 Received: (at 73794) by debbugs.gnu.org; 27 Oct 2024 22:17:35 +0000 Received: from localhost ([127.0.0.1]:46638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5BZm-0006BO-KL for submit@debbugs.gnu.org; Sun, 27 Oct 2024 18:17:35 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]:48606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5BZi-0006Av-9N for 73794@debbugs.gnu.org; Sun, 27 Oct 2024 18:17:30 -0400 Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-7b1539faa0bso268768285a.1 for <73794@debbugs.gnu.org>; Sun, 27 Oct 2024 15:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1730067348; x=1730672148; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4S3YCloY0ne0Cz/alZZxt/I+0bp4ooDCCTceYOjFMQ4=; b=Ic8sH/jVTMVMPECyrDD7k+JsBg/Bt0se0768+glCaKFJm4YN9OQobvLcJm+AkQj9rI U6haDxFNkfgq/jN4vrCs6o46meV7V1/QHY3Iwpg/uIqnZ7wMM3VnVrvjAP1/w3t0caUh uCTb8Gv4mwqFm007XL8Phhy5EYldlpEqtULFo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730067348; x=1730672148; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4S3YCloY0ne0Cz/alZZxt/I+0bp4ooDCCTceYOjFMQ4=; b=kXf5lBdNf8OQ9tIZ7v/NtVKSFm62JkwJIO3P6N/ehsuX2GuOL0bPJ9jP2AUE2NI0mV oWZX4J1Q8M7F0KyS3yBv2NVhWK+0kKlvOhoIGm+cJSLMntAdwxrcQXRkz9s7JmTuvMxJ vVoaSf7AKNId0exVaOCwU/8Tne8Mx/3VsLE35LetkQ0xd7xG2roKe36AsipL+qXF0z2/ OHdhik+8n/cu6ndeqdHWiSnO5DsXusJ78WPqaBGO5siPTfhRVpJ0T1c8gjmlfCCRFTtT lPsDM43ko1pOz6y3jwoA0KXY/LFh02EbkOM9UIh0gnuDnnHlxyqSr4GNArousVW1x8rU V/tA== X-Gm-Message-State: AOJu0YwmeTvXYNkyKjVwS64J7wl5LuiHGS9kJGsjs3oytBewP4ysYqnE a7gVjat//2kc7Lm3gKYaGhF5XcuMeyQVuCcUs3LpmeRoELCT5dhKZHR2bXtDW9rDZyAYsBbqCDC wQS7OZOwA3zTg+AnnZc6coR6sT7BgIT5rMDhdypvj3NHtDPYjqfHn9LHk84ehqF01wE1JQ/uDcW NJ8VX5z/p28HJ6O2+W/YH2VeppTy9eX0hKEZO0dLs= X-Google-Smtp-Source: AGHT+IGWy8EKkwv6gUR60z7oYtLZs6Yh2IhIfX06ao7UJ2CcWCL+Vo+NPedabYFw2nhn5OFP6zcZXA== X-Received: by 2002:a05:620a:371a:b0:7b1:3754:7d83 with SMTP id af79cd13be357-7b193ed75a4mr1155938185a.9.1730067347546; Sun, 27 Oct 2024 15:15:47 -0700 (PDT) Received: from mobile-dev.fios-router.home (pool-71-244-152-222.bltmmd.fios.verizon.net. [71.244.152.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b18d3261e5sm266614885a.95.2024.10.27.15.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 15:15:46 -0700 (PDT) Date: Sun, 27 Oct 2024 18:15:17 -0400 Message-ID: <20241027221542.51629-1-aaron.covrig.us@ieee.org> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Aaron Covrig X-ACL-Warn: , Aaron Covrig via Guix-patches X-Patchwork-Original-From: Aaron Covrig via Guix-patches via From: Aaron Covrig Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/web.scm (json-c): Update to v0.18 * gnu/packages/web.scm (json-c-0.15): New variable * gnu/packages/web.scm: Deprecate json-c < 0.18 --- gnu/packages/web.scm | 82 +++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 32 deletions(-) base-commit: 091131af64fd4e4e925fff829fa19097cfcdfcc5 diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 34739bf088..0d21306e6e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -87,6 +87,7 @@ (define-module (gnu packages web) #:use-module (ice-9 match) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix cvs-download) @@ -1269,16 +1270,17 @@ (define-public jansson (define-public json-c (package (name "json-c") - (version "0.15") - (source (origin - (method url-fetch) - (uri (string-append - "https://s3.amazonaws.com/json-c_releases/releases/json-c-" - version ".tar.gz")) - (sha256 - (base32 - "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q")))) + (version "0.18") + (source + (origin + (method url-fetch) + (uri (string-append + "https://s3.amazonaws.com/json-c_releases/releases/json-c-" + version ".tar.gz")) + (sha256 + (base32 "090pn7gyicvpqq01451zhkjw1fw3h4l6v2f6mxlvhrli8x3b0sl7")))) (build-system cmake-build-system) + (native-inputs (list doxygen)) (home-page "https://github.com/json-c/json-c/wiki") (synopsis "JSON implementation in C") (description @@ -1289,9 +1291,24 @@ (define-public json-c (license license:x11))) ;; TODO: Remove these old versions when all dependents have been updated. -(define-public json-c-0.13 +(define-deprecated/public json-c-0.15 #f (package (inherit json-c) + (name "json-c") + (version "0.15") + (source + (origin + (method url-fetch) + (uri (string-append + "https://s3.amazonaws.com/json-c_releases/releases/json-c-" + version ".tar.gz")) + (sha256 + (base32 "1im484iz08j3gmzpw07v16brwq46pxxj65i996kkp2vivcfhmn5q")))) + (build-system cmake-build-system))) + +(define-deprecated/public json-c-0.13 #f + (package + (inherit json-c-0.15) (version "0.13.1") (source (origin (method url-fetch) @@ -1312,31 +1329,32 @@ (define-public json-c-0.13 #t)))) (build-system gnu-build-system))) -(define-public json-c-0.12 +(define-deprecated/public json-c-0.12 #f (package (inherit json-c-0.13) (version "0.12.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://s3.amazonaws.com/json-c_releases/releases/json-c-" - version ".tar.gz")) - (sha256 - (base32 "08qibrq29a5v7g23wi5icy6l4fbfw90h9ccps6vq0bcklx8n84ra")) - (patches (search-patches "json-c-0.12-CVE-2020-12762.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Somehow 'config.h.in' is older than - ;; 'aclocal.m4', which would trigger a rule to - ;; run 'autoheader'. - (set-file-time "config.h.in" - (stat "aclocal.m4")) - - ;; Don't try to build with -Werror. - (substitute* (find-files "." "Makefile\\.in") - (("-Werror") "")) - #t)))))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://s3.amazonaws.com/json-c_releases/releases/json-c-" + version ".tar.gz")) + (sha256 + (base32 "08qibrq29a5v7g23wi5icy6l4fbfw90h9ccps6vq0bcklx8n84ra")) + (patches (search-patches "json-c-0.12-CVE-2020-12762.patch")) + (modules '((guix build utils))) + (snippet '(begin + ;; Somehow 'config.h.in' is older than + ;; 'aclocal.m4', which would trigger a rule to + ;; run 'autoheader'. + (set-file-time "config.h.in" + (stat "aclocal.m4")) + + ;; Don't try to build with -Werror. + (substitute* (find-files "." "Makefile\\.in") + (("-Werror") + "")) + #t)))))) (define-public json-parser (package