gentoo auto-resync : 24:12:2024 - 06:30:57

20 files changed, 51 insertions, 911 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3efd48adfd80..ff66094bb0f6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index c87a99e56738..6c12943120ba 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,15 +1,8 @@
-AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 AUX iproute2-6.10.0-musl-1.patch 1243 BLAKE2B 66853640dec036026b4c9dce0e1ecd3278492a5ebda55a36e2098404ffab12e4606f796c6fa00765a6cc37dbbb87fd42c841b442561a85397491bde7181cef86 SHA512 b89ade7182ef09ac3bd99fdfc15c36ebf1911941d9f967f88d62738a646795998d17082147a649a32d390a015465d2e8fe7cbbc8dfdd4d5d5bd9d54be67ce9a3
 AUX iproute2-6.10.0-musl-2.patch 1452 BLAKE2B b20f3a0769379339651a9c781b5a53e41f0678ad1493878ec0523698e86dd9f702a527cc3c09a5c9607309e750a19798346ee5f3ddf580739bd6d949f05ce671 SHA512 1958e1d4ee92092d169d87de8a8983aaf656b78b4f0ba7188b449768250457ad4f2266876d0077f39d9c0dc27e2531c4a76f6b13f44095c614d88ec7c1e0c302
 AUX iproute2-6.11.0-musl-fixes.patch 763 BLAKE2B c7cf3f2c47152636b4560a84ffcaf7eb7b1dc205f188a9c4e84c2caf9e091fc1bb69909dfe62ac011e374d72fcae617ccd707d2c50113663c91870b921e91598 SHA512 ed5d30fb3637e7ee1a2ff3cd3180f80f0aa578ac383e86ae0d35a6bfc733e87174eae8603aade7f32573d200258f3baa52b35e81ef43a7daad887522f0d8b522
 AUX iproute2-6.12.0-musl-3.patch 905 BLAKE2B 790957e0431e4014a06217d45eda0cd11313606573047e1a42044285ef07fb3b1abd99ad9c6c11ca07bcc245929629dd44389e363257f12e6bf516bbabd14b7d SHA512 2575a23f10506d4b255d0f8ae050c6c5315ffdbe21a7b7e606f52b5320f409a9c36a71765b9fa9a3ca5b286c03490b4a853cfe1e3d544585fb052297c3372119
-AUX iproute2-6.4.0-disable-libbsd-fallback.patch 843 BLAKE2B b7b27ce8ee0f7961932cfdba071e4062688dd4ae0cd4aad742f3fdc66fd76a70dd0eea97e59efa7d94a8dd3713bcb0b2aae72c46853a3c7be50acf50af7538e6 SHA512 0610d4fc282575c6c78d02362492dda9ae79de24a4024c64a7cfa8138b94f11ea4dd50fcd741475992dfb88861e672f96854111d23bd690a8949adbbf5378970
-AUX iproute2-6.5.0-configure-nomagic-nolibbsd.patch 6966 BLAKE2B bc2da6f561ebd10aa40438b9bfd9d6b25db2edee844ff31e7e8726b3b3a282db7e7bd1ee3955642608a03d9d11b900e4fb26b35f0bec7f07d844337424f2da8a SHA512 84ab38bebb1687ba743a1d4ed5eafc484b02b6ba96e8650b988a30456c9b936718dee7640ef97cecc07565b7e0ddcc7cad5002961b3ff0cfcefddd87eb64d067
-AUX iproute2-6.5.0-mtu.patch 1719 BLAKE2B ef2dc2f3ce23432464b778584c53b3a204a05e7dac1d87969563d89b94bbcd04ff080f21d9809e43f75751b63b49ea506e0ae8191a6170b9c76dae043f861621 SHA512 4057309aaa53e97fa8ed0a410e42e4cf1f70e20a278a299b49261ef00ad8050bfad903e1a91b123a7c99e041732e23088274a8b79c0b2290482acf9735fd8cc1
-AUX iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch 754 BLAKE2B a7035177a9e8440b42543786e11b7f470469d63adb0454d683ea9563ab9b4e704c8e9c524d08369b9c87f63855ed5bcb983322ee9de1508752553166945c38e5 SHA512 4f3bc78450615ae8f9180caca2ba6c86d7954868273762aa488d347852d7d6807e5aee52cad5e4709a64aa257df448b9471e2c729dcd746a24ae8209bd2d9796
-AUX iproute2-6.6.0-makefile-use-usr-share-config.patch 1896 BLAKE2B a4fdb2cc8ca3cba86e00d57138f306bcb7465ac04fb7ba3750f0f3ac20c3774e247e743d706cefeb418591163eb4fa7a38c1548605e9699c34df129bcba5069c SHA512 d769ff1f01e6015b27cf151868180a9b3058b53cbc920bb580284d6edbc95821a5493020b667927da51b28cd178eeb35216f00451012a49e7508f406792b680a
 AUX iproute2-6.6.0-musl-c99.patch 2988 BLAKE2B c8b3f929a6d5423c95546fb93c5a6754856b75778ec053afffabc398affd72cb73429f4b889478e25c7d0b19bd59dcc5bc0e6a6323f6e3588efd9342181f4bd7 SHA512 7d0ff890371bc4115cd6cfd253fb70eeaedc048d83a030511cb97d5f03cede2fd20950adb3a8d4b704aea81ed6471ca72341c31f46571d1c9930cfe269c5868b
-AUX iproute2-6.6.0-revert-CONF_USR_DIR.patch 1325 BLAKE2B 4301d995f758167719699cfd04692debff6b2b46dda442ff53cb9b913406c95e2df31e3f763dc22d5923e0eb387439feeac8d55751419c9f4553a89a476f9a80 SHA512 23f20035b0a0fe42695b560785820f31d005963ff4cad18f47b7a412836cd4327962244055b89b53794e41a92754fd3464a9ca1fd2cd767aad094a0c125a7d13
 AUX iproute2-6.8.0-configure-nomagic-nolibbsd.patch 7010 BLAKE2B 4aab31c6da283789a6d7aca1b2dddeb828983d8bd4d929a05f5678dc1e4ca67e6e60be173c0968b5aeb3c8b40a4a1d4b307df02171e7adb296d508bb758f8e3f SHA512 0aa9cd6963cbd400f8284299cbeba7d36fe9f4cc775ebc114caf3f7e9479296776bf62415e49cbf821dc3a1c6f6d161fa23e973c44620c3f2a7077de750e9cda
 AUX iproute2-6.8.0-disable-libbsd-fallback.patch 777 BLAKE2B 099a8a59ff6fe385e0bc3e33b94e20ea3319af70b54e45eaad870d8bc84a9cc59057a3d9e51fb566891128a051244e54365c5fb0287d6db859bfd4596dd0ce86 SHA512 c577f536781e1b37f40ddc691697d4875614d392b28f3cd5c53bd27b3a66cfeab39b9e69140274d8713d948cbaccf62fad1845c97500931ec67de51154e59640
 AUX iproute2-6.9.0-mtu.patch 1135 BLAKE2B 503eb3ece9ef5b5a7918a0e26f7b1d57ed6889143e440d97ad7a56305d7a36e148b68e1f9f5de0c13656336ca9a675902aacb42e9866f053b2a68f5ae8c1bd80 SHA512 6b8fec963825ed8e9a51d559a87aa2ae0df53f8c288804547c2e8a9425a2c41a6c0524ee491f1600d011d9175aff3fcdaaec20a18f81e225cab7472f625f4b07
