gentoo auto-resync : 13:05:2024 - 00:01:18

3 files changed, 43 insertions, 3 deletions

diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 5f9ce6be7fdd..f859880e6610 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -3,8 +3,8 @@ AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d
 AUX parted-3.4-posix-printf.patch 2872 BLAKE2B 55c1bef638a88f7d3b5b1f90ca28df1d0ccb40590536c0a0f10416509c3d90a2a329dd530ebbcc9945b2eefb7a3540a113d27a73c7d636b372eb9fc8e19f7eed SHA512 d16bb7e3cfccaa8b40ece90b507559857fb1a4f5a08bc93da61b7afde4b69e06de363948426cec66cbb1135d6d1d5a50206cee6cec9973e1cb02aefe50697670
 AUX parted-3.6-tests-non-bash.patch 3100 BLAKE2B 2aa7c4fcb03cdd354e85c8bd0696a07a09106cc37e482d7bcd720146964468b6d234195ba900dc2afb982f2348bd5455617072e8cace04feef959aad05ccdb30 SHA512 d0b6f9ff544255ae4240dda1d7b44385224dbbf64c8059e5cc1338a348cc2c045eb23d3f3e9c3b4d4fe2fba677a99f235232a38310e95c6565e412e44ed526dc
 AUX parted-3.6-tests-unicode.patch 2009 BLAKE2B 73e376209d1aa99d6f9988e139e2b15f68c78d3fdfc17b86113cb05b2611591d7dadabeee5a72be837bee047d898615f27dfd6e2d8e077ef05de6cf3cfeff4ed SHA512 1fe8f8155b5c155cd39fa859318066e6580497b044e31b22f8a22b8617662e35b028879e5f9bcea1ec6c7e4aad038d5803c635a3e2b57a7a769a09e3194890d8
-AUX parted-3.6-underlinked-util-linux.patch 894 BLAKE2B 9dd271f6f1ee57fdb620e44e8b0431f8bc686901eb186359597551bc26dc39b70cb859a26044c8bcd373ad32c4966593f7e7124497967ae22d9ca387d1e12746 SHA512 20603f536adccf798aa7028415c3ee4b91f237d6d9fe862d0acd1c162a114756db69838b754e4292666fc39cd1b770cde7f50394a2ec7add75d50b91cbd9f38f
+AUX parted-3.6-underlinked-util-linux.patch 2120 BLAKE2B 3aeabc6e752abf84888bc4a50a7f030d103e403a6b8c8c3d7ede0dee1247e0870fb91b502da0f45d4f576bef2408558b5ff68f06e8daf415b9ea4679fbe0bf68 SHA512 c69fe8f298d7dfe41ed37d8df150864ca4abe806b8ce87d606a0dfa3897d30076d751dc23b95923790f9da58547c7f02aadabdd6aa3f8db3a5dae527792e682f
 DIST parted-3.6.tar.xz 1896164 BLAKE2B 99b6d096e4db05144c98e9f0a9a97c647aa911ee5df031244b03d5223f709d43d9302cef12dd4b2f97f42ec476510561b7f8b3b1ef7cb09d0a7c4d512e7a6739 SHA512 034a44b25718acba175212019d24f092972a791c5bd1d921ae91e17478657a77c5c5dd0c832bed7968c3a07ec6c65c0785acfac2f90c1ca5e1692f3c141693ef
 DIST parted-3.6.tar.xz.sig 508 BLAKE2B 92fbf624cfeb474e36d43954ecf6c42cf86557b99c7cd477c648bdeefb3ca2b40c51c320b20ea91075276d9ccc1da4219cd843b2916157c564c92a34a35ec55f SHA512 7c845026937b29fb49085ef9e3354226b73a1c3b5f9082d440d9a8ac13d76b1d07dae0bc10d8c974d4e57bc582f38c0a908e80718dd1ff1adfad3b04699c672c
-EBUILD parted-3.6-r1.ebuild 1843 BLAKE2B 46a7deda8ff862d03a8cbcbf65dcff1e497a3a053471843d013fd26721aaa44324bfe69cb21c3f3ceaf0f0f8880ebd5e23d17065ce2d07ea795dc8534f41e63b SHA512 5add24267cec686607bb483010351b31b727271161a7a39a21d8336989f3e7616d7905a6e445f1b4e15ec280f6204dfeeb52ade17011bdbed85cff23f0c24641
+EBUILD parted-3.6-r2.ebuild 2064 BLAKE2B 2f9b1b3b32f52a309a4b0e7d7fe33e207dce872958ed75d654893e282af1aa65a2cc06873b27f0641a78da2e48fe76ffd483ad20482cc7bb7175512026d59e52 SHA512 772be62fe2960d81c2af23c7cdb0c8a769aa20285a553ba24a0c7f13649f1022344d9e3ef21bb26a1e65814e996b4cbd210c0fca1517bbf9e6479bf729899aab
 MISC metadata.xml 1060 BLAKE2B b37f3b9d7869cb816ece89fa99d2fcd3569ee8d224b1aa4d9f7189169fe91b63762323a2e8b07c57ec4e0dbf46fa325c9919d1d11f09489c855fc7c319c4ffa0 SHA512 1d9646a575046ea235bd2417d70e03b472f7b1fe6a1c2c2fd85cb5acdb03517658020f656a519b83db580c4faa13843ef1b47d5bc645d04f8955415024bc5260
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 <yegorslists@googlemail.com>
@@ -24,3 +25,37 @@ Signed-off-by: Brian C. Lane <bcl@redhat.com>
  if test $ENABLE_DEVICE_MAPPER = yes; then
 -- 
 cgit v1.1
+
+From 60b3300ed6d3ba2e7af4ddce55bd873b232d12ff Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+Signed-off-by: Brian C. Lane <bcl@redhat.com>
+---
+ 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
index ea3667cc4060..9de1986f0bf4 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
@@ -64,6 +64,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -fanalyzer substantially slows down the build and isn't useful for
+	# us. It's useful for upstream as it's static analysis, but it's not
+	# useful when just getting something built.
+	export gl_cv_warn_c__fanalyzer=no
+
 	local myconf=(
 		$(use_enable debug)
 		$(use_enable device-mapper)