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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 35964138334 for ; Fri, 3 Jan 2020 14:49:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7219FE0BF3; Fri, 3 Jan 2020 14:49:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A428E0BF3 for ; Fri, 3 Jan 2020 14:49:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3885534DEE8 for ; Fri, 3 Jan 2020 14:49:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E765EA9 for ; Fri, 3 Jan 2020 14:49:21 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1578062957.1af57544e419afdbc54cb6dc76e053593e4bb088.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/parted/files/parted-3.3-atari.patch sys-block/parted/parted-3.3-r1.ebuild sys-block/parted/parted-3.3.ebuild X-VCS-Directories: sys-block/parted/ sys-block/parted/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 1af57544e419afdbc54cb6dc76e053593e4bb088 X-VCS-Branch: master Date: Fri, 3 Jan 2020 14:49:21 +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: a89e073f-673c-4fdc-8253-50b5e9ba160e X-Archives-Hash: 55effcd06bf68a66ccfaaabb1fc125b6 commit: 1af57544e419afdbc54cb6dc76e053593e4bb088 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jan 3 14:47:20 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jan 3 14:49:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af57544 sys-block/parted: Fix segfault when USE=-debug PED_ASSERT does funky stuff to atr_c_locale when USE=-debug, causing freelocale() to fail on exiting labels/atari.c. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Closes: https://bugs.gentoo.org/704704 Signed-off-by: Jeroen Roovers gentoo.org> sys-block/parted/files/parted-3.3-atari.patch | 11 +++++++++++ sys-block/parted/{parted-3.3.ebuild => parted-3.3-r1.ebuild} | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys-block/parted/files/parted-3.3-atari.patch b/sys-block/parted/files/parted-3.3-atari.patch new file mode 100644 index 00000000000..41771d02d4e --- /dev/null +++ b/sys-block/parted/files/parted-3.3-atari.patch @@ -0,0 +1,11 @@ +--- a/libparted/labels/atari.c ++++ b/libparted/labels/atari.c +@@ -1957,7 +1957,7 @@ + PED_ASSERT (sizeof (AtariRawPartition) == 12); + PED_ASSERT (sizeof (AtariRawTable) == 512); + /* GNU Libc doesn't support NULL instead of the locale name */ +- PED_ASSERT ((atr_c_locale = newlocale(LC_ALL_MASK, "C", NULL)) != NULL); ++ atr_c_locale = newlocale(LC_ALL_MASK, "C", NULL); + + ped_disk_type_register (&atari_disk_type); + } diff --git a/sys-block/parted/parted-3.3.ebuild b/sys-block/parted/parted-3.3-r1.ebuild similarity index 94% rename from sys-block/parted/parted-3.3.ebuild rename to sys-block/parted/parted-3.3-r1.ebuild index 1945a756254..4f2c019b732 100644 --- a/sys-block/parted/parted-3.3.ebuild +++ b/sys-block/parted/parted-3.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,6 +31,7 @@ DEPEND=" " PATCHES=( "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch + "${FILESDIR}"/${PN}-3.3-atari.patch ) src_prepare() {