From patchwork Sun May 28 08:11:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 50375 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 2F13127BBE9; Sun, 28 May 2023 09:13:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 8E96827BBE2 for ; Sun, 28 May 2023 09:13:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3BWX-0007QK-5s; Sun, 28 May 2023 04:13:09 -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 1q3BWS-0007Nd-Dw for guix-patches@gnu.org; Sun, 28 May 2023 04:13:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q3BWQ-0005ig-KG for guix-patches@gnu.org; Sun, 28 May 2023 04:13:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3BWQ-0005AG-GE for guix-patches@gnu.org; Sun, 28 May 2023 04:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 May 2023 08:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.168526153019729 (code B ref 63765); Sun, 28 May 2023 08:13:02 +0000 Received: (at 63765) by debbugs.gnu.org; 28 May 2023 08:12:10 +0000 Received: from localhost ([127.0.0.1]:53182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3BVZ-000587-H5 for submit@debbugs.gnu.org; Sun, 28 May 2023 04:12:09 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:53262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3BVU-00057h-V2 for 63765@debbugs.gnu.org; Sun, 28 May 2023 04:12:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1685261393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0XlrYRsu7OdBsS7RNm7aRcAD92KVtd/2E2zI39rDx0U=; b=mlNrWyabJPn37UPbUVCK0bDGSWu5d5ilabxJFCh4a35nQzsLHsouEguFAVVLoh7W9VB1Jf Rv+NiweOJiWJyPfcZ8Hago/94qYP2QLCgIqvH+hkFKiI1N8cHtm+3JpMKOLdumVOY9NY4q DwlafK4v7AlVmL1gzyJfm95CgOyK04wdpYwBCzLaUEjWtMbjheTNUV1vvGgc6qrztHh6hR dqDxj7exUs7AhjiZPwS4kCvQqkbMfUjAdvs8PE0SKuZUUI/wICA8+KIZuogO91xOHXf29z JmU7nGHftDmZrbOMmVvQ/x68DEaixdudxGuLQ47YNbzTa281NPEEbqKvi2Jw3A== Date: Sun, 28 May 2023 16:11:03 +0800 Message-Id: <20230528081107.24209-4-hako@ultrarare.space> In-Reply-To: <20230528081107.24209-1-hako@ultrarare.space> References: <20230528080735.23733-1-hako@ultrarare.space> <20230528081107.24209-1-hako@ultrarare.space> MIME-Version: 1.0 X-Spamd-Bar: --- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/tls.scm (mbedtls-apache-for-hiawatha): Use inherited source. [arguments]<#:phases>: Keep "-Wformat-signedness". --- gnu/packages/tls.scm | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index cd5933a270..1e2b0fcc20 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -944,8 +944,6 @@ (define-public perl-crypt-openssl-random (define-public mbedtls-apache-lts (package (name "mbedtls-apache") - ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha - ;; when updating. (version "2.28.0") (source (origin @@ -982,26 +980,6 @@ (define-public mbedtls-for-hiawatha (hidden-package (package (inherit mbedtls-apache-lts) - (name "mbedtls-apache") - (version "2.26.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ARMmbed/mbedtls") - (commit (string-append "mbedtls-" version)))) - (sha256 - (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - ;; Can be removed with the next version. - ;; Reduce level of format truncation warnings due to false positives. - ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434 - (substitute* "CMakeLists.txt" - (("Wformat-truncation=2") "Wformat-truncation")) - #t)))) (arguments (substitute-keyword-arguments (package-arguments mbedtls-apache-lts) ((#:phases phases) @@ -1012,9 +990,6 @@ (define-public mbedtls-for-hiawatha (invoke "scripts/config.pl" "set" feature)) (list "MBEDTLS_THREADING_C" "MBEDTLS_THREADING_PTHREAD")) - ;; XXX The above enables code that breaks with -Werror… - (substitute* "CMakeLists.txt" - ((" -Wformat-signedness") "")) #t))))))))) (define-public dehydrated