From patchwork Wed Jun 28 18:35:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51400 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 C146D27BBEA; Wed, 28 Jun 2023 19:36:47 +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 2308A27BBE2 for ; Wed, 28 Jun 2023 19:36:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEa1N-0005kM-HY; Wed, 28 Jun 2023 14:36:05 -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 1qEa1K-0005iC-Vf for guix-patches@gnu.org; Wed, 28 Jun 2023 14:36:02 -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 1qEa1K-0000ha-AE for guix-patches@gnu.org; Wed, 28 Jun 2023 14:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qEa1K-00043a-4i for guix-patches@gnu.org; Wed, 28 Jun 2023 14:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64332] [PATCH v4 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Jun 2023 18:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64332 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64332@debbugs.gnu.org Cc: Hilton Chain X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168797732415505 (code B ref -1); Wed, 28 Jun 2023 18:36:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jun 2023 18:35:24 +0000 Received: from localhost ([127.0.0.1]:51628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEa0h-000420-I5 for submit@debbugs.gnu.org; Wed, 28 Jun 2023 14:35:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:47804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEa0d-00041P-W1 for submit@debbugs.gnu.org; Wed, 28 Jun 2023 14:35:21 -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 1qEa0a-0005Uj-W3 for guix-patches@gnu.org; Wed, 28 Jun 2023 14:35:18 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEa0Y-0008PC-HS for guix-patches@gnu.org; Wed, 28 Jun 2023 14:35:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687977107; 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=evY8DNbQZdTUzBO4p0SjdVRQut4Ll5ixOFS2hb/mLuU=; b=4gBKeEnocHn6zP5AubLX4GsvSt72SgUCUoxAksR76Kb/cAZhyXBBsZvln19jhwXIiYN9WW ZXh1OHMtUsmS0vfBWMZZ3OKeKf5Ind6+B/Bk9njPy4YJxsIXyqRyO07TNf5w+RqAacvX// kxEV4m3LdMS/RYPTGLijYcGErWwBBCdK5pqOVLP2djYmRnydf6wpF24y+5OI2MeJtSqryg oVFURF6oMQeZaFO06yfN9ixPxkikKIIomp8yCAkIaWEdWnLb5Fv1+NBD/+pc9N9bpjFpWb T9Cxa5Jt6I7w40NIUlS3CFX3Ik62W3IUySB4ajViuDh2G/T2eQi9fcdqd6haYw== Date: Thu, 29 Jun 2023 02:35:02 +0800 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: --- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 c2011976ff..2a0c81f559 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -943,8 +943,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 @@ -981,26 +979,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) @@ -1011,9 +989,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