From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36D4E15802F for ; Tue, 7 Mar 2023 16:58:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82EF7E07E0; Tue, 7 Mar 2023 16:58:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6ABD0E07E0 for ; Tue, 7 Mar 2023 16:58:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AEA393413FB for ; Tue, 7 Mar 2023 16:58:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8713D888 for ; Tue, 7 Mar 2023 16:58:31 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1678208299.10727586735882a48d57d0c41cb44a7a535645dd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gammu/files/, app-mobilephone/gammu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-mobilephone/gammu/files/gammu-1.42.0-fortify-source-3.patch app-mobilephone/gammu/gammu-1.42.0-r1.ebuild app-mobilephone/gammu/gammu-1.42.0.ebuild X-VCS-Directories: app-mobilephone/gammu/ app-mobilephone/gammu/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 10727586735882a48d57d0c41cb44a7a535645dd X-VCS-Branch: master Date: Tue, 7 Mar 2023 16:58:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3495937f-0b1f-4443-93b4-45c46b752d22 X-Archives-Hash: 9a2ab37205551765f6cee93858f09535 commit: 10727586735882a48d57d0c41cb44a7a535645dd Author: Sam James gentoo org> AuthorDate: Tue Mar 7 16:38:11 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 7 16:58:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10727586 app-mobilephone/gammu: fix runtime w/ FORTIFY_SOURCE=3 Closes: https://bugs.gentoo.org/854324 Signed-off-by: Sam James gentoo.org> .../files/gammu-1.42.0-fortify-source-3.patch | 31 ++++++++++++++++++++++ ...{gammu-1.42.0.ebuild => gammu-1.42.0-r1.ebuild} | 9 ++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/app-mobilephone/gammu/files/gammu-1.42.0-fortify-source-3.patch b/app-mobilephone/gammu/files/gammu-1.42.0-fortify-source-3.patch new file mode 100644 index 000000000000..dba1ca50ec6d --- /dev/null +++ b/app-mobilephone/gammu/files/gammu-1.42.0-fortify-source-3.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/854324 +https://github.com/gammu/gammu/commit/a37e5d8054f863fa71e38e244dd4da13eee6e251 + +From a37e5d8054f863fa71e38e244dd4da13eee6e251 Mon Sep 17 00:00:00 2001 +From: Martin Liska +Date: Mon, 20 Jun 2022 10:24:13 +0200 +Subject: [PATCH] Fix buffer overflow in Backup.Creator + +I noticed that while testing the upcoming GCC 12 with -D_FORTIFY_SOURCE=3: +here I have + +$1 = 0x7ffff7f0f940 "Linux, kernel 5.16.14-1-default (#1 SMP PREEMPT Fri Mar 11 12:33:34 UTC 2022 (80acc65))" +(gdb) p (int)strlen(GetOS()) +$3 = 87 +so GetOS() returns 87 chars while: + +include/gammu-backup.h: char Creator[80]; + +Fixes: #701 +--- a/include/gammu-backup.h ++++ b/include/gammu-backup.h +@@ -218,7 +218,7 @@ typedef struct { + /** + * Name of program which created backup + */ +- char Creator[80]; ++ char Creator[512]; + /** + * Timestamp of backup + */ + diff --git a/app-mobilephone/gammu/gammu-1.42.0.ebuild b/app-mobilephone/gammu/gammu-1.42.0-r1.ebuild similarity index 88% rename from app-mobilephone/gammu/gammu-1.42.0.ebuild rename to app-mobilephone/gammu/gammu-1.42.0-r1.ebuild index 79bd7daa5e61..ba396cb0f1fc 100644 --- a/app-mobilephone/gammu/gammu-1.42.0.ebuild +++ b/app-mobilephone/gammu/gammu-1.42.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,8 +35,11 @@ RDEPEND=" ${COMMON_DEPEND} dev-util/dialog " -PATCHES=( "${FILESDIR}/${P}-CMP0110-policy.patch" - "${FILESDIR}/${P}-gammu-detect.patch" ) +PATCHES=( + "${FILESDIR}/${P}-CMP0110-policy.patch" + "${FILESDIR}/${P}-gammu-detect.patch" + "${FILESDIR}/${P}-fortify-source-3.patch" +) src_configure() { local mycmakeargs=(