From patchwork Sun Jul 4 00:16:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthew James Kraai X-Patchwork-Id: 31106 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 8E9DE27BC81; Sun, 4 Jul 2021 01:18:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 49C7327BC78 for ; Sun, 4 Jul 2021 01:18:09 +0100 (BST) Received: from localhost ([::1]:39776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzppo-0003Es-CD for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 20:18:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzppi-0003Ef-Ud for guix-patches@gnu.org; Sat, 03 Jul 2021 20:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56768) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzppi-0000YO-NA for guix-patches@gnu.org; Sat, 03 Jul 2021 20:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzppi-0002uA-ES for guix-patches@gnu.org; Sat, 03 Jul 2021 20:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49370] [PATCH] gnu: mbedtls-apache: Update to 2.26.0. Resent-From: Matthew James Kraai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Jul 2021 00:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49370 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49370@debbugs.gnu.org Cc: Matthew James Kraai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162535782711094 (code B ref -1); Sun, 04 Jul 2021 00:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jul 2021 00:17:07 +0000 Received: from localhost ([127.0.0.1]:40080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzpoo-0002ss-OC for submit@debbugs.gnu.org; Sat, 03 Jul 2021 20:17:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:55508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzpol-0002sj-NL for submit@debbugs.gnu.org; Sat, 03 Jul 2021 20:17:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzpol-0003Bj-C6 for guix-patches@gnu.org; Sat, 03 Jul 2021 20:17:03 -0400 Received: from mail.ftbfs.org ([52.8.68.13]:35430 helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzpoj-0008NU-Ft for guix-patches@gnu.org; Sat, 03 Jul 2021 20:17:03 -0400 Received: from ip68-228-72-85.oc.oc.cox.net ([68.228.72.85] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lzpoh-0001VP-Pk; Sun, 04 Jul 2021 00:17:00 +0000 From: Matthew James Kraai Date: Sat, 3 Jul 2021 17:16:57 -0700 Message-Id: <20210704001657.19887-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/mbedtls-apache-reduce-level-of-Wformat-truncation.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.26.0. --- gnu/local.mk | 1 + ...e-reduce-level-of-Wformat-truncation.patch | 29 +++++++++++++++++++ gnu/packages/tls.scm | 5 ++-- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/mbedtls-apache-reduce-level-of-Wformat-truncation.patch diff --git a/gnu/local.mk b/gnu/local.mk index b197ec55f9..6a44438918 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1422,6 +1422,7 @@ dist_patch_DATA = \ %D%/packages/patches/maven-enforcer-api-fix-old-dependencies.patch \ %D%/packages/patches/maven-generate-component-xml.patch \ %D%/packages/patches/maven-generate-javax-inject-named.patch \ + %D%/packages/patches/mbedtls-apache-reduce-level-of-Wformat-truncation.patch \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ diff --git a/gnu/packages/patches/mbedtls-apache-reduce-level-of-Wformat-truncation.patch b/gnu/packages/patches/mbedtls-apache-reduce-level-of-Wformat-truncation.patch new file mode 100644 index 0000000000..7f3c2d8c05 --- /dev/null +++ b/gnu/packages/patches/mbedtls-apache-reduce-level-of-Wformat-truncation.patch @@ -0,0 +1,29 @@ +From 2065a8d8af27c6cb1e40c9462b5933336dca7434 Mon Sep 17 00:00:00 2001 +From: Paul Elliott +Date: Wed, 17 Mar 2021 13:12:22 +0000 +Subject: [PATCH] Reduce level of -Wformat-truncation + +Reduce level of format truncation warnings due to issues with false +positives (an unknown size buffer is always treated as size 1) + +Signed-off-by: Paul Elliott +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2ab2e01eb..14ca7b696 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -198,7 +198,7 @@ if(CMAKE_COMPILER_IS_GNU) + endif() + endif() + if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation=2") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation") + endif() + set(CMAKE_C_FLAGS_RELEASE "-O2") + set(CMAKE_C_FLAGS_DEBUG "-O0 -g3") +-- +2.32.0 + diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 60005cf339..bb669859b9 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -946,7 +946,7 @@ then ported to the GNU / Linux environment.") (name "mbedtls-apache") ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha ;; when updating. - (version "2.23.0") + (version "2.26.0") (source (origin (method git-fetch) @@ -954,7 +954,8 @@ then ported to the GNU / Linux environment.") (url "https://github.com/ARMmbed/mbedtls") (commit (string-append "mbedtls-" version)))) (sha256 - (base32 "13fa9h2i989cbf8n8c0j019mshv6wg213va18my1s787lhcq2d62")) + (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m")) + (patches (search-patches "mbedtls-apache-reduce-level-of-Wformat-truncation.patch")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments