diff -pruN 2:2.6-1/debian/changelog 2:2.6-1ubuntu3/debian/changelog --- 2:2.6-1/debian/changelog 2025-02-21 23:43:32.000000000 +0000 +++ 2:2.6-1ubuntu3/debian/changelog 2025-09-11 12:11:00.000000000 +0000 @@ -1,3 +1,24 @@ +inetutils (2:2.6-1ubuntu3) questing; urgency=medium + + * Remove 'ls -f' test to prevent FTBFS (LP: #2122271) + + -- Valentin Haudiquet Thu, 11 Sep 2025 14:11:00 +0200 + +inetutils (2:2.6-1ubuntu2) questing; urgency=medium + + * Rebuild to include updated RISC-V base ISA RVA23 + + -- Heinrich Schuchardt Fri, 05 Sep 2025 15:12:29 +0000 + +inetutils (2:2.6-1ubuntu1) questing; urgency=medium + + * Merge with Debian unstable (LP: #2111371). Remaining changes: + * Do not test the inetutils-ping package (LP #2009814) + - d/t/test-root-commands: disable ping tests + - d/t/control: remove inetutils-ping dependency + + -- Ural Tunaboyu Tue, 20 May 2025 15:21:28 -0700 + inetutils (2:2.6-1) unstable; urgency=medium * New upstream release. @@ -14,6 +35,15 @@ inetutils (2:2.6-1) unstable; urgency=me -- Guillem Jover Sat, 22 Feb 2025 00:43:32 +0100 +inetutils (2:2.5-6ubuntu1) plucky; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + * Do not test the inetutils-ping package: + - d/t/test-root-commands: disable ping tests + - d/t/control: remove inetutils-ping dependency + + -- Simon Quigley Tue, 18 Feb 2025 16:00:38 -0600 + inetutils (2:2.5-6) unstable; urgency=medium * Place each command line option in debian/rules on its own line. @@ -29,6 +59,15 @@ inetutils (2:2.5-6) unstable; urgency=me -- Guillem Jover Tue, 18 Feb 2025 03:18:03 +0100 +inetutils (2:2.5-5ubuntu1) oracular; urgency=medium + + * Merge from Debian unstable. Remaining changes: + * Do not test the inetutils-ping package. + - d/t/test-root-commands: disable ping tests + - d/t/control: remove inetutils-ping dependency + + -- Steve Langasek Thu, 11 Jul 2024 12:23:44 -0700 + inetutils (2:2.5-5) unstable; urgency=medium * Add a Depends on login to inetutils-telnetd, now that login switched from @@ -52,6 +91,33 @@ inetutils (2:2.5-4) unstable; urgency=me -- Guillem Jover Thu, 02 May 2024 19:54:11 +0200 +inetutils (2:2.5-3ubuntu4) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- Steve Langasek Sun, 31 Mar 2024 00:08:22 +0000 + +inetutils (2:2.5-3ubuntu3) noble; urgency=medium + + * No-change rebuild against libcom-err2 + + -- Steve Langasek Tue, 12 Mar 2024 20:33:04 +0000 + +inetutils (2:2.5-3ubuntu2) noble; urgency=medium + + * No-change rebuild against libcomerr2 + + -- Steve Langasek Fri, 08 Mar 2024 06:47:18 +0000 + +inetutils (2:2.5-3ubuntu1) noble; urgency=medium + + * Merge with Debian unstable (LP: #2054684). Remaining changes: + * Do not test the inetutils-ping package (LP: #2009814) + - d/t/test-root-commands: disable ping tests + - d/t/control: remove inetutils-ping dependency + + -- Dominik Viererbe Thu, 22 Feb 2024 17:18:41 +0200 + inetutils (2:2.5-3) unstable; urgency=medium * Take DPKG_ROOT into account in maintainer scripts. @@ -73,6 +139,17 @@ inetutils (2:2.5-1) unstable; urgency=me -- Guillem Jover Fri, 29 Dec 2023 20:08:36 +0100 +inetutils (2:2.4-3ubuntu1) noble; urgency=medium + + * Merge with Debian unstable (LP: #2046259). Remaining changes: + * Do not test the inetutils-ping package (LP: #2009814) + - d/t/test-root-commands: disable ping tests + - d/t/control: remove inetutils-ping dependency + * Droped d/p/CVE-2023-40303.patch as 2:2.4-3 already carries this patch as + d/p/upstream/0002-ftpd-rcp-rlogin-rsh-rshd-uucpd-fix-check-set-id-retu.patch + + -- Dominik Viererbe Tue, 12 Dec 2023 23:49:39 +0200 + inetutils (2:2.4-3) unstable; urgency=medium * Remove support for Linux devfs from syslogd init script. @@ -89,6 +166,22 @@ inetutils (2:2.4-3) unstable; urgency=me -- Guillem Jover Sun, 20 Aug 2023 15:38:46 +0200 +inetutils (2:2.4-2ubuntu2) mantic; urgency=medium + + * SECURITY UPDATE: Privilege escalation + - debian/patches/CVE-2023-40303.patch: check setuid, setguid return values + in ftpd/ftpd.c, src/rpc.c, src/rlogin.c, src/rsh.c, src/rshd.c, + src/uucpd.c. + - CVE-2023-40303 + + -- Leonidas Da Silva Barbosa Wed, 13 Sep 2023 13:52:04 -0300 + +inetutils (2:2.4-2ubuntu1) lunar; urgency=medium + + * Do not test the inetutils-ping package (LP: #2009814) + + -- Dominik Viererbe Thu, 23 Mar 2023 11:32:35 +0200 + inetutils (2:2.4-2) unstable; urgency=medium * Add support for new RFC4443 ICMPv6 destination unreachable codes. @@ -1489,3 +1582,4 @@ inetutils (1.3.2-1) unstable; urgency=lo * Initial Release. -- Marcus Brinkmann Wed, 3 Feb 1999 15:53:32 +0100 + diff -pruN 2:2.6-1/debian/control 2:2.6-1ubuntu3/debian/control --- 2:2.6-1/debian/control 2025-02-21 23:43:32.000000000 +0000 +++ 2:2.6-1ubuntu3/debian/control 2025-05-20 22:21:28.000000000 +0000 @@ -1,7 +1,8 @@ Source: inetutils Section: net Priority: optional -Maintainer: Guillem Jover +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Guillem Jover Vcs-Browser: https://git.hadrons.org/cgit/debian/pkgs/inetutils.git Vcs-Git: https://git.hadrons.org/git/debian/pkgs/inetutils.git Homepage: https://www.gnu.org/software/inetutils/ diff -pruN 2:2.6-1/debian/patches/fix-ftbfs-ls-f.patch 2:2.6-1ubuntu3/debian/patches/fix-ftbfs-ls-f.patch --- 2:2.6-1/debian/patches/fix-ftbfs-ls-f.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:2.6-1ubuntu3/debian/patches/fix-ftbfs-ls-f.patch 2025-09-11 12:11:00.000000000 +0000 @@ -0,0 +1,27 @@ +Description: Remove 'ls -f' test to prevent FTBFS + The libls test, testing for good 'ls -f' support on libls, + fails on Ubuntu for now which triggers FTBFS for the package. + At the moment, coreutils ls version on Ubuntu also has an 'ls -f' + issue, and rust coreutils, being adopted, does not support 'ls -f'. + Wether the issue comes from libls present on this package, or + the tests tries to use the system package, it seems wiser to disable + this test for now, while we investigate if this issue happens upstream. +Author: Valentin Haudiquet +Bug-Ubuntu: https://launchpad.net/bugs/2122271 +Last-Update: 2025-09-11 +--- + +--- inetutils-2.6.orig/tests/libls.sh ++++ inetutils-2.6/tests/libls.sh +@@ -130,8 +130,9 @@ test `echo "$diff" | $GREP -c -v '^[.]\{ + fi + } + +-test x"$REPLY_C" != x"$REPLY_Cf" || +- { errno=1; echo >&2 'Failed to disable sorting with "-f".'; } ++# Temporarily fix LP #2122271, while upstream fixes it for good ++# 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".'; } diff -pruN 2:2.6-1/debian/patches/series 2:2.6-1ubuntu3/debian/patches/series --- 2:2.6-1/debian/patches/series 2025-02-21 23:43:32.000000000 +0000 +++ 2:2.6-1ubuntu3/debian/patches/series 2025-09-11 12:01:37.000000000 +0000 @@ -4,3 +4,4 @@ local/0002-build-Use-runstatedir-for-run 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 +fix-ftbfs-ls-f.patch diff -pruN 2:2.6-1/debian/tests/control 2:2.6-1ubuntu3/debian/tests/control --- 2:2.6-1/debian/tests/control 2023-09-24 01:19:00.000000000 +0000 +++ 2:2.6-1ubuntu3/debian/tests/control 2025-05-20 22:21:28.000000000 +0000 @@ -28,7 +28,6 @@ Depends: net-tools, inetutils-ftp, inetutils-ftpd, - inetutils-ping, inetutils-traceroute, Restrictions: allow-stderr diff -pruN 2:2.6-1/debian/tests/test-root-commands 2:2.6-1ubuntu3/debian/tests/test-root-commands --- 2:2.6-1/debian/tests/test-root-commands 2023-09-24 01:19:00.000000000 +0000 +++ 2:2.6-1ubuntu3/debian/tests/test-root-commands 2025-05-20 22:21:28.000000000 +0000 @@ -7,10 +7,10 @@ autoreconf -f -i --disable-libls \ --disable-servers \ --disable-clients \ + --disable-ping \ + --disable-ping6 \ --enable-ftp \ --enable-ftpd \ - --enable-ping \ - --enable-ping6 \ --enable-traceroute \ # EOL @@ -20,8 +20,6 @@ export VERBOSE=1 export FTP=$(command -v inetutils-ftp) export FTPD=$(command -v ftpd) -export PING6=$(command -v ping6) -export PING=$(command -v ping) export TRACEROUTE=$(command -v inetutils-traceroute) make -C lib 2>&1