Merge ~lucaskanashiro/ubuntu/+source/ethtool:fix-ethtool-module-info-lunar into ubuntu/+source/ethtool:ubuntu/lunar-devel

[Lucas Kanashiro]

Import patch proposed by upstream to fix ethtool module info in human-readable mode. See LP: #2043983.

PPA: https://launchpad.net/~lucaskanashiro/+archive/ubuntu/ethtool/+packages

[Andreas Hasenack (ahasenack)]

+1, straightforward

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: lucaskanashiro, ahasenack
Uploaders: lucaskanashiro, ahasenack
MP auto-approved

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks Andreas, package uploaded:

Uploading ethtool_6.1-1ubuntu0.1.dsc
Uploading ethtool_6.1-1ubuntu0.1.debian.tar.xz
Uploading ethtool_6.1-1ubuntu0.1_source.changes

[Andreas Hasenack (ahasenack)]

This was uploaded to lunar-proposed, and imported into git-ubuntu, but the package was not verified in time for lunar's EOL and was then removed from lunar-proposed. In terms of branches, this was merged, so I'll mark it as such anyway.

diff --git a/debian/changelog b/debian/changelog
index f58a8ee..045e938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ethtool (1:6.1-1ubuntu0.1) lunar; 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 <[e-mail]>  Tue, 12 Dec 2023 17:44:20 -0300
+
 ethtool (1:6.1-1) unstable; urgency=medium
 
   * New upstream release: 6.1
diff --git a/debian/control b/debian/control
index ed4d896..d7dbefb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ethtool
 Section: net
 Priority: optional
-Maintainer: Debian Kernel Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Kernel Team <[e-mail]>
 Uploaders: Ben Hutchings <[e-mail]>, Salvatore Bonaccorso <[e-mail]>
 Standards-Version: 4.6.2
 Build-Depends: debhelper-compat (= 13), autoconf, automake, libmnl-dev, pkg-config
diff --git a/debian/patches/0001-Fix-ethtool-module-info-in-human-readable-mode.patch b/debian/patches/0001-Fix-ethtool-module-info-in-human-readable-mode.patch
 new file mode 100644
index 0000000..77916d8
--- /dev/null
+++ b/debian/patches/0001-Fix-ethtool-module-info-in-human-readable-mode.patch
@@ -0,0 +1,25 @@
+From: Lucas Kanashiro <[e-mail]>
+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 <[e-mail]>
+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 --git a/debian/patches/series b/debian/patches/series
index e69de29..d500446 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-ethtool-module-info-in-human-readable-mode.patch