[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/

[Jeroen Roovers]

commit:     1af57544e419afdbc54cb6dc76e053593e4bb088
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  3 14:47:20 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> 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 <jer <AT> 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() {