From nobody Mon Sep 29 23:49:30 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cbHwW1fbqz693QD; Mon, 29 Sep 2025 23:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbHwV6TCzz3NVQ; Mon, 29 Sep 2025 23:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759189770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZvFsV1Xn7aV2QuqC+aqoUmd1mRwnt99eUutyYdLpL8=; b=Dd7ugQUEmgSo6uibJiF0gQ7ezv+CaFaS8saz/fXE1eXcr99UcH1CCIoobwpCguEw4sNfWi robmJpaC709DvmFc1dEFeFUdIk958cc9zVB+oadGK1r2bauuZGeNlw70GpCbk1ac7U7CWo zEGgEkAH5Nai6ZCYgTBiHoXqVP9g68M7X1Etnaw2c90Ic5Mqy76/Tci26GUxh64NWZBY+X M4pIuuV8ipVv3tPucYn6Hd/pAQ7UGb0JwQ5TKPqRg4CD0CpjpiVcJlRUfvvDKjZBPPkNSD Y/GlfYdzLl+noIWKfwWPkytWCKSysHio6rsKKnHlc5Wg22CbM2luk0nv6fLsWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759189770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZvFsV1Xn7aV2QuqC+aqoUmd1mRwnt99eUutyYdLpL8=; b=UbQj7uA1SHFbcLldWFz/h/xR+u3VruXQUrXk9L48a9ozLNvCWHpOzhMP/SyMOV6KGOQgAb 3mvrXN0YZUdipIs6ubUYRJVeuFcqCpzoOcx+1qQ64gH/9bk2dg5rRyGMWSYG+PgDRph55d dEoeYgllBw2zksLG4Dqx5eEKhh7d/RwVDAtmg3PYwT29qlx+5rvm9GSx58iNNZPrZD5pIQ tRzCWQTZttnYOwuyvIZIQ+Mjt6hJUkt22U+4X3p9HjPCol/05d4bBkeCIMQIIn1NN+9en9 HGbzUddfbmrkoS9XZElpdfoobEXT/ZkcJ1BXXK8NsLGysQR88h7Uk/kC4vWXlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759189770; a=rsa-sha256; cv=none; b=DI2jVmZjc9G8RM4X0IkteLE93KIl9Q2BoW6PpOa/KcTm8iShy5jLxdRkCHOdyVHbfIQZd9 cxz+mewEr9SGusI/l51TvDXia3/N9oDckWhG62iJoozPQcwmNZDOK16cHLSOrYUP7bnZGO +nwFiVDRUtQ7p87gmK8m1w3L3kLb3AQVnc+kfYWGTFNWowy5dBlkB9lHgMwDklRtGbj5bI sSVTTNqIfFPEKDCWtnZcxVnx9FH1+sznlKeHfcJepA3+KN9q7er43mwzoBfzU9NvAdHSQx lqSj241BhMvx697PT2Cf1csnOi6x9eNNe9vWAV7CQ/Pm37SSiB9C3OXvKKOgLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cbHwV63p6z1Q5v; Mon, 29 Sep 2025 23:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58TNnUum061535; Mon, 29 Sep 2025 23:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58TNnUFV061532; Mon, 29 Sep 2025 23:49:30 GMT (envelope-from git) Date: Mon, 29 Sep 2025 23:49:30 GMT Message-Id: <202509292349.58TNnUFV061532@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 5e062f27de12 - main - devel/util-linux: update to v2.41.1 and fix test suite List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e062f27de12ab35840e82e213b5115d416d37da Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e062f27de12ab35840e82e213b5115d416d37da commit 5e062f27de12ab35840e82e213b5115d416d37da Author: Matthias Andree AuthorDate: 2025-09-29 20:04:42 +0000 Commit: Matthias Andree CommitDate: 2025-09-29 23:47:11 +0000 devel/util-linux: update to v2.41.1 and fix test suite The test-suite requires GNU sed and xargs and will then pass most tests, three are failing, not yet investigated, but a clear improvement from 300+ fails that were from the incompatible xargs and sed. There are more issues in some of the build scripts that might be fixed by BINARY_ALIAS'ing GNU coreutils, or replacing their long options by our short options (mkdir --parents -> mkdir -p). Not updating to v2.41.2 which has upstream "blocker" issues filed recently. It would help if port maintainers stayed on top of their upstream releases and saw to it that the port is complete. It does not help at all to have broken test-suites in the tree. Also, ignore on i386, not Y2038 safe, and configure aborts with error. --- devel/util-linux/Makefile | 24 ++++++++++++------ devel/util-linux/distinfo | 6 ++--- devel/util-linux/files/patch-Makefile.am | 18 ++++++++++---- devel/util-linux/files/patch-configure.ac | 6 ++--- devel/util-linux/files/patch-include_bitops.h | 11 --------- devel/util-linux/files/patch-tests_functions.sh | 33 +++++++++++++++++++++++++ devel/util-linux/pkg-plist | 11 ++++++--- 7 files changed, 76 insertions(+), 33 deletions(-) diff --git a/devel/util-linux/Makefile b/devel/util-linux/Makefile index 284d3758a6d6..d481c8fd4112 100644 --- a/devel/util-linux/Makefile +++ b/devel/util-linux/Makefile @@ -1,6 +1,6 @@ PORTNAME= util-linux -DISTVERSION= 2.39.4 -PORTREVISION= 4 +DISTVERSION= 2.41.1 +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${DISTVERSION:R}/ @@ -11,7 +11,13 @@ WWW= https://github.com/util-linux/util-linux LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= bash:shells/bash +IGNORE_i386= configure: error: could not enable timestamps after mid-January 2038. + +# gsed/gxargs are only TEST_DEPENDS, but we need to BINARY_ALIAS them, +# so they need to be listed in BUILD_DEPENDS instead. +BUILD_DEPENDS= bash:shells/bash \ + gsed:textproc/gsed \ + gxargs:misc/findutils LIB_DEPENDS= libblkid.so:filesystems/libblkid \ libuuid.so:misc/libuuid RUN_DEPENDS= bash:shells/bash @@ -24,17 +30,20 @@ USE_LDCONFIG= yes SHEBANG_FILES= misc-utils/getopt-example.bash \ tools/*.sh \ tools/git-tp-sync \ - tools/git-tp-sync-man \ - tests/run.sh + tests/run.sh \ + tests/ts/*/* GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --disable-nls --disable-ipcrm --disable-ipcs \ --disable-makeinstall-chown --disable-makeinstall-setuid \ + --disable-asciidoc --disable-liblastlog2 \ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig -INSTALL_TARGET= install-strip -TEST_TARGET= check # tests fail due to https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273196 +# INSTALL_TARGET= install-strip +TEST_ENV= PATH=${PATH}:${STAGEDIR}${PREFIX}/bin:${STAGEDIR}${PREFIX}/sbin +TEST_TARGET= check # tests fail due to https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273196 - workaround use gxargs +BINARY_ALIAS= sed=gsed xargs=gxargs CONFLICTS_INSTALL= heirloom-doctools @@ -58,6 +67,7 @@ post-install: # https://github.com/karelzak/util-linux/issues/1149 ${RM} -r ${STAGEDIR}${DOCSDIR} ${RM} -r ${STAGEDIR}${PREFIX}/include/blkid/ ${RM} ${STAGEDIR}${PREFIX}/share/man/man5/terminal-colors.d.5* + ${MV} ${STAGEDIR}${PREFIX}/sbin/fdisk ${STAGEDIR}${PREFIX}/sbin/fdisk-linux ${FIND} ${STAGEDIR}${PREFIX} -name 'flock*' -delete ${FIND} ${STAGEDIR}${PREFIX} -name 'getopt*' -delete ${FIND} ${STAGEDIR}${PREFIX} -name 'blkid*' -delete diff --git a/devel/util-linux/distinfo b/devel/util-linux/distinfo index bcb689df13a7..b83fb63e0748 100644 --- a/devel/util-linux/distinfo +++ b/devel/util-linux/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714112744 -SHA256 (util-linux-2.39.4.tar.xz) = 6c4f8723dafd41c39d93ecbf16509fc88c33cd5bd3277880ae5a1d97a014fd0e -SIZE (util-linux-2.39.4.tar.xz) = 8541176 +TIMESTAMP = 1759172745 +SHA256 (util-linux-2.41.1.tar.xz) = be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57 +SIZE (util-linux-2.41.1.tar.xz) = 9606156 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" diff --git a/devel/util-linux/pkg-plist b/devel/util-linux/pkg-plist index 4a2f21638ef9..774bb8aec5ee 100644 --- a/devel/util-linux/pkg-plist +++ b/devel/util-linux/pkg-plist @@ -1,6 +1,6 @@ +bin/bits %%CAL%%bin/cal bin/chrt -bin/col bin/colcrt bin/colrm bin/column @@ -17,6 +17,7 @@ bin/rename bin/renice bin/rev bin/scriptreplay +bin/setpgid @comment bin/setsid bin/ul bin/wall @@ -34,7 +35,7 @@ lib/libsmartcols.so.1.1.0 libdata/pkgconfig/fdisk.pc libdata/pkgconfig/smartcols.pc sbin/cfdisk -sbin/fdisk +sbin/fdisk-linux sbin/findfs sbin/fsck.cramfs sbin/fsck.minix @@ -50,7 +51,6 @@ sbin/wipefs %%CAL%%share/bash-completion/completions/cal share/bash-completion/completions/cfdisk share/bash-completion/completions/chrt -share/bash-completion/completions/col share/bash-completion/completions/colcrt share/bash-completion/completions/colrm share/bash-completion/completions/column @@ -76,6 +76,7 @@ share/bash-completion/completions/rename share/bash-completion/completions/renice share/bash-completion/completions/rev share/bash-completion/completions/scriptreplay +share/bash-completion/completions/setpgid @comment share/bash-completion/completions/setsid share/bash-completion/completions/sfdisk share/bash-completion/completions/swaplabel @@ -83,9 +84,9 @@ share/bash-completion/completions/ul share/bash-completion/completions/wall share/bash-completion/completions/whereis share/bash-completion/completions/wipefs +share/man/man1/bits.1.gz %%CAL%%share/man/man1/cal.1.gz share/man/man1/chrt.1.gz -share/man/man1/col.1.gz share/man/man1/colcrt.1.gz share/man/man1/colrm.1.gz share/man/man1/column.1.gz @@ -101,10 +102,12 @@ share/man/man1/rename.1.gz share/man/man1/renice.1.gz share/man/man1/rev.1.gz share/man/man1/scriptreplay.1.gz +share/man/man1/setpgid.1.gz @comment share/man/man1/setsid.1.gz share/man/man1/ul.1.gz share/man/man1/wall.1.gz share/man/man1/whereis.1.gz +share/man/man5/scols-filter.5.gz share/man/man8/cfdisk.8.gz share/man/man8/fdisk.8.gz share/man/man8/findfs.8.gz