diff --git a/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch b/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch
deleted file mode 100644
index be606c107fc2..000000000000
--- a/sys-apps/iproute2/files/iproute2-5.7.0-mix-signal.h-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/devlink/devlink.c
-+++ b/devlink/devlink.c
-@@ -15,6 +15,7 @@
- #include <string.h>
- #include <stdbool.h>
- #include <unistd.h>
-+#include <signal.h>
- #include <getopt.h>
- #include <limits.h>
- #include <errno.h>
diff --git a/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch b/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch
deleted file mode 100644
index 888091387fe9..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.4.0-disable-libbsd-fallback.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Disable the optional libbsd fallback in favor of iproute2's own
-strlcat/strlcpy routines. This prevents automagic linking and
-all sorts of other related problems.
-
-Bug: https://bugs.gentoo.org/911727
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
-
---- a/configure	2023-09-05 16:20:48.000000000 +0200
-+++ b/configure	2023-09-05 16:29:15.850347415 +0200
-@@ -454,14 +454,8 @@ EOF
-     if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
- 	echo "no"
-     else
--	if ${PKG_CONFIG} libbsd --exists; then
--		echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
--		echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
--		echo "no"
--	else
- 		echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
- 		echo "yes"
--	fi
-     fi
-     rm -f $TMPDIR/strtest.c $TMPDIR/strtest
- }
diff --git a/sys-apps/iproute2/files/iproute2-6.5.0-configure-nomagic-nolibbsd.patch b/sys-apps/iproute2/files/iproute2-6.5.0-configure-nomagic-nolibbsd.patch
deleted file mode 100644
index 4618fb9c94ef..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.5.0-configure-nomagic-nolibbsd.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libbsd, libelf, libmnl & libcap based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v5.11.0 to v5.12.0 by Lars Wendler <polynomial-c@gentoo.org>
-
-Update 2023-09-05: Removed libbsd enforcement from config.include for bug #911727
-by Holger Hoffstätte <holger@applied-asynchrony.com>
-
---- a/config.include
-+++ b/config.include
-@@ -0,0 +1,26 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+	CFLAGS += $(HAVE_ELF_CFLAGS)
-+	LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+	CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+	LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+	CFLAGS += $(HAVE_MNL_CFLAGS)
-+	LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+ifeq ($(HAVE_CAP),y)
-+	CFLAGS += $(HAVE_CAP_CFLAGS)
-+	LDLIBS += $(HAVE_CAP_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
-
---- a/bridge/Makefile
-+++ b/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o vni.o
- 
- include ../config.mk
-+include ../config.include
- 
- all: bridge
- 
---- a/configure
-+++ b/configure
-@@ -202,7 +202,7 @@ EOF
-     if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
- 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- 	echo "yes"
--	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -269,8 +269,8 @@ check_elf()
- 	echo "HAVE_ELF:=y" >>$CONFIG
- 	echo "yes"
- 
--	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
--	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -388,8 +388,8 @@ check_selinux()
- 		echo "HAVE_SELINUX:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
--		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -414,8 +414,8 @@ check_mnl()
- 		echo "HAVE_MNL:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -455,8 +455,8 @@ EOF
- 	echo "no"
-     else
- 	if ${PKG_CONFIG} libbsd --exists; then
--		echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
-+		echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
-+		echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
- 		echo "no"
- 	else
- 		echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
-@@ -472,8 +472,8 @@ check_cap()
- 		echo "HAVE_CAP:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
-+		echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-+		echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -633,7 +633,3 @@ check_strlcpy
- 
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
---- a/dcb/Makefile
-+++ b/dcb/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DCBOBJ = dcb.o \
-          dcb_app.o \
---- a/devlink/Makefile
-+++ b/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DEVLINKOBJ = devlink.o mnlg.o
- TARGETS += devlink
---- a/genl/Makefile
-+++ b/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
- 
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
- 
- CFLAGS += -fno-strict-aliasing
---- a/ip/Makefile
-+++ b/ip/Makefile
-@@ -18,6 +18,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
- RTMONOBJ=rtmon.o
- 
- include ../config.mk
-+include ../config.include
- 
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=routel
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -fPIC
- 
---- a/misc/Makefile
-+++ b/misc/Makefile
-@@ -5,6 +5,7 @@ LNSTATOBJ=lnstat.o lnstat_util.o
- TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_BERKELEY_DB),y)
- 	TARGETS += arpd
---- a/netem/Makefile
-+++ b/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- a/rdma/Makefile
-+++ b/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -I./include/uapi/
- 
---- a/tc/Makefile
-+++ b/tc/Makefile
-@@ -4,6 +4,7 @@ TCOBJ= tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o tc_monitor.o \
-        emp_ematch.tab.o emp_ematch.lex.o
- 
- include ../config.mk
-+include ../config.include
- 
- SHARED_LIBS ?= y
- 
---- a/tipc/Makefile
-+++ b/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TIPCOBJ=bearer.o \
-     cmdl.o link.o \
---- a/vdpa/Makefile
-+++ b/vdpa/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -I./include/uapi/
- VDPAOBJ = vdpa.o
--- 
-2.42.0
-
diff --git a/sys-apps/iproute2/files/iproute2-6.5.0-mtu.patch b/sys-apps/iproute2/files/iproute2-6.5.0-mtu.patch
deleted file mode 100644
index f2895021eb1b..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.5.0-mtu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://bugs.gentoo.org/291907
-
-This patch was merged from two patches extracted from this thread:
-http://markmail.org/thread/qkd76gpdgefpjlfn
-
-tc_stab.c: small fixes to commandline help
-
-
-tc_core.c:
-As kernel part of things relies on cell align which is always set to -1,
-I also added it to userspace computation stage. This way if someone
-specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't
-end with tsize supporting mtu 4096 suddenly, New default mtu is also set
-to 2048 (disregarding weirdness of setting mtu to such values).
-
-
-Unless I missed something, this is harmless and feels cleaner, but if it's
-not allowed, documentation will have to be changed back to 2047 + extra
-explanation as well.
---- a/tc/tc_core.c
-+++ b/tc/tc_core.c
-@@ -197,12 +197,12 @@ int tc_calc_size_table(struct tc_sizespec *s, __u16 **stab)
- 	}
- 
- 	if (s->mtu == 0)
--		s->mtu = 2047;
-+		s->mtu = 2048;
- 	if (s->tsize == 0)
- 		s->tsize = 512;
- 
- 	s->cell_log = 0;
--	while ((s->mtu >> s->cell_log) > s->tsize - 1)
-+	while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1)
- 		s->cell_log++;
- 
- 	*stab = malloc(s->tsize * sizeof(__u16));
---- a/tc/tc_stab.c
-+++ b/tc/tc_stab.c
-@@ -27,7 +27,7 @@ static void stab_help(void)
- 	fprintf(stderr,
- 		"Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ]\n"
- 		"                [ overhead BYTES ] [ linklayer TYPE ] ...\n"
--		"   mtu       : max packet size we create rate map for {2047}\n"
-+		"   mtu       : max packet size we create size table for {2048}\n"
- 		"   tsize     : how many slots should size table have {512}\n"
- 		"   mpu       : minimum packet size used in rate computations\n"
- 		"   overhead  : per-packet size overhead used in rate computations\n"
--- 
-2.42.0
-
diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch b/sys-apps/iproute2/files/iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
deleted file mode 100644
index 0969ff0a7ab9..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.6.0-configure-Add-_GNU_SOURCE-to-strlcpy-configure-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://lore.kernel.org/netdev/20231202024705.1375296-1-sam@gentoo.org/T/#u
-
-From 3dc0bf34c1571429c08a8d0c08a69502e3e4575c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 2 Dec 2023 02:46:05 +0000
-Subject: [PATCH] configure: Add _GNU_SOURCE to strlcpy configure test
-
->=glibc-2.38 adds strlcpy but it's guarded under a feature-test macro. Just
-add _GNU_SOURCE to the configure test because we already pass _GNU_SOURCE unconditionally
-in the Makefiles when building iproute2.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure
-+++ b/configure
-@@ -445,6 +445,7 @@ EOF
- check_strlcpy()
- {
-     cat >$TMPDIR/strtest.c <<EOF
-+#define _GNU_SOURCE
- #include <string.h>
- int main(int argc, char **argv) {
- 	char dst[10];
--- 
-2.43.0
-
diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-makefile-use-usr-share-config.patch b/sys-apps/iproute2/files/iproute2-6.6.0-makefile-use-usr-share-config.patch
deleted file mode 100644
index 03c125accc8c..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.6.0-makefile-use-usr-share-config.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/920054
-https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=962692356a1cc41932e43575f3c50927e455ab53
-
-From 962692356a1cc41932e43575f3c50927e455ab53 Mon Sep 17 00:00:00 2001
-From: Andrea Claudi <aclaudi@redhat.com>
-Date: Wed, 15 Nov 2023 18:25:35 +0100
-Subject: Makefile: use /usr/share/iproute2 for config files
-
-According to FHS:
-
-"/usr/lib includes object files and libraries. On some systems, it may
-also include internal binaries that are not intended to be executed
-directly by users or shell scripts."
-
-A better directory to store config files is /usr/share:
-
-"The /usr/share hierarchy is for all read-only architecture independent
-data files.
-
-This hierarchy is intended to be shareable among all architecture
-platforms of a given OS; thus, for example, a site with i386, Alpha, and
-PPC platforms might maintain a single /usr/share directory that is
-centrally-mounted."
-
-Accordingly, move configuration files to $(DATADIR)/iproute2.
-
-Fixes: 946753a4459b ("Makefile: ensure CONF_USR_DIR honours the libdir config")
-Reported-by: Luca Boccassi <luca.boccassi@gmail.com>
-Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
-Acked-by: Luca Boccassi <bluca@debian.org>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a24844cf0..8024d45ec 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,12 +16,12 @@ endif
- 
- PREFIX?=/usr
- SBINDIR?=/sbin
--CONF_ETC_DIR?=/etc/iproute2
--CONF_USR_DIR?=$(PREFIX)/lib/iproute2
- NETNS_RUN_DIR?=/var/run/netns
- NETNS_ETC_DIR?=/etc/netns
- DATADIR?=$(PREFIX)/share
- HDRDIR?=$(PREFIX)/include/iproute2
-+CONF_ETC_DIR?=/etc/iproute2
-+CONF_USR_DIR?=$(DATADIR)/iproute2
- DOCDIR?=$(DATADIR)/doc/iproute2
- MANDIR?=$(DATADIR)/man
- ARPDDIR?=/var/lib/arpd
--- 
-cgit 1.2.3-korg
diff --git a/sys-apps/iproute2/files/iproute2-6.6.0-revert-CONF_USR_DIR.patch b/sys-apps/iproute2/files/iproute2-6.6.0-revert-CONF_USR_DIR.patch
deleted file mode 100644
index 79be096af231..000000000000
--- a/sys-apps/iproute2/files/iproute2-6.6.0-revert-CONF_USR_DIR.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/920054
-https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=deb66acabe44d103c8368b62a76ef37aa074748d
-
-From deb66acabe44d103c8368b62a76ef37aa074748d Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Mon, 6 Nov 2023 00:14:10 +0000
-Subject: Revert "Makefile: ensure CONF_USR_DIR honours the libdir config"
-
-LIBDIR in Debian and derivatives is not /usr/lib/, it's
-/usr/lib/<architecture triplet>/, which is different, and it's the
-wrong location where to install architecture-independent default
-configuration files, which should always go to /usr/lib/ instead.
-Installing these files to the per-architecture directory is not
-the right thing, hence revert the change.
-
-This reverts commit 946753a4459bd035132a27bb2eb87529c1979b90.
-
-Signed-off-by: Luca Boccassi <bluca@debian.org>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 5c559c8dc..a24844cf0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,7 @@ endif
- PREFIX?=/usr
- SBINDIR?=/sbin
- CONF_ETC_DIR?=/etc/iproute2
--CONF_USR_DIR?=$(LIBDIR)/iproute2
-+CONF_USR_DIR?=$(PREFIX)/lib/iproute2
- NETNS_RUN_DIR?=/var/run/netns
- NETNS_ETC_DIR?=/etc/netns
- DATADIR?=$(PREFIX)/share
--- 
-cgit 1.2.3-korg
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 1836375da5ae..f03d58f652b9 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -3,6 +3,7 @@ AUX bootlogd.initd 276 BLAKE2B afc0ce0406b38d9d29398f054668f78f0d90994421b3a8a1b
 AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaaa834be2049411148ec18b591283d85f42b0c3c1e41f442ba95c5f5b4cd9e87b39a83d51e SHA512 aaf46f9c74ae58027e59f32e5e929ff6529206d07fdf4e3f17962ccbc46c68d34e4e2839019708a763dead93b83ca8f457379491830ab43d6407247fd7ac2a77
 AUX inittab-2.98-r1 2124 BLAKE2B 57e40e8410a31ec73f581e2feb142c600e2ce687745a6135961c0f1ea31e77f1acf9b9be1cf4c1d55685802a913304056cf1f137686f14d89caa9ec973d751c2 SHA512 6ce22ba933158d1a0fc7d0eaa9536b1cdcd8baa90cddfe8b1bf7a1f7292ba7fc14b6b46968848301a2e573939b4e21ce8d64bf3a9eaeb4d038de7d113fd3b9fb
 AUX sysvinit-3.08-shutdown-single.patch 1341 BLAKE2B f0b2ac2e803a3521f0473ab50b18aec300ad0c4566c0f0a53924b32540e862437ee5d99c3f54fe453e84d9ebe8011f64e75f60ca1f73cc9606b30a867df68e7d SHA512 7b3ba5c8af1e25ecc59568e920446da66fd53284e2bca0eb4b8cae2f9b919552c254e74c7363bb3598f2a35a413dcb31008dd8cae57ceaf98f6bf8921918cce7
+AUX sysvinit-3.12-delete-moved-programs.patch 1522 BLAKE2B 1eafb58c0ac29b8b8ac38a7db1138d8e128d9908abbdcbc94bb29d5d08c1a520ccf9cbcdbec03175a699814c4922e64df63d0a52982cd5b0f3256dbb95aa2175 SHA512 2517d634417f87f5faa7382b25724528e2312d7866ebeb9c1220493ef5001b1ea0a552990b19ee5d7f473e36536cc9a01aeaa8f0fc0937bfcf240137a47edf4b
 DIST sysvinit-3.08.tar.xz 268296 BLAKE2B ec4a4ff3663ac7d67808b50b67631ff4fe1ab56d376df15868df0eb79cbc329b192af124380eec6a797d827c3c7c5586058310d803f42ee1934dcffbfbe876f7 SHA512 a523e030e559ecc56391f9424e240fbe54a714bb3c522ca0bb410b649a1c08c5e9f03d298340a5586565f18d8640b1b418fa09294b41fb95a9cd2a686316b758
 DIST sysvinit-3.08.tar.xz.sig 833 BLAKE2B b1cbe8a95faa16a22e92e2a8841643aeaf7a5a31cc9fa9628a7ee2400aac1b3a184ae01f09c75d48d5d55a71f7e62feb25c16345644bfb4fcd19cbd061f86573 SHA512 1af105d84b98428766cc315d8dea068e6c5a7ad52008291ba7c1d5accbcaeead4999fd714fc152c1038e54953f9b469bd0f792a0830e68c3e2f43afcd36e0e2d
 DIST sysvinit-3.09.tar.xz 239600 BLAKE2B 81c3e80dd66896110b1a2488415dd20fae03b4b7d8d4f40d175c195942e1c13367a7f1cf9efd1c79a37e16684bd12e1c76dbb1f8faab44e495e8de684fe744ef SHA512 ddd3681e24c699f9f0cf2cfc44488e32205a8fcf1723b79da47b95adef0c0edc1d9fd387d259dba15a2158fbd0b7920d789b46a9f3c7cd016a12bb1dc92f00d4
@@ -17,5 +18,5 @@ EBUILD sysvinit-3.08.ebuild 5740 BLAKE2B a57883b5b5c7f335d4ba63b0d1686261782e3c8
 EBUILD sysvinit-3.09.ebuild 5740 BLAKE2B a57883b5b5c7f335d4ba63b0d1686261782e3c8fdb248837998c9cb7c429b3e3cf00e5523e6a05c46e3e864077226462d6795698d657e9cad8c8dc67900d8b4a SHA512 e86e57c863841d0771ccf86653367c38e9a2bacda1a438895f48ce9268660bf4114eeb38db2dd18b22ef3724c16435dc7c9d9f8733c2412b337781f8f3cf685b
 EBUILD sysvinit-3.10.ebuild 5748 BLAKE2B a8f201de64b27a7fe5de6b53bd0ca6f2d2ea2ddb166a22b37aca08c9b60607ab0c8630d699ce6a562d582ac147b44d60b28596538702bb38ed8c2cf0bfff1378 SHA512 523b1feb41694d8745e82a154f0db7b3d16e563eea5084fae423160245c94224a842515a2d9b1aaca3373fe16a933b3b4c2b143c613ea988d9e7dc5c97c3f8fa
 EBUILD sysvinit-3.11.ebuild 5748 BLAKE2B a8f201de64b27a7fe5de6b53bd0ca6f2d2ea2ddb166a22b37aca08c9b60607ab0c8630d699ce6a562d582ac147b44d60b28596538702bb38ed8c2cf0bfff1378 SHA512 523b1feb41694d8745e82a154f0db7b3d16e563eea5084fae423160245c94224a842515a2d9b1aaca3373fe16a933b3b4c2b143c613ea988d9e7dc5c97c3f8fa
-EBUILD sysvinit-3.12.ebuild 5748 BLAKE2B a8f201de64b27a7fe5de6b53bd0ca6f2d2ea2ddb166a22b37aca08c9b60607ab0c8630d699ce6a562d582ac147b44d60b28596538702bb38ed8c2cf0bfff1378 SHA512 523b1feb41694d8745e82a154f0db7b3d16e563eea5084fae423160245c94224a842515a2d9b1aaca3373fe16a933b3b4c2b143c613ea988d9e7dc5c97c3f8fa
+EBUILD sysvinit-3.12-r1.ebuild 5243 BLAKE2B aeef9abef93eef0727192551cddfc7e47f28ca44640057ff775938aa4bb3acc2d5e4e798cb2995d7fe61b809744c3d9538529b9c429018ba5ab63ba0b5b7d2e7 SHA512 7935a5f296381f5dd39ec92638b0e68d380f1b3001835594151a32fc052ccb574c5a1cc476be1813464c61de7d79495c5c768cfc866db8e91eac3dcced533f7c
 MISC metadata.xml 506 BLAKE2B ea180981d7eafbe8356b6d187c7c1c12afc7ef91d94f7992489ad54f459c924b009bfe7c7888bf1934b356091489285dbda9eee39ab14f318528e0738da6474c SHA512 b5451236ce138c372e32c1f5e4bc25fca9acb05063720d6b452e81b19a7661058b791f6fc95a9f585244ba44ff307d07f6be49aadf1dbb461492575e2af80a89
diff --git a/sys-apps/sysvinit/files/sysvinit-3.12-delete-moved-programs.patch b/sys-apps/sysvinit/files/sysvinit-3.12-delete-moved-programs.patch
new file mode 100644
index 000000000000..0d601432f86c
--- /dev/null
+++ b/sys-apps/sysvinit/files/sysvinit-3.12-delete-moved-programs.patch
@@ -0,0 +1,43 @@
+last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+pidof has moved to >=procps-3.3.9
+logsave is already in e2fsprogs
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -22,19 +22,17 @@ MNTPOINT=
+ 
+ # For some known distributions we do not build all programs, otherwise we do.
+ BIN	=
+-SBIN	= init halt shutdown runlevel killall5 fstab-decode logsave
+-USRBIN	= last mesg readbootlog
++SBIN	= init halt shutdown runlevel killall5 fstab-decode
++USRBIN	= readbootlog
+ 
+-MAN1	= last.1 lastb.1 mesg.1 readbootlog.1
++MAN1	= readbootlog.1
+ MAN5	= initscript.5 inittab.5 initctl.5
+-MAN8	= halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
+-MAN8	+= shutdown.8 telinit.8 fstab-decode.8 logsave.8
++MAN8	= halt.8 init.8 killall5.8 poweroff.8 reboot.8 runlevel.8
++MAN8	+= shutdown.8 telinit.8 fstab-decode.8
+ 
+ ifeq ($(DISTRO),)
+-SBIN	+= sulogin bootlogd
+-USRBIN	+= utmpdump wall
+-MAN1	+= utmpdump.1 wall.1
+-MAN8	+= sulogin.8 bootlogd.8
++SBIN	+= bootlogd
++MAN8	+= bootlogd.8
+ endif
+ 
+ ifeq ($(DISTRO),Debian)
+@@ -215,10 +213,6 @@ install:	all
+ 		ln -sf halt $(ROOT)$(base_sbindir)/reboot
+ 		ln -sf halt $(ROOT)$(base_sbindir)/poweroff
+ 		ln -sf init $(ROOT)$(base_sbindir)/telinit
+-		ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof
+-		if [ ! -f $(ROOT)$(bindir)/lastb ]; then \
+-			ln -sf last $(ROOT)$(bindir)/lastb; \
+-		fi
+ 		$(INSTALL_DIR) $(ROOT)$(includedir)/
+ 		$(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/
+ 		for lang in  '' $(patsubst ../man/po/%.po,%,$(wildcard ../man/po/??.po)); do \
diff --git a/sys-apps/sysvinit/sysvinit-3.12.ebuild b/sys-apps/sysvinit/sysvinit-3.12-r1.ebuild
index a7beec09b9b9..8d7a21844303 100644
--- a/sys-apps/sysvinit/sysvinit-3.12.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.12-r1.ebuild
@@ -52,6 +52,7 @@ BDEPEND="
 PATCHES=(
 	# bug #158615
 	"${FILESDIR}/${PN}-3.08-shutdown-single.patch"
+	"${FILESDIR}/${PN}-3.12-delete-moved-programs.patch"
 )
 
 src_prepare() {
@@ -66,24 +67,6 @@ src_prepare() {
 		-e '/^override CFLAGS +=/s/ -D_FORTIFY_SOURCE=2//' \
 		src/Makefile || die
 
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
 	# Munge inittab for specific architectures
 	cd "${WORKDIR}" || die
 	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 5c28de445c3c..73c4130e904a 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,8 +1,6 @@
 DIST texinfo-7.1.1.tar.xz 5572864 BLAKE2B 64dbd315e65d5b7cb0bb06c918e9924bb15a25a4bb26322db10b7ee98e9e6626b62592f8edd0ff016256f4a84837dabacb5278c3826e34fa3e080a5e8c0fb626 SHA512 05d605fba810f2939cab16ed5ddb341e22d397370648e6e0271c807fa573267e933c75ed7ae682c3c9cfecb568311a8df7abeb8c0556a94ef7169737d5b9c52a
-DIST texinfo-7.1.90.tar.xz 6694376 BLAKE2B b77771e39f8c73cea9c449c1f4268dcdb9603497b719dda036908122805f2f4f85507ee797d7d9d1f4c3e4de236a7be6837c2985d7f10960e347860d98c49a8c SHA512 ecf6359c256c3c203fac26d211b4fad738e5e7cb142005a73df22eb17888296eac17d4748551243fee1f1cf891e612deeeb85bc841c8b64acb99e7fa49d1c3ad
-DIST texinfo-7.1.91.tar.xz 6709648 BLAKE2B 34c7e75ece31919c43292ab00eb2d7160dbdbd5726d63490ae37e17fd7b966e31de3631b66952e3e679bd6b33b5005e2e4799ea282ecf652f31269ae3c2876bd SHA512 8b5bb02c1a4ac77cf8ca59817bf227701a0560d04f5b0ed08e28ed509d66da3bb5b8df677b481d813a529c07a7ebe55b9f2c67ca3cb55678322f13462cc02a5b
+DIST texinfo-7.2.tar.xz 6408432 BLAKE2B fc6bd020310a437a73d5723d257ca3da1d15329e9e668fa78c49ac77759c2c990d4422c2a7071b217ea214b88389a0cbb43d3fcfa5fe9bf9651270167b15c342 SHA512 8e67337ae12a552fc620c43725507a4978710ea6630e98b0f5e98eb3f79a90e191dde5225699aa6217c26f171d277461f76150f0459cd07b40c3234d2f3d89bf
 EBUILD texinfo-7.1.1.ebuild 2678 BLAKE2B a21b07c6e46f2ea964cf16f59eb9d25676a43fd4403d09e8bbb97a0582ccec2e8a4c4182dc85f0ec04d21eba4745fe335646c95656a8fcc8af0c6456a29deeed SHA512 d968750b2165b8847395ae8a62624468527cf210e057411faa83af0b9c34d08f0940d649c375eb4c84cecdbcaa94032d4e799553337520cb257dcfde9f5fedeb
-EBUILD texinfo-7.1.90.ebuild 2469 BLAKE2B e618b521a09399d8d5ed2131cd3a9c45a534720df4dae25212930da1326814f750017804b56d1b2117785fd365408aa6a6404a18114c707b346845c90f3b99cd SHA512 813703a04ece913809736af871449a501c0e0fa08310b4c07d28c67442df4650e2be1551c9df79001f1d70b6401fd607c19250d4a16dfcbfb41a484fbfdbb95b
-EBUILD texinfo-7.1.91.ebuild 2469 BLAKE2B e618b521a09399d8d5ed2131cd3a9c45a534720df4dae25212930da1326814f750017804b56d1b2117785fd365408aa6a6404a18114c707b346845c90f3b99cd SHA512 813703a04ece913809736af871449a501c0e0fa08310b4c07d28c67442df4650e2be1551c9df79001f1d70b6401fd607c19250d4a16dfcbfb41a484fbfdbb95b
-EBUILD texinfo-9999.ebuild 2469 BLAKE2B e618b521a09399d8d5ed2131cd3a9c45a534720df4dae25212930da1326814f750017804b56d1b2117785fd365408aa6a6404a18114c707b346845c90f3b99cd SHA512 813703a04ece913809736af871449a501c0e0fa08310b4c07d28c67442df4650e2be1551c9df79001f1d70b6401fd607c19250d4a16dfcbfb41a484fbfdbb95b
+EBUILD texinfo-7.2.ebuild 2513 BLAKE2B f0dc8853058ac34fc436abf6a8fc8aeab95199f7dec86cd061e1ac6d45f528b3ff27cd254f48171625c94ede3f20af64772b75f423b65010294fc430e08ed14f SHA512 698342f58452a7029c15ed46100f94bc9c97562a60d41d57c9ca7d7e86497c21e2167b3126a1e688d89bcf79ee3b2256988723fa7d63d75af0d3ca355bee94ff
+EBUILD texinfo-9999.ebuild 2513 BLAKE2B f0dc8853058ac34fc436abf6a8fc8aeab95199f7dec86cd061e1ac6d45f528b3ff27cd254f48171625c94ede3f20af64772b75f423b65010294fc430e08ed14f SHA512 698342f58452a7029c15ed46100f94bc9c97562a60d41d57c9ca7d7e86497c21e2167b3126a1e688d89bcf79ee3b2256988723fa7d63d75af0d3ca355bee94ff
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/texinfo-7.1.90.ebuild b/sys-apps/texinfo/texinfo-7.1.90.ebuild
deleted file mode 100644
index eda59950b465..000000000000
--- a/sys-apps/texinfo/texinfo-7.1.90.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: if your package uses the texi2dvi utility, it must depend on the
-# virtual/texi2dvi package to pull in all the right deps.  The tool is not
-# usable out-of-the-box because it requires the large tex packages.
-
-# Keep an eye on the release/$(ver_cut 1-2) branch upstream for backports.
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
-	REGEN_BDEPEND="
-		>=dev-build/autoconf-2.62
-		>=dev-build/automake-1.16
-		dev-build/libtool
-	"
-elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="nls +standalone static"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r2:=
-	virtual/perl-Data-Dumper
-	virtual/perl-Encode
-	virtual/perl-Unicode-Collate
-	standalone? ( >=dev-lang/perl-5.8.1 )
-	!standalone?  (
-		>=dev-lang/perl-5.8.1:=
-		dev-libs/libunistring:=
-	)
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${REGEN_BDEPEND}
-	nls? ( >=sys-devel/gettext-0.19.6 )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# Needed if a patch touches install-info.c
-	#touch man/install-info.1 || die
-
-	if use prefix ; then
-		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
-		touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die
-	fi
-}
-
-src_configure() {
-	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions
-	# bug #622576
-	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}"
-	local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
-
-	use static && append-ldflags -static
-
-	# TODO:
-	# --with-external-Unicode-EastAsianWidth
-	# --with-external-Text-Unidecode
-	#
-	# Also, 7.0.91 seemed to introduce a included-libunistring w/ USE=-standalone
-	# but it doesn't seem to do anything?
-	local myeconfargs=(
-		--cache-file="${S}"/config.cache
-		$(use_enable nls)
-		$(use_enable !standalone perl-xs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/texinfo/texinfo-7.1.91.ebuild b/sys-apps/texinfo/texinfo-7.2.ebuild
index eda59950b465..59058267c6f1 100644
--- a/sys-apps/texinfo/texinfo-7.1.91.ebuild
+++ b/sys-apps/texinfo/texinfo-7.2.ebuild
@@ -80,6 +80,7 @@ src_configure() {
 	# TODO:
 	# --with-external-Unicode-EastAsianWidth
 	# --with-external-Text-Unidecode
+	# --enable-xs-perl-libintl for musl (7.2)?
 	#
 	# Also, 7.0.91 seemed to introduce a included-libunistring w/ USE=-standalone
 	# but it doesn't seem to do anything?
diff --git a/sys-apps/texinfo/texinfo-9999.ebuild b/sys-apps/texinfo/texinfo-9999.ebuild
index eda59950b465..59058267c6f1 100644
--- a/sys-apps/texinfo/texinfo-9999.ebuild
+++ b/sys-apps/texinfo/texinfo-9999.ebuild
@@ -80,6 +80,7 @@ src_configure() {
 	# TODO:
 	# --with-external-Unicode-EastAsianWidth
 	# --with-external-Text-Unidecode
+	# --enable-xs-perl-libintl for musl (7.2)?
 	#
 	# Also, 7.0.91 seemed to introduce a included-libunistring w/ USE=-standalone
 	# but it doesn't seem to do anything?
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 650485c9d4e9..f42ed957b15b 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -2,11 +2,8 @@ AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f31680
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
 AUX su-l.pamd 140 BLAKE2B 34f00c8814d454c8caa6bd5f0dd0bb89b24c12dbc0e39e852dc45965c4fae4dcfd0ab1def2364163908d416f9306c5193357c0be3a559d35574ef9a56fa645a4 SHA512 4490b7e516a9c306e991c0f719f742c5a13841d28a57385fc96482663f409025aa7ecc3a3855c20099547702ecd7a160b308761e28316f90d4d6622eea1ba21f
 AUX util-linux-2.39.2-backport-1d4456d.patch 993 BLAKE2B c65d13ece5de1486044b857e7b158ebdf239ba48600c74dff2401c2f96b670e9a369b36ba91c61eb6d7724b545799fc76a1632e0adcf097b25017290b6796c2e SHA512 76f057fee52a57d9305c50738ccc57adcfcdf92dbad05e8596ce9edcee0e0b8c126db2b9554e70a71fa80b59b35229d17c8e6ad79f768ce3c548eb7219c57f56
-AUX util-linux-2.39.2-backport-pr2251.patch 6779 BLAKE2B bb8d4be48a55931e7f45a95953c1dd6e7ff59f7559b27ad254c2c3643cf0e6410fcd49da3a7d21af70ea1066a883e9db7c75e425baa983ed3a2918ec517fce82 SHA512 8c949125525a4e13086c63595da6c7423a747165ecf3357f2fbcf95cd5cf7840c7c33e992cf66151598a52d5d6e1fe04f5d6059efe044b41882002b808ff937c
 AUX util-linux-2.39.2-fincore-test.patch 848 BLAKE2B 8320b3ddc561907f6c34e6cf916202c30ab1671cd3e4f7a41187ecbe4efab7fd172d48271073d3d8aadc5c3ae2ee06c5a73b54af0165e5a885e1c5690db40eff SHA512 0562d2102fe1dea0579afcf1353844c8b84c61c6ed1ccfce3a2f010889000623f931fd2d2a0046f570ef5e8ffa0df98b19ce046903090043b292a0529b1db4b9
-AUX util-linux-2.39.3-CVE-2024-28085.patch 840 BLAKE2B 220232e6330b201b2a524a1ff75340e899f277590ee988cba6dd9c1450d99a86269a6aefadda3847657fbb150a422bf180d308f13f3399a5c8d4195d1ce7fdc1 SHA512 445cced246202ef174b96f3280ad380eb44e69a0759f1217e70a290444d5e5363d1df7f6d8757afb1e289486e838a97fa7d6b2602845f04a8fdf37b239859095
 AUX util-linux-2.39.3-fix-use-after-free.patch 1598 BLAKE2B 414448281c0f5b13755fde20b19540ba9e9dc66b3d3d67992516c0b818d8e4824aa4f7170aa1e82e8e96b1c687ee2746639b63fd3feec08deb10d3eefbbce459 SHA512 0068b7549a57d4dd561ca917258ee00062791b96ead8f1bb3d54acb52af09c9394c54c23e47b6d01a4ae8aed04926f8c0e1289f568113d167a1911a0ee7b7ea1
-AUX util-linux-2.39.3-libblkid-luks.patch 1499 BLAKE2B d08f33f3be0709abb3969a89809a953da06dad98be44d804e1327fc57872331a1cd84d4c9cd4762529df53b3a3a3010ddc7fdcfc8d35e7e6be0447aa1bff055d SHA512 4dd4222a23262a6bfaa472bbfcf17faa0ecd6cbdf85da6459c4ed146f0bdcb0c7e249b6f5286faa4e97d811ebe13285523fb800b280a8eb053224a15bda47bf8
 AUX util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch 1710 BLAKE2B 04a3b4db45447556edbf66bdb9bf9c895cdf47a801b41743603b14420bcffe9618c17c8153b6800b872dbc28d1e5c33a55667f2a31e9ff63f7f026c1beb9f524 SHA512 da91fb5f9443907558f6245d4eee3f578e0f0549866a6e9f39bd82d6123868180c1d2aa357e5ef47f163b7ddf67d1c24f6a4768837f21577b2887555a956afe9
 AUX util-linux-2.39.3-musl-1.2.5-basename.patch 1814 BLAKE2B 29463f6aedec98cbd7edaa68e3ef0b6c7a4932e6f1b02948237689e75cb720d406970a6521564dd97c68c922b087f23683c219550c5092755057e734f94bc338 SHA512 74f6ccd530766fdbaac55a20becc8e2ce8dc8aeb65aaba3d22430a7c72e19e9483031b508b4448507d245d42e6d730d0d17ec6bc8edb63eaf0cb8ce0365be4d7
 AUX util-linux-2.39.4-umount-readonly.patch 1519 BLAKE2B 80fdd82a9fda61e8cb03a5ceed5f601687cc8a621e8cf2c8d71125bf2aa849d32c413253050d2e4680bbf1636b8add212fe6dd4f7802ccd59b0ff677854b600f SHA512 240863efa932d385aa6b6d999624d4630bbbf0b5ae92f1f341df940167009eeebe0ccec2c460fce69a19988f96a6fa988a740682b3da864ebfc21b1bbeddd3b5
diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch b/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch
deleted file mode 100644
index b16519bb5142..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.2-backport-pr2251.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-https://bugs.gentoo.org/914791
-https://github.com/util-linux/util-linux/issues/2249
-https://github.com/util-linux/util-linux/pull/2251
-
-From 8b36444f447949c3ab477f2c43b45a94c30ee7bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sun, 21 May 2023 21:42:14 +0200
-Subject: [PATCH 1/4] fadvise: (test) dynamically calculate expected test
- values
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- tests/ts/fadvise/drop | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
-index 7c7eee5dc2..86c0d5b0a3 100755
---- a/tests/ts/fadvise/drop
-+++ b/tests/ts/fadvise/drop
-@@ -16,7 +16,7 @@ ts_check_prog "sleep"
- ts_cd "$TS_OUTDIR"
- 
- FILE="ddtest"
--BS=4k
-+BS=4096
- COUNT=8
- 
- FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")"
-@@ -41,22 +41,22 @@ create_file() {
-     echo
- 
-     create_file
--    echo "offset: 8192"
--    "$TS_CMD_FADVISE" -o 8192 "$FILE"
-+    echo "offset: $(( 2 * $BS ))"
-+    "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE"
-     echo status: $?
-     "$TS_CMD_FINCORE" "$FILE"
-     echo
- 
-     create_file
--    echo "length: 16384"
--    "$TS_CMD_FADVISE" -l 16384 "$FILE"
-+    echo "length: $(( 4 * $BS ))"
-+    "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE"
-     echo status: $?
-     "$TS_CMD_FINCORE" "$FILE"
-     echo
- 
-     create_file
--    echo "offset: 8192, length: 16384 fd: 42"
--    "$TS_CMD_FADVISE" -o 8192 -l 16384 --fd 42 42<"$FILE"
-+    echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42"
-+    "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE"
-     echo status: $?
-     "$TS_CMD_FINCORE" "$FILE"
-     echo
-
-From e5009e773fc801eca887dd43b721cd1b1aa327be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sun, 21 May 2023 21:43:38 +0200
-Subject: [PATCH 2/4] fadvise: (tests) factor out calls to "fincore"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This will make it easier to pass argument later.
-
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- tests/ts/fadvise/drop | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
-index 86c0d5b0a3..8869b7da4d 100755
---- a/tests/ts/fadvise/drop
-+++ b/tests/ts/fadvise/drop
-@@ -28,37 +28,41 @@ create_file() {
-     dd if=/dev/zero of="$FILE" bs=$BS count=$COUNT conv=fsync >& /dev/null
- }
- 
-+do_fincore() {
-+    "$TS_CMD_FINCORE" "$FILE"
-+}
-+
- {
-     create_file
--    "$TS_CMD_FINCORE" "$FILE"
-+    do_fincore
-     echo
- 
-     create_file
-     echo "whole file"
-     "$TS_CMD_FADVISE" "$FILE"
-     echo status: $?
--    "$TS_CMD_FINCORE" "$FILE"
-+    do_fincore
-     echo
- 
-     create_file
-     echo "offset: $(( 2 * $BS ))"
-     "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE"
-     echo status: $?
--    "$TS_CMD_FINCORE" "$FILE"
-+    do_fincore
-     echo
- 
-     create_file
-     echo "length: $(( 4 * $BS ))"
-     "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE"
-     echo status: $?
--    "$TS_CMD_FINCORE" "$FILE"
-+    do_fincore
-     echo
- 
-     create_file
-     echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42"
-     "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE"
-     echo status: $?
--    "$TS_CMD_FINCORE" "$FILE"
-+    do_fincore
-     echo
- 
-     rm "$FILE"
-
-From 33980996d0b429fc59c40f8352633c0a21a0f96a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sun, 21 May 2023 21:44:20 +0200
-Subject: [PATCH 3/4] fadvise: (test) don't compare fincore page counts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These depend on the machines pagesize and are therefore not a good
-comparision.
-
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- tests/expected/fadvise/drop | 20 ++++++++++----------
- tests/ts/fadvise/drop       |  2 +-
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop
-index f2360b56fb..25f23e050a 100644
---- a/tests/expected/fadvise/drop
-+++ b/tests/expected/fadvise/drop
-@@ -1,23 +1,23 @@
--  RES PAGES SIZE FILE
--  32K     8  32K ddtest
-+  RES SIZE FILE
-+  32K  32K ddtest
- 
- whole file
- status: 0
--RES PAGES SIZE FILE
-- 0B     0  32K ddtest
-+RES SIZE FILE
-+ 0B  32K ddtest
- 
- offset: 8192
- status: 0
--RES PAGES SIZE FILE
-- 8K     2  32K ddtest
-+RES SIZE FILE
-+ 8K  32K ddtest
- 
- length: 16384
- status: 0
--  RES PAGES SIZE FILE
--  16K     4  32K ddtest
-+  RES SIZE FILE
-+  16K  32K ddtest
- 
- offset: 8192, length: 16384 fd: 42
- status: 0
--  RES PAGES SIZE FILE
--  16K     4  32K ddtest
-+  RES SIZE FILE
-+  16K  32K ddtest
- 
-diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
-index 8869b7da4d..6c4298e872 100755
---- a/tests/ts/fadvise/drop
-+++ b/tests/ts/fadvise/drop
-@@ -29,7 +29,7 @@ create_file() {
- }
- 
- do_fincore() {
--    "$TS_CMD_FINCORE" "$FILE"
-+    "$TS_CMD_FINCORE" -o RES,SIZE,FILE "$FILE"
- }
- 
- {
-
-From c0f31b79f5d1c665cdc057fb32f4d161d28aa5b2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sun, 21 May 2023 21:45:10 +0200
-Subject: [PATCH 4/4] fadvise: (test) test with 64k blocks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This will allow the tests to also pass on systems with 64k pagesizes.
-
-Closes #2249
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- tests/expected/fadvise/drop | 26 +++++++++++++-------------
- tests/ts/fadvise/drop       |  2 +-
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop
-index 25f23e050a..e7bb26b6e2 100644
---- a/tests/expected/fadvise/drop
-+++ b/tests/expected/fadvise/drop
-@@ -1,23 +1,23 @@
--  RES SIZE FILE
--  32K  32K ddtest
-+  RES  SIZE FILE
-+ 512K  512K ddtest
- 
- whole file
- status: 0
--RES SIZE FILE
-- 0B  32K ddtest
-+RES  SIZE FILE
-+ 0B  512K ddtest
- 
--offset: 8192
-+offset: 131072
- status: 0
--RES SIZE FILE
-- 8K  32K ddtest
-+  RES  SIZE FILE
-+ 128K  512K ddtest
- 
--length: 16384
-+length: 262144
- status: 0
--  RES SIZE FILE
--  16K  32K ddtest
-+  RES  SIZE FILE
-+ 256K  512K ddtest
- 
--offset: 8192, length: 16384 fd: 42
-+offset: 131072, length: 262144 fd: 42
- status: 0
--  RES SIZE FILE
--  16K  32K ddtest
-+  RES  SIZE FILE
-+ 256K  512K ddtest
- 
-diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
-index 6c4298e872..45dcb9110b 100755
---- a/tests/ts/fadvise/drop
-+++ b/tests/ts/fadvise/drop
-@@ -16,7 +16,7 @@ ts_check_prog "sleep"
- ts_cd "$TS_OUTDIR"
- 
- FILE="ddtest"
--BS=4096
-+BS=65536
- COUNT=8
- 
- FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")"
diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch b/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch
deleted file mode 100644
index 99092c05aa7e..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.3-CVE-2024-28085.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/927980
-https://people.rit.edu/sjf5462/6831711781/wall_2_27_2024.txt
-https://github.com/util-linux/util-linux/commit/404b0781f52f7c045ca811b2dceec526408ac253
-
-From 404b0781f52f7c045ca811b2dceec526408ac253 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 21 Mar 2024 11:16:20 +0100
-Subject: [PATCH] wall: fix escape sequence Injection [CVE-2024-28085]
-
-Let's use for all cases the same output function.
-
-Reported-by: Skyler Ferrante <sjf5462@rit.edu>
-Signed-off-by: Karel Zak <kzak@redhat.com>
---- a/term-utils/wall.c
-+++ b/term-utils/wall.c
-@@ -368,7 +368,7 @@ static char *makemsg(char *fname, char **mvec, int mvecsz,
- 		int i;
- 
- 		for (i = 0; i < mvecsz; i++) {
--			fputs(mvec[i], fs);
-+			fputs_careful(mvec[i], fs, '^', true, TERM_WIDTH);
- 			if (i < mvecsz - 1)
- 				fputc(' ', fs);
- 		}
-
diff --git a/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch b/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch
deleted file mode 100644
index 222243426d5e..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.39.3-libblkid-luks.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/926950
-https://gitlab.com/lvmteam/lvm2/-/issues/11
-https://bugzilla.opensuse.org/show_bug.cgi?id=1213227
-https://github.com/util-linux/util-linux/pull/2373
-https://github.com/util-linux/util-linux/commit/93ba7961779789217a1f814ce3110ff8c040c8c3
-
-From 93ba7961779789217a1f814ce3110ff8c040c8c3 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Wed, 12 Jul 2023 15:48:27 +0200
-Subject: [PATCH] Revert "libblkid: try LUKS2 first when probing"
-
-mdadm superblocks before 1.1 are placed at the end of the device, which
-means that the data contained inside the array starts at offset 0. For
-LUKS inside MD, blkid falsely detects this as plain LUKS instead of a
-linux_raid_member. This causes e.g. dracut to not assemble the array
-during boot and system startup fails.
-
-This reverts commit b8889c0a214aeb3dd47bf1ab280fe5534b64d2aa.
---- a/libblkid/src/superblocks/superblocks.c
-+++ b/libblkid/src/superblocks/superblocks.c
-@@ -94,11 +94,6 @@ static int blkid_probe_set_usage(blkid_probe pr, int usage);
-  */
- static const struct blkid_idinfo *idinfos[] =
- {
--	/* In case the volume is locked with OPAL we are going to get
--	 * an I/O error when reading past the LUKS header, so try it
--	 * first. */
--	&luks_idinfo,
--
- 	/* RAIDs */
- 	&linuxraid_idinfo,
- 	&ddfraid_idinfo,
-@@ -124,6 +119,7 @@ static const struct blkid_idinfo *idinfos[] =
- 	&snapcow_idinfo,
- 	&verity_hash_idinfo,
- 	&integrity_idinfo,
-+	&luks_idinfo,
- 	&vmfs_volume_idinfo,
- 	&ubi_idinfo,
- 	&vdo_idinfo,