From unknown Tue Jun 17 22:23:52 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No (score -1.0): ALL_TRUSTED=-1 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-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * 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 -- 2.32.0 From unknown Tue Jun 17 22:23:52 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Matthew James Kraai Subject: bug#49370: closed (Re: [bug#49370] [PATCH] gnu: mbedtls-apache: Update to 2.26.0.) Message-ID: References: <20210704001657.19887-1-kraai@ftbfs.org> X-Gnu-PR-Message: they-closed 49370 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 49370@debbugs.gnu.org Date: Mon, 05 Jul 2021 07:08:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1625468881-13312-1" This is a multi-part message in MIME format... ------------=_1625468881-13312-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #49370: [PATCH] gnu: mbedtls-apache: Update to 2.26.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 49370@debbugs.gnu.org. --=20 49370: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D49370 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1625468881-13312-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 49370-done) by debbugs.gnu.org; 5 Jul 2021 07:07:31 +0000 Received: from localhost ([127.0.0.1]:43673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0IhX-0003Rz-Jq for submit@debbugs.gnu.org; Mon, 05 Jul 2021 03:07:31 -0400 Received: from flashner.co.il ([178.62.234.194]:43086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m0IhV-0003Rl-J3 for 49370-done@debbugs.gnu.org; Mon, 05 Jul 2021 03:07:29 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id 9775B40049; Mon, 5 Jul 2021 07:07:23 +0000 (UTC) Date: Mon, 5 Jul 2021 10:06:15 +0300 From: Efraim Flashner To: Matthew James Kraai Subject: Re: [bug#49370] [PATCH] gnu: mbedtls-apache: Update to 2.26.0. Message-ID: Mail-Followup-To: Efraim Flashner , Matthew James Kraai , 49370-done@debbugs.gnu.org References: <20210704001657.19887-1-kraai@ftbfs.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tUdUVRFs3xfGqQgm" Content-Disposition: inline In-Reply-To: <20210704001657.19887-1-kraai@ftbfs.org> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 49370-done Cc: 49370-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --tUdUVRFs3xfGqQgm Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The patch only affected the one line so I turned it into a snippet. Thanks! Patch pushed. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --tUdUVRFs3xfGqQgm Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmDir2YACgkQQarn3Mo9 g1H96hAAkMdtKkMjflhTgT1Nzrs+NlWE8ZkJBtWBsQfTO5MZsTabLkOr+AWnbhyC GX6OVBVahHd41k1ekHwNT8pLCxdjzQW0BWwiDXJOllbA0/umbh83NF9mkMlcMPAN +qBCDYD7/NzLjPcOLRlHFhArSfhMTFuAL9KgmfRfBYRawpevCbV7mDS/TfV5fhZR qJbxA64hosiifudfs7viu7OskpfOeZu18PtstJjg+bSJSK2d5Cw90INGhi/FUPcI yhNxsLpwRk1WJyGoMymZPJlpGTYhkkuP8Ucd0vA4JZRMhBGrjeUV9S7w4iNxGCHv kvOqHQxgm9oqwWqheSz86EdWOzdMHLJkcXc9IeTzF3unsu2KxjxfJVOoEiQKyAt+ G0U/KSkrkxU5DeExsDR+52FpkZL0tN2rAusH32KnhnF7uUTugXHGSMCvAsKbKfNr VRhrkWWJ4oGXHBbdHchYxX5nNcHmEj0Gz94NVTyKKl20jfiQvg+/SpfpdZ1Tprdx 0GLhbg+/Csra49xrtuRHBL1KOe/U1k69Kn9ZmloRgtobfSc9d19VZvYpkcTajk7l DJQtY/wBl3u/HoJJOc0OafSDV1cG60Uu/VJUEOitG+Tmb4SVISVNaBEgyCxbEmx1 ZsYJLx4FTZHqAkS4DOXmsTbHatiGMav3/lezBTVi9qBAWZdPwSY= =+Eub -----END PGP SIGNATURE----- --tUdUVRFs3xfGqQgm-- ------------=_1625468881-13312-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: mbedtls-apache: Update to 2.26.0. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No (score -1.0): ALL_TRUSTED=-1 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Matthew James Kraai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * 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 -- 2.32.0 ------------=_1625468881-13312-1--