4 files changed, 49 insertions, 19 deletions
diff --git a/devel/util-linux/files/patch-Makefile.am b/devel/util-linux/files/patch-Makefile.am
index 25af74efade8..fc5132a38224 100644
--- a/devel/util-linux/files/patch-Makefile.am
+++ b/devel/util-linux/files/patch-Makefile.am
@@ -1,15 +1,15 @@
---- Makefile.am.orig	2020-07-23 09:26:04 UTC
+--- Makefile.am.orig	2025-05-05 08:28:44 UTC
 +++ Makefile.am
-@@ -65,7 +65,7 @@ CHECK_LOCALS =
- EXTRA_DIST =
+@@ -84,7 +84,7 @@ DISTCLEANFILES =
  CLEANFILES =
+ DISTCLEANFILES =
  
 -SUBDIRS = po
-+SUBDIRS = # po
++SUBDIRS = 
  
  RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \
  		-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
-@@ -76,7 +76,6 @@ EXTRA_DIST += \
+@@ -95,7 +95,6 @@ EXTRA_DIST += \
  	.version \
  	autogen.sh \
  	Documentation \
@@ -17,3 +17,11 @@
  	README.licensing
  
  include tools/Makemodule.am
+@@ -120,7 +119,6 @@ include man-common/Makemodule.am
+ include pam_lastlog2/Makemodule.am
+ include bash-completion/Makemodule.am
+ include man-common/Makemodule.am
+-include po-man/Makemodule.am
+ 
+ include Documentation/Makemodule.am
+ include tests/Makemodule.am
diff --git a/devel/util-linux/files/patch-configure.ac b/devel/util-linux/files/patch-configure.ac
index cb4155f7831e..798eb638b5fa 100644
--- a/devel/util-linux/files/patch-configure.ac
+++ b/devel/util-linux/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2020-07-23 09:23:58 UTC
+--- configure.ac.orig	2025-06-24 07:55:28 UTC
 +++ configure.ac
-@@ -204,7 +204,8 @@ PKG_INSTALLDIR(['${usrlib_execdir}/pkgconfig'])
+@@ -257,7 +257,8 @@ PKG_INSTALLDIR(['${usrlib_execdir}/pkgconfig'])
  PKG_PROG_PKG_CONFIG
  PKG_INSTALLDIR(['${usrlib_execdir}/pkgconfig'])
  
@@ -9,4 +9,4 @@
 +AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], true)
  AC_PATH_PROG([XSLTPROC], [xsltproc])
  
- linux_os=no
+ 
diff --git a/devel/util-linux/files/patch-include_bitops.h b/devel/util-linux/files/patch-include_bitops.h
deleted file mode 100644
index 2b5c7ce9f633..000000000000
--- a/devel/util-linux/files/patch-include_bitops.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/bitops.h.orig	2023-06-25 21:35:59 UTC
-+++ include/bitops.h
-@@ -25,7 +25,7 @@
- # define be16toh(x) betoh16(x)
- # define be32toh(x) betoh32(x)
- # define be64toh(x) betoh64(x)
--#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#elif defined(__NetBSD__) || defined(__DragonFly__)
- # define bswap_16(x) bswap16(x)
- # define bswap_32(x) bswap32(x)
- # define bswap_64(x) bswap64(x)
diff --git a/devel/util-linux/files/patch-tests_functions.sh b/devel/util-linux/files/patch-tests_functions.sh
new file mode 100644
index 000000000000..c0d2183eb709
--- /dev/null
+++ b/devel/util-linux/files/patch-tests_functions.sh
@@ -0,0 +1,33 @@
+--- tests/functions.sh.orig	2025-06-23 11:25:00 UTC
++++ tests/functions.sh
+@@ -479,8 +479,8 @@ function ts_init_suid {
+ 
+ 	# Save info about original setting
+ 	TS_SUID_PROGS[$ct]=$PROG
+-	TS_SUID_USER[$ct]=$(stat --printf="%U" $PROG)
+-	TS_SUID_GROUP[$ct]=$(stat --printf="%G" $PROG)
++	TS_SUID_USER[$ct]=$(stat -f "%Su" $PROG)
++	TS_SUID_GROUP[$ct]=$(stat -f "%Sg" $PROG)
+ 
+ 	chown root:root $PROG &> /dev/null
+ 	chmod u+s $PROG &> /dev/null
+@@ -688,12 +688,13 @@ function ts_cleanup_on_exit {
+ }
+ 
+ function ts_cleanup_on_exit {
+-
+-	for idx in $(seq 0 $((${#TS_SUID_PROGS[*]} - 1))); do
+-		PROG=${TS_SUID_PROGS[$idx]}
+-		chmod a-s $PROG &> /dev/null
+-		chown ${TS_SUID_USER[$idx]}:${TS_SUID_GROUP[$idx]} $PROG &> /dev/null
+-	done
++	if [ ${#TS_SUID_PROGS[*]} -ge 1 ] ; then
++		for idx in $(seq 0 $((${#TS_SUID_PROGS[*]} - 1))); do
++			PROG=${TS_SUID_PROGS[$idx]}
++			chmod a-s $PROG &> /dev/null
++			chown ${TS_SUID_USER[$idx]}:${TS_SUID_GROUP[$idx]} $PROG &> /dev/null
++		done
++	fi
+ 
+ 	for dev in "${TS_LOOP_DEVS[@]}"; do
+ 		ts_device_deinit "$dev"