Merge ~vhaudiquet/ubuntu/+source/inetutils:merge-lp2138472-resolute into ubuntu/+source/inetutils:debian/sid

[Valentin Haudiquet]

Merge from Debian to Resolute (LP: #2138472)

[Nick Rosbrook (enr0n)]

LGTM. I found https://autopkgtest.ubuntu.com/user/vhaudiquet/ppa/inetutils-lp2138472-resolute and https://launchpad.net/~vhaudiquet/+archive/ubuntu/inetutils-lp2138472-resolute/+packages to check builds and tests.

In the future, please include that information in the PR.

review: Approve

[Valentin Haudiquet (vhaudiquet)]

Sorry, I only added ppa and autopkgtests in buglink.
Here are the relevant info just in case:

PPA: https://launchpad.net/~vhaudiquet/+archive/ubuntu/inetutils-lp2138472-resolute/+packages
MP: https://code.launchpad.net/~vhaudiquet/ubuntu/+source/inetutils/+git/inetutils/+merge/499341
Autopkgtests: https://autopkgtest.ubuntu.com/user/vhaudiquet/ppa/inetutils-lp2138472-resolute
BugLink: https://code.launchpad.net/bugs/2138472

Unmerged commits

d59db8a... by Valentin Haudiquet on 2026-01-27

changelog

7fa7d6a... by Valentin Haudiquet on 2026-01-27

update-maintainer

6a22eda... by Valentin Haudiquet on 2026-01-27

reconstruct-changelog

7f02982... by Valentin Haudiquet on 2026-01-27

merge-changelogs

5d19e8f... by Ural Tunaboyu on 2025-05-20

Do not test the inetutils-ping package (LP #2009814)

d/t/test-root-commands: disable ping tests
d/t/control: remove inetutils-ping dependency

diff --git a/debian/changelog b/debian/changelog
index a2b6c14..a836509 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+inetutils (2:2.7-2ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2138472). 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
+  * Drop changes:
+    - d/patches/inetutils-ttymsg-suppress-enoent: Fix UTMP support by ignoring ENOENT
+      [Fixed in 2.7-1]
+
+ -- Valentin Haudiquet <[e-mail]>  Tue, 27 Jan 2026 15:28:22 +0100
+
 inetutils (2:2.7-2) unstable; urgency=medium
 
   * Fix remote authentication by-pass in telnetd.
@@ -15,6 +27,21 @@ inetutils (2:2.7-1) unstable; urgency=medium
 
  -- Guillem Jover <[e-mail]>  Wed, 17 Dec 2025 03:53:07 +0100
 
+inetutils (2:2.6-4ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2130124). 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
+  * Drop changes:
+    - d/patches/fix-ftbfs-ls-f.patch: Remove 'ls -f' test to prevent FTBFS (LP #2122271)
+      [Fixed in 2.6-2]
+  * New changes:
+    - d/patches/inetutils-ttymsg-suppress-enoent: Fix UTMP support by ignoring ENOENT
+      Thanks to Erik Auerswald
+
+ -- Valentin Haudiquet <[e-mail]>  Mon, 01 Dec 2025 20:38:18 +0100
+
 inetutils (2:2.6-4) unstable; urgency=medium
 
   * Use URL instead of FSF postal address for GPL in debian/copyright.
@@ -41,6 +68,27 @@ inetutils (2:2.6-2) unstable; urgency=medium
 
  -- Guillem Jover <[e-mail]>  Fri, 20 Jun 2025 03:39:26 +0200
 
+inetutils (2:2.6-1ubuntu3) questing; urgency=medium
+
+  * Remove 'ls -f' test to prevent FTBFS (LP: #2122271)
+
+ -- Valentin Haudiquet <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 20 May 2025 15:21:28 -0700
+
 inetutils (2:2.6-1) unstable; urgency=medium
 
   * New upstream release.
@@ -57,6 +105,15 @@ inetutils (2:2.6-1) unstable; urgency=medium
 
  -- Guillem Jover <[e-mail]>  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 <[e-mail]>  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.
@@ -72,6 +129,15 @@ inetutils (2:2.5-6) unstable; urgency=medium
 
  -- Guillem Jover <[e-mail]>  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 <[e-mail]>  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
@@ -95,6 +161,33 @@ inetutils (2:2.5-4) unstable; urgency=medium
 
  -- Guillem Jover <[e-mail]>  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 <[e-mail]>  Sun, 31 Mar 2024 00:08:22 +0000
+
+inetutils (2:2.5-3ubuntu3) noble; urgency=medium
+
+  * No-change rebuild against libcom-err2
+
+ -- Steve Langasek <[e-mail]>  Tue, 12 Mar 2024 20:33:04 +0000
+
+inetutils (2:2.5-3ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libcomerr2
+
+ -- Steve Langasek <[e-mail]>  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 <[e-mail]>  Thu, 22 Feb 2024 17:18:41 +0200
+
 inetutils (2:2.5-3) unstable; urgency=medium
 
   * Take DPKG_ROOT into account in maintainer scripts.
@@ -116,6 +209,17 @@ inetutils (2:2.5-1) unstable; urgency=medium
 
  -- Guillem Jover <[e-mail]>  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 <[e-mail]>  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.
@@ -132,6 +236,22 @@ inetutils (2:2.4-3) unstable; urgency=medium
 
  -- Guillem Jover <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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.
@@ -1532,3 +1652,4 @@ inetutils (1.3.2-1) unstable; urgency=low
   * Initial Release.
 
  -- Marcus Brinkmann <[e-mail]>  Wed,  3 Feb 1999 15:53:32 +0100
+
diff --git a/debian/control b/debian/control
index c4bd4e0..02294ab 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: inetutils
 Section: net
-Maintainer: Guillem Jover <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Guillem Jover <[e-mail]>
 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 --git a/debian/tests/control b/debian/tests/control
index fa56d30..f53a210 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -28,7 +28,6 @@ Depends:
  net-tools,
  inetutils-ftp,
  inetutils-ftpd,
- inetutils-ping,
  inetutils-traceroute,
 Restrictions:
  allow-stderr
diff --git a/debian/tests/test-root-commands b/debian/tests/test-root-commands
index 1fa1530..3244559 100755
--- a/debian/tests/test-root-commands
+++ b/debian/tests/test-root-commands
@@ -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