sys-block/parted: Fix segfault when USE=-debug
authorJeroen Roovers <jer@gentoo.org>
Fri, 3 Jan 2020 14:47:20 +0000 (15:47 +0100)
committerJeroen Roovers <jer@gentoo.org>
Fri, 3 Jan 2020 14:49:17 +0000 (15:49 +0100)
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@gentoo.org>
sys-block/parted/files/parted-3.3-atari.patch [new file with mode: 0644]
sys-block/parted/parted-3.3-r1.ebuild [moved from sys-block/parted/parted-3.3.ebuild with 94% similarity]

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 (file)
index 0000000..41771d0
--- /dev/null
@@ -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);
+ }
similarity index 94%
rename from sys-block/parted/parted-3.3.ebuild
rename to sys-block/parted/parted-3.3-r1.ebuild
index 1945a756254560aa0001644a064135ad34ed5f37..4f2c019b732ce90af3f3a3c42d0c6ca049dd9b02 100644 (file)
@@ -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() {