diff -Nru ethtool-5.16/debian/changelog ethtool-5.16/debian/changelog --- ethtool-5.16/debian/changelog 2022-01-19 07:33:23.000000000 +0000 +++ ethtool-5.16/debian/changelog 2023-12-12 20:52:33.000000000 +0000 @@ -1,3 +1,11 @@ +ethtool (1:5.16-1ubuntu0.1) jammy; urgency=medium + + * d/p/0001-Fix-ethtool-module-info-in-human-readable-mode.patch: add + upstream patch to avoid hex dump report even in human-readable mode + (LP: #2043983). + + -- Lucas Kanashiro Tue, 12 Dec 2023 17:52:33 -0300 + ethtool (1:5.16-1) unstable; urgency=medium [ Ben Hutchings ] diff -Nru ethtool-5.16/debian/control ethtool-5.16/debian/control --- ethtool-5.16/debian/control 2022-01-19 07:33:23.000000000 +0000 +++ ethtool-5.16/debian/control 2023-12-12 20:52:33.000000000 +0000 @@ -1,7 +1,8 @@ Source: ethtool Section: net Priority: optional -Maintainer: Debian Kernel Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Kernel Team Uploaders: Ben Hutchings , Salvatore Bonaccorso Standards-Version: 4.6.0 Build-Depends: debhelper-compat (= 13), autoconf, automake, libmnl-dev, pkg-config diff -Nru ethtool-5.16/debian/patches/0001-Fix-ethtool-module-info-in-human-readable-mode.patch ethtool-5.16/debian/patches/0001-Fix-ethtool-module-info-in-human-readable-mode.patch --- ethtool-5.16/debian/patches/0001-Fix-ethtool-module-info-in-human-readable-mode.patch 1970-01-01 00:00:00.000000000 +0000 +++ ethtool-5.16/debian/patches/0001-Fix-ethtool-module-info-in-human-readable-mode.patch 2023-12-12 20:52:25.000000000 +0000 @@ -0,0 +1,25 @@ +From: Lucas Kanashiro +Date: Mon, 11 Dec 2023 18:49:23 -0300 +Subject: Fix ethtool module info in human readable mode + +Origin: upstream, https://lists.openwall.net/netdev/2023/11/23/118 +Forwarded: https://salsa.debian.org/kernel-team/ethtool/-/merge_requests/3 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ethtool/+bug/2043983 +Reviewed-By: Lucas Kanashiro +Last-Updated: 2023-12-11 +--- + netlink/module-eeprom.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/netlink/module-eeprom.c b/netlink/module-eeprom.c +index 09ad580..e9dd270 100644 +--- a/netlink/module-eeprom.c ++++ b/netlink/module-eeprom.c +@@ -216,6 +216,7 @@ static int eeprom_parse(struct cmd_context *ctx) + + switch (request.data[0]) { + #ifdef ETHTOOL_ENABLE_PRETTY_DUMP ++ case SFF8024_ID_SOLDERED_MODULE: + case SFF8024_ID_SFP: + return sff8079_show_all_nl(ctx); + case SFF8024_ID_QSFP: diff -Nru ethtool-5.16/debian/patches/series ethtool-5.16/debian/patches/series --- ethtool-5.16/debian/patches/series 2022-01-19 07:33:23.000000000 +0000 +++ ethtool-5.16/debian/patches/series 2023-12-12 20:52:25.000000000 +0000 @@ -0,0 +1 @@ +0001-Fix-ethtool-module-info-in-human-readable-mode.patch