Accepting request 753232 from home:mkubecek:branches:security:netfilter

- Update to new upstream release 5.4

OBS-URL: https://build.opensuse.org/request/show/753232
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=181
This commit is contained in:
Jan Engelhardt 2019-12-03 17:33:56 +00:00 committed by Git OBS Bridge
parent 2a76b835f9
commit e8807206d4
8 changed files with 79 additions and 62 deletions

View File

@ -1,53 +0,0 @@
From: Oleksandr Chumachenko <ledest@gmail.com>
Date: Thu, 18 Dec 2014 17:35:02 +0100
Subject: examples: fix bashisms in example script
Patch-mainline: Not yet, waiting for author's response
As the script is declared to be for /bin/sh, it shouldn't use bash
specific syntax.
---
examples/gaiconf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/gaiconf b/examples/gaiconf
index d75292b900cc..c87778f88f3b 100644
--- a/examples/gaiconf
+++ b/examples/gaiconf
@@ -11,7 +11,7 @@ DEFAULT_GAICONF=/etc/gai.conf
verbose=
debug=
-function run ()
+run ()
{
if [ x"$verbose" != x"" ]; then
echo "$@"
@@ -21,7 +21,7 @@ function run ()
fi
}
-function do_load_config ()
+do_load_config ()
{
file=$1; shift
flush=1
@@ -36,14 +36,14 @@ function do_load_config ()
done
}
-function do_list_config ()
+do_list_config ()
{
${IP} -6 addrlabel list | while read p pfx l lbl; do
echo label ${pfx} ${lbl}
done
}
-function help ()
+help ()
{
echo "Usage: $0 [-v] {--list | --config [ ${DEFAULT_GAICONF} ] | --default}"
exit 1
--
2.14.1

Binary file not shown.

View File

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

BIN
iproute2-5.4.0.tar.sign Normal file

Binary file not shown.

3
iproute2-5.4.0.tar.xz Normal file
View File

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

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Tue Dec 3 12:28:37 UTC 2019 - Michal Kubeček <mkubecek@suse.cz>
- Update to new upstream release 5.4
* devlink: increase number of supported options (32 -> 64)
* devlink: add trap set and show commands
* devlink: add trap group set and show commands
* devlink: add reset_dev_on_drv_probe param
* devlink: support unknown value for fw_load_policy
* devlink: support flash status monitoring
* devlink: add reload failed indication
* ip: netns: support dump of nsid conversion table
* ip: nexthop: support filtering by protocol for flush and list
* rdma: driver QP type string
* tc: introduce ct action
* tc: support 64-bit rate and peakrate
* tc: etf: support skip_sock_check
* tc: flower: add matching on conntrack info
* tc: taprio: support setting flags
* tc: taprio: support setting txtime_delay
* documentation improvements
* json output improvements
* drop outdated example scripts and README files
- drop (patched script dropped)
examples-fix-bashisms-in-example-script.patch
- ss-fix-end-of-line-printing-in-misc-ss.c.patch:
fix missing end of line at the end of ss output
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 25 07:07:32 UTC 2019 - Michal Kubeček <mkubecek@suse.cz> Wed Sep 25 07:07:32 UTC 2019 - Michal Kubeček <mkubecek@suse.cz>

View File

@ -17,9 +17,9 @@
Name: iproute2 Name: iproute2
Version: 5.3 Version: 5.4
Release: 0 Release: 0
%define rversion 5.3.0 %define rversion 5.4.0
Summary: Linux network configuration utilities Summary: Linux network configuration utilities
License: GPL-2.0-only License: GPL-2.0-only
Group: Productivity/Networking/Routing Group: Productivity/Networking/Routing
@ -36,7 +36,7 @@ Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch
Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch Patch3: add-explicit-typecast-to-avoid-gcc-warning.patch
Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch Patch4: xfrm-support-displaying-transformations-used-for-Mob.patch
Patch6: split-link-and-compile-steps-for-binaries.patch Patch6: split-link-and-compile-steps-for-binaries.patch
Patch7: examples-fix-bashisms-in-example-script.patch Patch7: ss-fix-end-of-line-printing-in-misc-ss.c.patch
Patch101: Revert-tc-ematch-fix-deprecated-yacc-warning.patch Patch101: Revert-tc-ematch-fix-deprecated-yacc-warning.patch
Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.patch
Patch201: bpf-data-section-support-poc.patch Patch201: bpf-data-section-support-poc.patch
@ -112,8 +112,7 @@ b="%buildroot"
install -d "$b"/{etc/,sbin/,usr/{bin,sbin,share/man/man{3,8}}} install -d "$b"/{etc/,sbin/,usr/{bin,sbin,share/man/man{3,8}}}
install -d "$b"/{/usr/include,%_libdir,/usr/share} install -d "$b"/{/usr/include,%_libdir,/usr/share}
%make_install \ %make_install \
MODDESTDIR="$b/%_libdir/tc" \ MODDESTDIR="$b/%_libdir/tc"
DOCDIR="%_docdir/%name"
# We have m_xt # We have m_xt
rm -f "$b/%_libdir/tc/m_ipt.so" rm -f "$b/%_libdir/tc/m_ipt.so"
@ -130,7 +129,8 @@ for BIN in lnstat nstat routef routel ss; do
ln -sf "%_sbindir/$BIN" "$b/%_bindir/$BIN" ln -sf "%_sbindir/$BIN" "$b/%_bindir/$BIN"
done done
rm "$b/%_sbindir/ifcfg" rm "$b/%_sbindir/ifcfg"
cp -an README* "$b/%_docdir/%name/" mkdir -p "$b/%_docdir/%name"
cp -an README* examples/bpf "$b/%_docdir/%name/"
%fdupes %buildroot/%_prefix %fdupes %buildroot/%_prefix
%files %files

View File

@ -0,0 +1,42 @@
From: Brian Vazquez <brianvv@google.com>
Subject: ss: fix end-of-line printing in misc/ss.c
Patch-mainline: Submitted - 20191126 - http://lkml.kernel.org/r/20191127052118.163594-1-brianvv@google.com
References: none
Before commit 5883c6eba517, function field_is_last() was incorrectly
reporting which column was the last because it was missing COL_PROC
and by purely coincidence it was correctly printing the end-of-line and
moving to the first column since the very last field was empty, and
end-of-line was added for the last non-empty token since it was seen as
the last field.
This commits correcrly prints the end-of-line for the last entrien in
the ss command.
Tested:
diff <(./ss.old -nltp) <(misc/ss -nltp)
38c38
< LISTEN 0 128 [::1]:35417 [::]:* users:(("foo",pid=65254,fd=116))
\ No newline at end of file
Cc: Hritik Vijay <hritikxx8@gmail.com>
Fixes: 5883c6eba517 ("ss: show header for --processes/-p")
Signed-off-by: Brian Vazquez <brianvv@google.com>
---
misc/ss.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1289,6 +1289,11 @@ static void render(void)
token = buf_token_next(token);
}
+ /* Deal with final end-of-line when the last non-empty field printed
+ * is not the last field.
+ */
+ if (line_started)
+ printf("\n");
buf_free_all();
current_field = columns;