Hello community,
here is the log from the commit of package ethtool for openSUSE:Factory checked
in at 2018-11-12 09:49:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ethtool (Old)
and /work/SRC/openSUSE:Factory/.ethtool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ethtool"
Mon Nov 12 09:49:00 2018 rev:55 rq:646328 version:4.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/ethtool/ethtool.changes 2018-09-26
16:00:21.420604754 +0200
+++ /work/SRC/openSUSE:Factory/.ethtool.new/ethtool.changes 2018-11-12
09:49:02.812498784 +0100
@@ -1,0 +2,7 @@
+Fri Nov 2 17:49:03 UTC 2018 - mkube...@suse.cz
+
+- Update to new upstream release 4.19
+ * Feature: support combinations of FEC modes
+ * Fix: unitialized variable in qsfp dump
+
+-------------------------------------------------------------------
Old:
----
ethtool-4.18.tar.sign
ethtool-4.18.tar.xz
New:
----
ethtool-4.19.tar.sign
ethtool-4.19.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ethtool.spec ++++++
--- /var/tmp/diff_new_pack.2vxAVJ/_old 2018-11-12 09:49:03.240498139 +0100
+++ /var/tmp/diff_new_pack.2vxAVJ/_new 2018-11-12 09:49:03.240498139 +0100
@@ -17,7 +17,7 @@
Name: ethtool
-Version: 4.18
+Version: 4.19
Release: 0
Summary: Utility for examining and tuning Ethernet-based network
interfaces
License: GPL-2.0-only
++++++ ethtool-4.18.tar.xz -> ethtool-4.19.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/NEWS new/ethtool-4.19/NEWS
--- old/ethtool-4.18/NEWS 2018-08-24 20:25:43.000000000 +0200
+++ new/ethtool-4.19/NEWS 2018-11-02 15:57:18.000000000 +0100
@@ -1,3 +1,8 @@
+Version 4.19 - November 2, 2018
+ * Feature: support combinations of FEC modes
+ * Feature: better syntax for combinations of FEC modes
+ * Fix: Fix uninitialized variable use at qsfp dump
+
Version 4.18 - August 24, 2018
* Feature: Add support for WAKE_FILTER (WoL using filters)
* Feature: Add support for action value -2 (wake-up filter)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/configure new/ethtool-4.19/configure
--- old/ethtool-4.18/configure 2018-08-24 20:26:04.000000000 +0200
+++ new/ethtool-4.19/configure 2018-11-02 15:59:15.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ethtool 4.18.
+# Generated by GNU Autoconf 2.69 for ethtool 4.19.
#
# Report bugs to <net...@vger.kernel.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='ethtool'
PACKAGE_TARNAME='ethtool'
-PACKAGE_VERSION='4.18'
-PACKAGE_STRING='ethtool 4.18'
+PACKAGE_VERSION='4.19'
+PACKAGE_STRING='ethtool 4.19'
PACKAGE_BUGREPORT='net...@vger.kernel.org'
PACKAGE_URL=''
@@ -1237,7 +1237,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ethtool 4.18 to adapt to many kinds of systems.
+\`configure' configures ethtool 4.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1303,7 +1303,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ethtool 4.18:";;
+ short | recursive ) echo "Configuration of ethtool 4.19:";;
esac
cat <<\_ACEOF
@@ -1398,7 +1398,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ethtool configure 4.18
+ethtool configure 4.19
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1645,7 +1645,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ethtool $as_me 4.18, which was
+It was created by ethtool $as_me 4.19, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2510,7 +2510,7 @@
# Define the identity of the package.
PACKAGE='ethtool'
- VERSION='4.18'
+ VERSION='4.19'
cat >>confdefs.h <<_ACEOF
@@ -4695,7 +4695,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ethtool $as_me 4.18, which was
+This file was extended by ethtool $as_me 4.19, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4761,7 +4761,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ethtool config.status 4.18
+ethtool config.status 4.19
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/configure.ac
new/ethtool-4.19/configure.ac
--- old/ethtool-4.18/configure.ac 2018-08-24 20:22:08.000000000 +0200
+++ new/ethtool-4.19/configure.ac 2018-11-02 15:54:36.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ethtool, 4.18, net...@vger.kernel.org)
+AC_INIT(ethtool, 4.19, net...@vger.kernel.org)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR([ethtool.c])
AM_INIT_AUTOMAKE([gnu])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/ethtool.8 new/ethtool-4.19/ethtool.8
--- old/ethtool-4.18/ethtool.8 2018-08-24 20:31:42.000000000 +0200
+++ new/ethtool-4.19/ethtool.8 2018-11-02 15:59:17.000000000 +0100
@@ -113,7 +113,7 @@
. hy \\n(HY
..
.
-.TH ETHTOOL 8 "August 2018" "Ethtool version 4.18"
+.TH ETHTOOL 8 "November 2018" "Ethtool version 4.19"
.SH NAME
ethtool \- query or control network driver and hardware settings
.
@@ -389,7 +389,8 @@
.HP
.B ethtool \-\-set\-fec
.I devname
-.B4 encoding auto off rs baser
+.B encoding
+.BR auto | off | rs | baser \ [...]
.
.\" Adjust lines (i.e. full justification) and hyphenate.
.ad
@@ -1119,8 +1120,12 @@
administratively and report the problem in the system logs for users to
correct.
.RS 4
.TP
-.A4 encoding auto off rs baser
-Sets the FEC encoding for the device.
+.BR encoding\ auto | off | rs | baser \ [...]
+
+Sets the FEC encoding for the device. Combinations of options are specified as
+e.g.
+.B encoding auto rs
+; the semantics of such combinations vary between drivers.
.TS
nokeep;
lB l.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/ethtool.8.in
new/ethtool-4.19/ethtool.8.in
--- old/ethtool-4.18/ethtool.8.in 2018-08-24 20:22:39.000000000 +0200
+++ new/ethtool-4.19/ethtool.8.in 2018-11-02 15:55:21.000000000 +0100
@@ -113,7 +113,7 @@
. hy \\n(HY
..
.
-.TH ETHTOOL 8 "August 2018" "Ethtool version @VERSION@"
+.TH ETHTOOL 8 "November 2018" "Ethtool version @VERSION@"
.SH NAME
ethtool \- query or control network driver and hardware settings
.
@@ -389,7 +389,8 @@
.HP
.B ethtool \-\-set\-fec
.I devname
-.B4 encoding auto off rs baser
+.B encoding
+.BR auto | off | rs | baser \ [...]
.
.\" Adjust lines (i.e. full justification) and hyphenate.
.ad
@@ -1119,8 +1120,12 @@
administratively and report the problem in the system logs for users to
correct.
.RS 4
.TP
-.A4 encoding auto off rs baser
-Sets the FEC encoding for the device.
+.BR encoding\ auto | off | rs | baser \ [...]
+
+Sets the FEC encoding for the device. Combinations of options are specified as
+e.g.
+.B encoding auto rs
+; the semantics of such combinations vary between drivers.
.TS
nokeep;
lB l.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/ethtool.c new/ethtool-4.19/ethtool.c
--- old/ethtool-4.18/ethtool.c 2018-08-18 23:35:26.000000000 +0200
+++ new/ethtool-4.19/ethtool.c 2018-10-04 21:02:21.000000000 +0200
@@ -4967,21 +4967,16 @@
static int fecmode_str_to_type(const char *str)
{
- int fecmode = 0;
-
- if (!str)
- return fecmode;
-
if (!strcasecmp(str, "auto"))
- fecmode |= ETHTOOL_FEC_AUTO;
- else if (!strcasecmp(str, "off"))
- fecmode |= ETHTOOL_FEC_OFF;
- else if (!strcasecmp(str, "rs"))
- fecmode |= ETHTOOL_FEC_RS;
- else if (!strcasecmp(str, "baser"))
- fecmode |= ETHTOOL_FEC_BASER;
+ return ETHTOOL_FEC_AUTO;
+ if (!strcasecmp(str, "off"))
+ return ETHTOOL_FEC_OFF;
+ if (!strcasecmp(str, "rs"))
+ return ETHTOOL_FEC_RS;
+ if (!strcasecmp(str, "baser"))
+ return ETHTOOL_FEC_BASER;
- return fecmode;
+ return 0;
}
static int do_gfec(struct cmd_context *ctx)
@@ -5013,22 +5008,26 @@
static int do_sfec(struct cmd_context *ctx)
{
- char *fecmode_str = NULL;
+ enum { ARG_NONE, ARG_ENCODING } state = ARG_NONE;
struct ethtool_fecparam feccmd;
- struct cmdline_info cmdline_fec[] = {
- { "encoding", CMDL_STR, &fecmode_str, &feccmd.fec},
- };
- int changed;
- int fecmode;
- int rv;
-
- parse_generic_cmdline(ctx, &changed, cmdline_fec,
- ARRAY_SIZE(cmdline_fec));
+ int fecmode = 0, newmode;
+ int rv, i;
- if (!fecmode_str)
+ for (i = 0; i < ctx->argc; i++) {
+ if (!strcmp(ctx->argp[i], "encoding")) {
+ state = ARG_ENCODING;
+ continue;
+ }
+ if (state == ARG_ENCODING) {
+ newmode = fecmode_str_to_type(ctx->argp[i]);
+ if (!newmode)
+ exit_bad_args();
+ fecmode |= newmode;
+ continue;
+ }
exit_bad_args();
+ }
- fecmode = fecmode_str_to_type(fecmode_str);
if (!fecmode)
exit_bad_args();
@@ -5237,7 +5236,7 @@
" [ all ]\n"},
{ "--show-fec", 1, do_gfec, "Show FEC settings"},
{ "--set-fec", 1, do_sfec, "Set FEC settings",
- " [ encoding auto|off|rs|baser ]\n"},
+ " [ encoding auto|off|rs|baser [...]]\n"},
{ "-h|--help", 0, show_usage, "Show this help" },
{ "--version", 0, do_version, "Show version number" },
{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/ethtool.spec
new/ethtool-4.19/ethtool.spec
--- old/ethtool-4.18/ethtool.spec 2018-08-24 20:31:43.000000000 +0200
+++ new/ethtool-4.19/ethtool.spec 2018-11-02 15:59:17.000000000 +0100
@@ -1,5 +1,5 @@
Name : ethtool
-Version : 4.18
+Version : 4.19
Release : 1
Group : Utilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/qsfp.c new/ethtool-4.19/qsfp.c
--- old/ethtool-4.18/qsfp.c 2018-06-13 20:23:09.000000000 +0200
+++ new/ethtool-4.19/qsfp.c 2018-10-04 21:02:21.000000000 +0200
@@ -671,7 +671,7 @@
static void sff8636_show_dom(const __u8 *id, __u32 eeprom_len)
{
- struct sff_diags sd;
+ struct sff_diags sd = {0};
char *rx_power_string = NULL;
char power_string[MAX_DESC_SIZE];
int i;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/sfpdiag.c new/ethtool-4.19/sfpdiag.c
--- old/ethtool-4.18/sfpdiag.c 2016-08-24 21:47:26.000000000 +0200
+++ new/ethtool-4.19/sfpdiag.c 2018-10-04 21:02:21.000000000 +0200
@@ -241,7 +241,7 @@
void sff8472_show_all(const __u8 *id)
{
- struct sff_diags sd;
+ struct sff_diags sd = {0};
char *rx_power_string = NULL;
int i;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-4.18/test-cmdline.c
new/ethtool-4.19/test-cmdline.c
--- old/ethtool-4.18/test-cmdline.c 2016-08-24 21:47:26.000000000 +0200
+++ new/ethtool-4.19/test-cmdline.c 2018-10-04 21:02:21.000000000 +0200
@@ -266,6 +266,15 @@
{ 0, "--set-eee devname tx-timer 42 advertise 0x4321" },
{ 1, "--set-eee devname tx-timer foo" },
{ 1, "--set-eee devname advertise foo" },
+ { 1, "--set-fec devname" },
+ { 0, "--set-fec devname encoding auto" },
+ { 0, "--set-fec devname encoding off" },
+ { 0, "--set-fec devname encoding baser rs" },
+ { 0, "--set-fec devname encoding auto auto" },
+ { 1, "--set-fec devname encoding foo" },
+ { 1, "--set-fec devname encoding auto foo" },
+ { 1, "--set-fec devname encoding none" },
+ { 1, "--set-fec devname auto" },
/* can't test --set-priv-flags yet */
{ 0, "-h" },
{ 0, "--help" },
