- add new upstream maintainer's key

- update to new upstream release 5.8

OBS-URL: https://build.opensuse.org/package/show/network:utilities/ethtool?expand=0&rev=100

ethtool-5.7.tar.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEzkpNCA8NME8juevdly1b9NxhOAYFAl7ZOvwACgkQly1b9Nxh
-OAaFyQ//cSW86pi2Ii06dK83dA+dsvHCApoUcxOS1UNuXfdUoOxQQzxgR7uU0i98
-SbZJvSTSGxR3h1wsqNFrTxtYw9xbFLC3u+8otUJbbqatbVaT8DlB84v4UklcBsCE
-if1CuYzCJEBUjCKneXL/WAET03uxV0RkKEgjcrXRma0JTYB0+5JW//7W2cKLFn2B
-iCEWU65G9hR73nafUQJ1vypgTz5e1eMHl9FfXJNjqScHeAwJq9aGUePal8Mkfr80
-ttb0yV48uw13j46Zj+w/QrurQPLNHAhUme2mHIwIly510rX6UZlylMBaTy0WDvGR
-zg394CmyR9XvddIkTS+lQHBrAUdhA4xtEpUasTq4dWp6I/Q8xIg1S04TDLNeoznr
-PTYLuGJAx+fuB6SaGSIAeClG++OEQzLeJQxrI9v3H3iLzqJpPZzchWWVC8QoTt8m
-vQraqxXtUkqrosIinAL1kIjj508N706+7bTZA+ke8oRoQC5/KeRIjwhLk6+kthzo
-vYOe/PKHU7o8RWoCERcj6LRWea6m6XaeNQEoMv2e7xEz6tKrRUdmlRSUbsIXWX7b
-XhVgrBM4EHmW1oPkNhLLdG0i0eyXYF0cyBi13yfO0+suPdY7B9oXWdT/uZv48Lfj
-YRUSpHqqb7aQxAZd4FysivXc+F7LEJKe4gPfV/4z8BaMgd6wZdI=
-=yuDM
------END PGP SIGNATURE-----

ethtool-5.7.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:724eb8bd3c3a389fe285735959a1902fbd9310624656ad3220c5f23df1053c39
-size 283048

ethtool-5.8.tar.sign

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEWN3j3bieVmp26mKO538sG/LRdpUFAl8pZE0ACgkQ538sG/LR
+dpVoJwf/eH09f6C8dpKGAZQUWomcOVNGrZdPsj+3yyL5S7OIHNKXJCMW31Za+viz
+ScDrvraONLwKNrJrmWCy0yHFfYuJ6bqo7mu45o2dh9GhdQ3dk9SHGqIPIQ3DVlY5
+f5Aila4QMld+sLmIGTYEyDI3vog2W9IwluN9ciShg/yADyjpKb0ulEgJxYH47y0z
+lLwFp15sO0nQZH7zXq3UYaqCA3nflmMTq3uWvJHsGGuC2CS+a9mI89fz9ne6FYzt
+8XF4Af7O+dko7teFJhrUrLnIFbjxu9Zg2OSSUORg2+Npl++kDl6rXX/0alhIWDDg
+vJnwRDVlWJl+zV7kQBGU850x7viPGg==
+=Waiw
+-----END PGP SIGNATURE-----

ethtool-5.8.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f3b54d08d048f5977b80cb6cb4744994370def7553ee634d39dbbb6ccf87546
+size 299416

ethtool.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Tue Aug  4 16:31:09 UTC 2020 - Michal Kubecek <mkubecek@suse.cz>
+
+- update to new upstream release 5.8
+  * netlink handler for device features
+  * netlink handler for private flags
+  * netlink handler for ring sizes
+  * netlink handler for channels counts
+  * netlink handler for coalescing parameters
+  * netlink handler for pause parameters
+  * netlink handler for EEE settings
+  * netlink handler for timestamping info
+  * master/slave configuration support
+  * LINKSTATE SQI support
+  * cable test support
+  * cable test TDR support
+  * JSON output for cable test commands
+  * igc driver support
+  * support for get/set ethtool_tunable
+  * dsa: mv88e6xxx: add pretty dump for 88E6352 SERDES
+  * fix some build warnings
+- drop patches present in 5.8 release:
+  * netlink-fix-build-warnings.patch
+  * netlink-fix-error-message-suppression.patch
+  * netlink-fix-unwanted-switch-fall-through-in-family_i.patch
+
+-------------------------------------------------------------------
+Tue Aug  4 13:47:14 UTC 2020 - Michal Kubecek <mkubecek@suse.cz>
+
+- ethtool.keyring:
+  add new upstream maintainer's key (F4554567B91DE934)
+
 -------------------------------------------------------------------
 Fri Jun 12 10:19:38 UTC 2020 - Michal Kubecek <mkubecek@suse.cz>
 

ethtool.spec

@@ -17,7 +17,7 @@
 
 
 Name:           ethtool
-Version:        5.7
+Version:        5.8
 Release:        0
 Summary:        Utility for examining and tuning Ethernet-based network interfaces
 License:        GPL-2.0-only
@@ -33,19 +33,12 @@ BuildRequires:  pkgconfig
 BuildRequires:  xz
 BuildRequires:  pkgconfig(libmnl)
 
-Patch1:         netlink-fix-build-warnings.patch
-Patch2:         netlink-fix-unwanted-switch-fall-through-in-family_i.patch
-Patch3:         netlink-fix-error-message-suppression.patch
-
 %description
 Ethtool is a small utility for examining and tuning ethernet-based
 network interfaces.  See the man page for more details.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 export CFLAGS="%optflags -W -Wall -Wstrict-prototypes -Wformat-security -Wpointer-arith -Wno-missing-field-initializers"

netlink-fix-build-warnings.patch

@@ -1,43 +0,0 @@
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Fri, 29 May 2020 01:21:12 +0200
-Subject: netlink: fix build warnings
-Patch-mainline: v5.8
-Git-commit: a9b8685859075771887aad0328246e0afa089caf
-
-Depending on compiler version and options, some of these warnings may
-result in build failure.
-
-- gcc 4.8 wants __KERNEL_DIV_ROUND_UP defined before including ethtool.h
-- avoid pointer arithmetic on void *
-
-Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
-Tested-by: Heiko Thiery <heiko.thiery@gmail.com>
----
- netlink/desc-ethtool.c | 2 +-
- netlink/parser.c       | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/netlink/desc-ethtool.c
-+++ b/netlink/desc-ethtool.c
-@@ -4,9 +4,9 @@
-  * Descriptions of ethtool netlink messages and attributes for pretty print.
-  */
- 
-+#include "../internal.h"
- #include <linux/ethtool_netlink.h>
- 
--#include "../internal.h"
- #include "prettymsg.h"
- 
- static const struct pretty_nla_desc __header_desc[] = {
---- a/netlink/parser.c
-+++ b/netlink/parser.c
-@@ -1016,7 +1016,7 @@ int nl_parser(struct nl_context *nlctx, const struct param_parser *params,
- 			buff = tmp_buff_find(buffs, parser->group);
- 		msgbuff = buff ? &buff->msgbuff : &nlsk->msgbuff;
- 
--		param_dest = dest ? (dest + parser->dest_offset) : NULL;
-+		param_dest = dest ? ((char *)dest + parser->dest_offset) : NULL;
- 		ret = parser->handler(nlctx, parser->type, parser->handler_data,
- 				      msgbuff, param_dest);
- 		if (ret < 0)

netlink-fix-error-message-suppression.patch

@@ -1,38 +0,0 @@
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Wed, 10 Jun 2020 13:47:34 +0200
-Subject: netlink: fix error message suppression
-Patch-mainline: v5.8
-Git-commit: a4d9db29f8326d68762dbc0f78ad6f1aa4f29887
-
-Rewrite of nlsock_process_reply() used a bool variable to store the value
-of nlctx->suppress_nlerr before passing to nlsock_process_ack(). This
-causes the value of 2 (suppress all error/warning messages) to be converted
-to 1 (suppress only -EOPNOTSUPP). As a result, -ENOENT returned by failed
-genetlink family lookup when running on kernel without ethtool netlink
-support is not ignored and misleading "netlink error: No such file or
-directory" message is issued even if the ioctl fallback works as expected.
-
-Fixes: 76bdf9372824 ("netlink: use pretty printing for ethtool netlink messages")
-Reported-by: Heiner Kallweit <hkallweit1@gmail.com>
-Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
----
- netlink/nlsock.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/netlink/nlsock.c
-+++ b/netlink/nlsock.c
-@@ -255,12 +255,12 @@ int nlsock_process_reply(struct nl_socket *nlsk, mnl_cb_t reply_cb, void *data)
- 
- 		nlhdr = (struct nlmsghdr *)buff;
- 		if (nlhdr->nlmsg_type == NLMSG_ERROR) {
--			bool silent = nlsk->nlctx->suppress_nlerr;
-+			unsigned int suppress = nlsk->nlctx->suppress_nlerr;
- 			bool pretty;
- 
- 			pretty = debug_on(nlsk->nlctx->ctx->debug,
- 					  DEBUG_NL_PRETTY_MSG);
--			return nlsock_process_ack(nlhdr, len, silent, pretty);
-+			return nlsock_process_ack(nlhdr, len, suppress, pretty);
- 		}
- 
- 		msgbuff->nlhdr = nlhdr;

netlink-fix-unwanted-switch-fall-through-in-family_i.patch

@@ -1,26 +0,0 @@
-From: Michal Kubecek <mkubecek@suse.cz>
-Date: Sun, 7 Jun 2020 21:32:50 +0200
-Subject: netlink: fix unwanted switch fall through in family_info_cb()
-Patch-mainline: v5.8
-Git-commit: c07ea9e10498a09a08cc9b507704471d4d7f505b
-
-Recently added switch branch for CTRL_ATTR_OPS in family_info_cb() is
-missing final break statement so that it will fall through into
-CTRL_ATTR_MCAST_GROUPS.
-
-Fixes: 6c19c0d559c8 ("netlink: use genetlink ops information to decide about fallback")
-Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
----
- netlink/netlink.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/netlink/netlink.c
-+++ b/netlink/netlink.c
-@@ -211,6 +211,7 @@ static int family_info_cb(const struct nlmsghdr *nlhdr, void *data)
- 			ret = genl_read_ops(nlctx, attr);
- 			if (ret < 0)
- 				return MNL_CB_ERROR;
-+			break;
- 		case CTRL_ATTR_MCAST_GROUPS:
- 			find_mc_group(nlctx, attr);
- 			break;