[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/
commit: dc7500b3c93315b44b079cf0a8752a84ee74e20a
Author: Sam James gentoo org>
AuthorDate: Sun May 12 02:21:36 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun May 12 02:22:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc7500b3
sys-block/parted: fix underlinking with util-linux/libuuid (again)
Backport another upstream patch.
Closes: https://bugs.gentoo.org/910487
Signed-off-by: Sam James gentoo.org>
.../files/parted-3.6-underlinked-util-linux.patch | 35 ++
.../{parted-3.6-r1.ebuild => parted-3.6-r2.ebuild} | 2 +-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
b/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
index 6e02f4aac8d8..1b23c27398fb 100644
--- a/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
+++ b/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
@@ -1,5 +1,6 @@
https://bugs.gentoo.org/910487
https://git.savannah.gnu.org/cgit/parted.git/commit/?id=d22c2d01f62139e0d386d90584cac0705857a571
+https://git.savannah.gnu.org/cgit/parted.git/commit/?id=60b3300ed6d3ba2e7af4ddce55bd873b232d12ff
From d22c2d01f62139e0d386d90584cac0705857a571 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov
@@ -24,3 +25,37 @@ Signed-off-by: Brian C. Lane
if test $ENABLE_DEVICE_MAPPER = yes; then
--
cgit v1.1
+
+From 60b3300ed6d3ba2e7af4ddce55bd873b232d12ff Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Mon, 12 Jun 2023 10:55:19 -0700
+Subject: bug#64034: [PATCH] libparted: link libparted-fs-resize.so to libuuid
+
+uuid_generate() is used in this library
+Hence, add UUID_LIBS to libparted_fs_resize_la_LIBADD to avoid
+
+"ld.lld: error: undefined reference due to --no-allow-shlib-undefined:
uuid_generate"
+
+This is uncovered by lld linker linking fatresize package
+due to this linker defaulting to --no-allow-shlib-undefined.
+
+Signed-off-by: Khem Raj
+Signed-off-by: Brian C. Lane
+---
+ libparted/fs/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
+index 41a60d9..7fa8d14 100644
+--- a/libparted/fs/Makefile.am
b/libparted/fs/Makefile.am
+@@ -75,6 +75,7 @@ libparted_fs_resize_la_LDFLAGS = \
+ EXTRA_DIST += fsresize.sym
+ libparted_fs_resize_la_DEPENDENCIES = $(sym_file)
+
++libparted_fs_resize_la_LIBADD = $(UUID_LIBS)
+ libparted_fs_resize_la_SOURCES = \
+ r/filesys.c \
+ r/fat/bootsector.c \
+--
+cgit v1.1
diff --git a/sys-block/parted/parted-3.6-r1.ebuild
b/sys-block/parted/parted-3.6-r2.ebuild
similarity index 97%
rename from sys-block/parted/parted-3.6-r1.ebuild
rename to sys-block/parted/parted-3.6-r2.ebuild
index ea3667cc4060..38a0f57020cb 100644
--- a/sys-block/parted/parted-3.6-r1.ebuild
+++ b/sys-block/parted/parted-3.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/
commit: 7c5d7fefe2750ec21f43663b5808bfad9832e53c
Author: Sam James gentoo org>
AuthorDate: Tue Oct 17 07:51:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 17 07:53:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5d7fef
sys-block/parted: fix underlinking with libuuid (util-linux)
This showed up when building libblockdev.
Closes: https://bugs.gentoo.org/910487
Signed-off-by: Sam James gentoo.org>
.../files/parted-3.6-underlinked-util-linux.patch | 26 +++
sys-block/parted/parted-3.6-r1.ebuild | 82 ++
2 files changed, 108 insertions(+)
diff --git a/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
b/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
new file mode 100644
index ..6e02f4aac8d8
--- /dev/null
+++ b/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/910487
+https://git.savannah.gnu.org/cgit/parted.git/commit/?id=d22c2d01f62139e0d386d90584cac0705857a571
+
+From d22c2d01f62139e0d386d90584cac0705857a571 Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov
+Date: Thu, 11 May 2023 10:03:59 +0200
+Subject: parted: link to libuuid
+
+parted.c uses libuuid since 61b3a9733c0e0a79ccc43096642d378c8706add6.
+Hence, add UUID_LIBS to PARTED_LIBS to avoid
+"DSO missing from command line" error.
+
+Signed-off-by: Brian C. Lane
+--- a/configure.ac
b/configure.ac
+@@ -298,6 +298,8 @@ Note: originally, libuuid was part of the e2fsprogs
package. Later, it
+ moved to util-linux-ng-2.16, and that package is now the preferred source.])])
+ AC_SUBST([UUID_LIBS])
+
++PARTED_LIBS="$PARTED_LIBS $UUID_LIBS"
++
+ dnl Check for libdevmapper
+ DM_LIBS=
+ if test $ENABLE_DEVICE_MAPPER = yes; then
+--
+cgit v1.1
diff --git a/sys-block/parted/parted-3.6-r1.ebuild
b/sys-block/parted/parted-3.6-r1.ebuild
new file mode 100644
index ..63d57a749b91
--- /dev/null
+++ b/sys-block/parted/parted-3.6-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bcl.asc
+
+inherit autotools verify-sig
+
+DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
+HOMEPAGE="https://www.gnu.org/software/parted/";
+SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
+IUSE="+debug device-mapper nls readline"
+
+# util-linux for libuuid
+RDEPEND="
+ >=sys-fs/e2fsprogs-1.27
+ sys-apps/util-linux
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ readline? (
+ >=sys-libs/ncurses-5.7-r7:0=
+ >=sys-libs/readline-5.2:0=
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ nls? ( >=sys-devel/gettext-0.12.1-r2 )
+ verify-sig? ( >=sec-keys/openpgp-keys-bcl-20230315 )
+ virtual/pkgconfig
+"
+
+DOCS=(
+ AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp}
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
+ "${FILESDIR}"/${PN}-3.3-atari.patch
+ # https://lists.gnu.org/archive/html/bug-parted/2022-02/msg0.html
+ "${FILESDIR}"/${PN}-3.4-posix-printf.patch
+ # https://debbugs.gnu.org/61129
+ "${FILESDIR}"/${PN}-3.6-tests-unicode.patch
+ # https://debbugs.gnu.org/61128
+ "${FILESDIR}"/${PN}-3.6-tests-non-bash.patch
+ # bug #910487
+ "${FILESDIR}"/${P}-underlinked-util-linux.patch
+)
+
+# false positive
+QA_CONFIG_IMPL_DECL_SKIP="MIN"
+
+src_prepare() {
+ default
+ eautoreconf
+
+ touch doc/pt_BR/Makefile.in || die
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable debug)
+ $(use_enable device-mapper)
+ $(use_enable nls)
+ $(use_with readline)
+ --disable-rpath
+ --disable-static
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -type f -name '*.la' -delete || die
+}
[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/
commit: 6e9c60bfbd378315b88e3aeaffe1d4695f3fc741
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Jan 3 17:22:33 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Jan 3 17:23:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9c60bf
Revert "sys-block/parted: Reintroduce PED_ASSERT with correct assertion"
This reverts commit 4bab6569878f89180d50a40524a675712b0cec2a.
Apparently the initial "fix" was better.
Signed-off-by: Jeroen Roovers gentoo.org>
sys-block/parted/files/parted-3.3-atari.patch | 2 +-
sys-block/parted/{parted-3.3-r2.ebuild => parted-3.3-r1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-block/parted/files/parted-3.3-atari.patch
b/sys-block/parted/files/parted-3.3-atari.patch
index af9c488d48d..41771d02d4e 100644
--- a/sys-block/parted/files/parted-3.3-atari.patch
+++ b/sys-block/parted/files/parted-3.3-atari.patch
@@ -5,7 +5,7 @@
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);
-+ PED_ASSERT ((atr_c_locale = newlocale(LC_ALL_MASK, "C", (locale_t) 0))
!= (locale_t) 0);
++ 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-r2.ebuild
b/sys-block/parted/parted-3.3-r1.ebuild
similarity index 100%
rename from sys-block/parted/parted-3.3-r2.ebuild
rename to sys-block/parted/parted-3.3-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/
commit: 1af57544e419afdbc54cb6dc76e053593e4bb088
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Jan 3 14:47:20 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Jan 3 14:49:17 2020 +
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 000..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() {
[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/
commit: 7d0c90e27adbcfc0f88123b559d586e618364d55
Author: Mike Frysinger gentoo org>
AuthorDate: Tue Jun 21 19:04:24 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Jun 21 19:04:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0c90e2
sys-block/parted: fix building w/newer glibc #580022
sys-block/parted/files/parted-3.2-sysmacros.patch | 28 +++
sys-block/parted/parted-3.2-r1.ebuild | 3 ++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch
b/sys-block/parted/files/parted-3.2-sysmacros.patch
new file mode 100644
index 000..a29e761
--- /dev/null
+++ b/sys-block/parted/files/parted-3.2-sysmacros.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/580022
+
+From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger
+Date: Tue, 21 Jun 2016 15:01:08 -0400
+Subject: [PATCH] include sysmacros.h for major/minor/makedev
+
+Linux C libs are moving away from including this header implicitly via
+sys/types.h, so include it explicitly.
+---
+ libparted/arch/linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
+index 326b95619d31..e5c168be3c68 100644
+--- a/libparted/arch/linux.c
b/libparted/arch/linux.c
+@@ -37,6 +37,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include /* for uname() */
+ #include
+--
+2.8.2
+
diff --git a/sys-block/parted/parted-3.2-r1.ebuild
b/sys-block/parted/parted-3.2-r1.ebuild
index 7b07c23..0180e45 100644
--- a/sys-block/parted/parted-3.2-r1.ebuild
+++ b/sys-block/parted/parted-3.2-r1.ebuild
@@ -34,7 +34,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PN}-3.2-devmapper.patch \
"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch \
- "${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch
+ "${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch \
+ "${FILESDIR}"/${PN}-3.2-sysmacros.patch
eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: sys-block/parted/, sys-block/parted/files/
commit: 3a1036332df7e2b01d5e6fedd91dad7415de
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Oct 10 04:01:34 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Oct 10 04:01:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a103633
sys-block/parted: Fix crash on resizing FAT16 (bug #562136 by Nico R.).
Package-Manager: portage-2.2.22
.../files/parted-3.2-fix-resizing-FAT16.patch | 64 ++
sys-block/parted/parted-3.2-r1.ebuild | 59
2 files changed, 123 insertions(+)
diff --git a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
new file mode 100644
index 000..2a5a231
--- /dev/null
+++ b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
@@ -0,0 +1,64 @@
+From 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Mon Sep 17 00:00:00 2001
+From: Mike Fleetwood
+Date: Sun, 28 Sep 2014 15:15:48 +
+Subject: lib-fs-resize: Prevent crash resizing FAT16 file systems
+
+Resizing FAT16 file system crashes in libparted/fs/r/fat/resize.c
+create_resize_context() because it was dereferencing NULL pointer
+fs_info->info_sector to copy the info_sector.
+
+Only FAT32 file systems have info_sector populated by fat_open() ->
+fat_info_sector_read(). FAT12 and FAT16 file systems don't have an
+info_sector so pointer fs_info->info_sector remains assigned NULL from
+fat_alloc(). When resizing a FAT file system create_resize_context()
+was always dereferencing fs_info->info_sector to memory copy the
+info_sector, hence it crashed for FAT12 and FAT16.
+
+Make create_resize_context() only copy the info_sector for FAT32 file
+systems.
+
+Reported by Christian Hesse in
+https://bugzilla.gnome.org/show_bug.cgi?id=735669
+---
+diff --git a/NEWS b/NEWS
+index 297b0a5..da7db50 100644
+--- a/NEWS
b/NEWS
+@@ -2,6 +2,10 @@ GNU parted NEWS-*-
outline -*-
+
+ * Noteworthy changes in release ?.? (-??-??) [?]
+
++** Bug Fixes
++
++ libparted-fs-resize: Prevent crash resizing FAT16 file systems.
++
+
+ * Noteworthy changes in release 3.2 (2014-07-28) [stable]
+
+diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c
+index 919acf0..bfe60a0 100644
+--- a/libparted/fs/r/fat/resize.c
b/libparted/fs/r/fat/resize.c
+@@ -668,11 +668,17 @@ create_resize_context (PedFileSystem* fs, const
PedGeometry* new_geom)
+
+ /* preserve boot code, etc. */
+ new_fs_info->boot_sector = ped_malloc (new_geom->dev->sector_size);
+- new_fs_info->info_sector = ped_malloc (new_geom->dev->sector_size);
+ memcpy (new_fs_info->boot_sector, fs_info->boot_sector,
+ new_geom->dev->sector_size);
+- memcpy (new_fs_info->info_sector, fs_info->info_sector,
+- new_geom->dev->sector_size);
++ new_fs_info->info_sector = NULL;
++ if (fs_info->fat_type == FAT_TYPE_FAT32)
++ {
++ PED_ASSERT (fs_info->info_sector != NULL);
++ new_fs_info->info_sector =
++ ped_malloc (new_geom->dev->sector_size);
++ memcpy (new_fs_info->info_sector, fs_info->info_sector,
++ new_geom->dev->sector_size);
++ }
+
+ new_fs_info->logical_sector_size = fs_info->logical_sector_size;
+ new_fs_info->sector_count = new_geom->length;
+--
+cgit v0.9.0.2
diff --git a/sys-block/parted/parted-3.2-r1.ebuild
b/sys-block/parted/parted-3.2-r1.ebuild
new file mode 100644
index 000..e48c620
--- /dev/null
+++ b/sys-block/parted/parted-3.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
+HOMEPAGE="https://www.gnu.org/software/parted";
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86"
+IUSE="+debug device-mapper nls readline selinux static-libs"
+RESTRICT="test"
+
+# specific version for gettext needed
+# to fix bug 85999
+RDEPEND="
+ >=sys-fs/e2fsprogs-1.27
+ >=sys-libs/ncurses-5.7-r7:0=
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ readline? ( >=sys-libs/readline-5.2:0= )
+ selinux? ( sys-libs/libselinux )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( >=sys-devel/gettext-0.12.1-r2 )
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-3.2-devmapper.patch \
+ "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch \
+ "${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable debug) \
+ $(use_enable device-mapper) \
+ $(use_enable nls) \
+ $(use_enable selinux
