Bug#1108635: unblock: inetutils/2:2.6-3
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: inetutils@packages.debian.org
Control: affects -1 + src:inetutils
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package inetutils.
[ Reason ]
This update includes:
- Fix for a test failure due to indeterministic filesystem behavior.
- Fix for utmp functionality restoration and FTBFS on systemd systems
during tests due to the mismatch between the glibc interfaces and
the command line tools over utmp state.
[ Impact ]
A couple FTBFS, and feature loss due to the dropping of the utmp support.
[ Tests ]
The utmp change made the package build again when running under
systemd.
For the indeterministic filesystem behavior I had to create a local
patch to use disorderfs to force the indeterminism, to reproduce what
had been seen in the reproducible builders, and on some sparc64
buildds. (I'm attaching it to this request.) But in any case, the fix
involves disabling the unreliable test.
[ Risks ]
The unreliable test disablement seems like a no risk change.
The systemd change involves pulling utmp support from gnulib, which
tries to use libsystemd opportunistically, and otherwise falls back
to the previous codepaths to try to get the utmp information.
[ Checklist ]
[√] all changes are documented in the d/changelog
[√] I reviewed all changes and I approve them
[√] attach debdiff against the package in testing
[ Other info ]
Attach the debdiff from -1 to -3, as I realized I should make the
libsystemd support linux-any specific.
unblock inetutils/2:2.6-3
Thanks,
Guillem
diff -Nru inetutils-2.6/debian/changelog inetutils-2.6/debian/changelog
--- inetutils-2.6/debian/changelog 2025-02-22 00:43:32.000000000 +0100
+++ inetutils-2.6/debian/changelog 2025-06-22 16:59:29.000000000 +0200
@@ -1,3 +1,18 @@
+inetutils (2:2.6-3) unstable; urgency=medium
+
+ * Make libsystemd-dev support linux-any specific.
+
+ -- Guillem Jover <guillem@debian.org> Sun, 22 Jun 2025 16:59:29 +0200
+
+inetutils (2:2.6-2) unstable; urgency=medium
+
+ * Enable libsystemd support to restore utmp functionality in
+ syslogd and talkd, on systems running systemd.
+ * Remove bogus test for unsorted file listing, causing indeterministic
+ build failures on some systems.
+
+ -- Guillem Jover <guillem@debian.org> Fri, 20 Jun 2025 03:39:26 +0200
+
inetutils (2:2.6-1) unstable; urgency=medium
* New upstream release.
diff -Nru inetutils-2.6/debian/control inetutils-2.6/debian/control
--- inetutils-2.6/debian/control 2025-02-22 00:43:32.000000000 +0100
+++ inetutils-2.6/debian/control 2025-06-22 16:35:48.000000000 +0200
@@ -20,6 +20,7 @@
automake,
bison,
gnulib,
+ libsystemd-dev [linux-any],
libreadline-dev,
libncurses-dev,
libpam0g-dev,
diff -Nru inetutils-2.6/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch inetutils-2.6/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch
--- inetutils-2.6/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch 1970-01-01 01:00:00.000000000 +0100
+++ inetutils-2.6/debian/patches/local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch 2025-06-20 03:33:50.000000000 +0200
@@ -0,0 +1,44 @@
+From 44f068d40f5124dd1996fa2442c8370321d14bf5 Mon Sep 17 00:00:00 2001
+From: Guillem Jover <guillem@hadrons.org>
+Date: Fri, 20 Jun 2025 03:18:06 +0200
+Subject: [PATCH 6/6] tests: Remove bogus test for unsorted file listing
+
+We cannot reliably test whether the -f option works against, because
+that relies on the unsorted output coming out accidentally not sorted,
+and this has been the cause for several indeterministic build failures
+in various hosts (such as some sparc64 or reproducible build nodes).
+
+This could be guaranteed with something like disorderfs, but we do not
+bother and simply remove the test case.
+
+Origin: vendor, Debian
+Forwarded: no
+---
+ tests/libls.sh | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tests/libls.sh b/tests/libls.sh
+index b1b73f85..69cff572 100755
+--- a/tests/libls.sh
++++ b/tests/libls.sh
+@@ -91,7 +91,6 @@ REPLY_a1=`$LS -a1 $LSDIR`
+ REPLY_A1=`$LS -A1 $LSDIR`
+
+ REPLY_C=`$LS -C $LSDIR`
+-REPLY_Cf=`$LS -Cf $LSDIR`
+ REPLY_Cr=`$LS -Cr $LSDIR`
+ REPLY_Ct=`$LS -Ct $LSDIR`
+ REPLY_x=`$LS -x $LSDIR`
+@@ -130,9 +129,6 @@ test `echo "$diff" | $GREP -c -v '^[.]\{1,2\}$'` -eq 0 ||
+ fi
+ }
+
+-test x"$REPLY_C" != x"$REPLY_Cf" ||
+- { errno=1; echo >&2 'Failed to disable sorting with "-f".'; }
+-
+ test x"$REPLY_C" != x"$REPLY_Cr" ||
+ { errno=1; echo >&2 'Failed to reverse sorting with "-r".'; }
+
+--
+2.50.0
+
diff -Nru inetutils-2.6/debian/patches/series inetutils-2.6/debian/patches/series
--- inetutils-2.6/debian/patches/series 2025-02-22 00:43:32.000000000 +0100
+++ inetutils-2.6/debian/patches/series 2025-06-20 03:34:11.000000000 +0200
@@ -4,3 +4,4 @@
local/0003-inetd-Change-protocol-semantics-in-inetd.conf.patch
local/0004-Use-krb5_auth_con_getsendsubkey-instead-of-krb5_auth.patch
local/0005-inetd-Add-new-foreground-option.patch
+local/0006-tests-Remove-bogus-test-for-unsorted-file-listing.patch
diff -Nru inetutils-2.6/debian/rules inetutils-2.6/debian/rules
--- inetutils-2.6/debian/rules 2025-02-22 00:43:32.000000000 +0100
+++ inetutils-2.6/debian/rules 2025-06-22 16:35:23.000000000 +0200
@@ -12,6 +12,7 @@
ifeq ($(DEB_HOST_ARCH_OS),linux)
syslogd_provides = linux-kernel-log-daemon
confflags += --with-path-procnet-dev=/proc/net/dev
+ confflags += --enable-systemd
endif
ifeq ($(DEB_HOST_ARCH_OS),hurd)
tools_provides = net-tools
--- inetutils-2.6/tests/libls.sh 2025-02-21 12:06:21.000000000 +0100
+++ inetutils-2.6+disorderfs/tests/libls.sh 2025-06-13 22:45:05.120002816 +0200
@@ -58,24 +58,26 @@
# We use sleep to cause different modtime and atime.
+BASEDIR=$(mktemp -d)
LSDIR=$(mktemp -d)
+disorderfs --sort-dirents=yes --reverse-dirents=no $BASEDIR $LSDIR
if test -z "$LSDIR" || test ! -d "$LSDIR"; then
LSDIR=tmp.$$
fi
clean_lsdir () {
- test -d "$LSDIR" && echo "Cleaning up..." && rm -rfv "$LSDIR"
+ test -d "$LSDIR" && echo "Cleaning up..." && fusermount -u $LSDIR && rm -rfv "$LSDIR"
}
trap clean_lsdir EXIT HUP INT QUIT TERM
-touch "$LSDIR"/foo
+touch "$BASEDIR"/foo
sleep 1
-touch "$LSDIR"/bar.sh
+touch "$BASEDIR"/bar.sh
sleep 1
-mkdir "$LSDIR"/baz
+mkdir "$BASEDIR"/baz
sleep 1
-echo foo > "$LSDIR"/foo
+echo foo > "$BASEDIR"/foo
# IMPORTANT: Execute an initial call to $LS, just to get going.
# In case this is a coverage run, as NixOS does, this very first
Reply to: