From 0166ed23bcde88cec1a8efecd2edcaff2a1d2458 Mon Sep 17 00:00:00 2001 From: Ivan Vecera Date: Thu, 19 Mar 2026 10:49:32 +0100 Subject: [PATCH] Update to latest upstream release v6.19 Resolves: RHEL-98249 Signed-off-by: Ivan Vecera --- ...k-fix-missing-headers-in-text-output.patch | 64 ------------------- ethtool.spec | 9 ++- sources | 4 +- 3 files changed, 8 insertions(+), 69 deletions(-) delete mode 100644 0001-netlink-fix-missing-headers-in-text-output.patch diff --git a/0001-netlink-fix-missing-headers-in-text-output.patch b/0001-netlink-fix-missing-headers-in-text-output.patch deleted file mode 100644 index 5abebe1..0000000 --- a/0001-netlink-fix-missing-headers-in-text-output.patch +++ /dev/null @@ -1,64 +0,0 @@ -From b70c928661024cd07914feb49122275daab904ea Mon Sep 17 00:00:00 2001 -From: Jakub Kicinski -Date: Sat, 12 Jul 2025 07:51:05 -0700 -Subject: [PATCH] netlink: fix missing headers in text output - -The commit under fixes added a NULL-check which prevents us from -printing text headers. Conversions to add JSON support often use: - - print_string(PRINT_FP, NULL, "some text:\n", NULL); - -to print in plain text mode. - -Correct output: - - Channel parameters for vpn0: - Pre-set maximums: - RX: n/a - TX: n/a - Other: n/a - Combined: 1 - Current hardware settings: - RX: n/a - TX: n/a - Other: n/a - Combined: 0 - -With the buggy patch: - - Channel parameters for vpn0: - RX: n/a - TX: n/a - Other: n/a - Combined: 1 - RX: n/a - TX: n/a - Other: n/a - Combined: 0 - -Fixes: fd328ccb3cc0 ("json_print: add NULL check before jsonw_string_field() in print_string()") -Signed-off-by: Jakub Kicinski ---- - json_print.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/json_print.c b/json_print.c -index 4f61640..e07c651 100644 ---- a/json_print.c -+++ b/json_print.c -@@ -143,10 +143,11 @@ void print_string(enum output_type type, - } else if (_IS_FP_CONTEXT(type)) { - if (value) - fprintf(stdout, fmt, value); -+ else -+ fprintf(stdout, "%s", fmt); - } - } - -- - /* - * value's type is bool. When using this function in FP context you can't pass - * a value to it, you will need to use "is_json_context()" to have different --- -2.49.0 - diff --git a/ethtool.spec b/ethtool.spec index 3788c6c..683038e 100644 --- a/ethtool.spec +++ b/ethtool.spec @@ -1,14 +1,13 @@ Summary: Settings tool for Ethernet NICs Name: ethtool Epoch: 2 -Version: 6.15 -Release: 2%{?dist} +Version: 6.19 +Release: 1%{?dist} License: GPLv2 URL: https://www.kernel.org/pub/software/network/%{name}/ Source0: https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.xz Source1: https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.sign Source2: gpgkey-D2CB120AB45957B721CD9596F4554567B91DE934.gpg -Patch0: 0001-netlink-fix-missing-headers-in-text-output.patch BuildRequires: gnupg2, xz BuildRequires: gcc BuildRequires: libmnl-devel @@ -46,6 +45,10 @@ make check %{_datadir}/metainfo/org.kernel.software.network.ethtool.metainfo.xml %changelog +* Thu Mar 19 2026 Ivan Vecera - 2:6.19-1 +- Update to the latest upstream release v6.19 + Resolves RHEL-98249 + * Thu Jul 31 2025 Mohammad Heib - 2:6.15-2 - netlink: fix missing headers in text output. Resolves: RHEL-106540 diff --git a/sources b/sources index a752c2a..b30c94e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ethtool-6.15.tar.xz) = f140095e7c9e38d8b151796eed1301e9e6ab93e82d3e35b8a524b4f5be7b219e707bd270af7398195081085778c61948e15b39462a6a6f44aad6ffcaaddc3644 -SHA512 (ethtool-6.15.tar.sign) = 085ebdf0c6a16a64002c60ed8de4b62e681b0d60ad8b9c6e0ad7f4ca0e51eb8eef3f8cab10d18e43e54c10578711d2cfbbb433cdae12a2ace65db5de53196c90 +SHA512 (ethtool-6.19.tar.sign) = 0263a0b3bf76a244a71469ef6828b118ea73262eb3c34fb91c6c7854d39b411965402a46ea4e33ea5149b0923ab654263bb35c6009c6a8aeb5860877db0af533 +SHA512 (ethtool-6.19.tar.xz) = b91adb6eb2cd5bf395371cbe68b5542645691d4fb1a860e1edf2d07d7b13e88710715c8fb0dda16279b57ccd0a9ac3782d37b38374bb477382cfc44363de381e SHA512 (gpgkey-D2CB120AB45957B721CD9596F4554567B91DE934.gpg) = e580d255c5e3f0dfc4f7af22dd5917e2cde47cabd85ae39372195d24c70f7e3bfea105c84e459320a070293ded4941b6dd8f6d8cd501dc2779774ea949665d7b