diff options
Diffstat (limited to 'sysutils/util-linux/files')
-rw-r--r-- | sysutils/util-linux/files/patch-Makefile.am | 27 | ||||
-rw-r--r-- | sysutils/util-linux/files/patch-configure.ac | 12 | ||||
-rw-r--r-- | sysutils/util-linux/files/patch-tests_functions.sh | 33 |
3 files changed, 72 insertions, 0 deletions
diff --git a/sysutils/util-linux/files/patch-Makefile.am b/sysutils/util-linux/files/patch-Makefile.am new file mode 100644 index 000000000000..fc5132a38224 --- /dev/null +++ b/sysutils/util-linux/files/patch-Makefile.am @@ -0,0 +1,27 @@ +--- Makefile.am.orig 2025-05-05 08:28:44 UTC ++++ Makefile.am +@@ -84,7 +84,7 @@ DISTCLEANFILES = + CLEANFILES = + DISTCLEANFILES = + +-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 +@@ -95,7 +95,6 @@ EXTRA_DIST += \ + .version \ + autogen.sh \ + Documentation \ +- po/update-potfiles \ + 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/sysutils/util-linux/files/patch-configure.ac b/sysutils/util-linux/files/patch-configure.ac new file mode 100644 index 000000000000..798eb638b5fa --- /dev/null +++ b/sysutils/util-linux/files/patch-configure.ac @@ -0,0 +1,12 @@ +--- configure.ac.orig 2025-06-24 07:55:28 UTC ++++ configure.ac +@@ -257,7 +257,8 @@ PKG_INSTALLDIR(['${usrlib_execdir}/pkgconfig']) + PKG_PROG_PKG_CONFIG + PKG_INSTALLDIR(['${usrlib_execdir}/pkgconfig']) + +-GTK_DOC_CHECK([1.10]) ++AM_CONDITIONAL([ENABLE_GTK_DOC], false) ++AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], true) + AC_PATH_PROG([XSLTPROC], [xsltproc]) + + diff --git a/sysutils/util-linux/files/patch-tests_functions.sh b/sysutils/util-linux/files/patch-tests_functions.sh new file mode 100644 index 000000000000..c0d2183eb709 --- /dev/null +++ b/sysutils/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" |