From e8807206d424bb541eb51bfc791d4565fd7f88481ff680843cf48eab64422669 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Dec 2019 17:33:56 +0000 Subject: [PATCH] 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 --- examples-fix-bashisms-in-example-script.patch | 53 ------------------ iproute2-5.3.0.tar.sign | Bin 566 -> 0 bytes iproute2-5.3.0.tar.xz | 3 - iproute2-5.4.0.tar.sign | Bin 0 -> 566 bytes iproute2-5.4.0.tar.xz | 3 + iproute2.changes | 28 +++++++++ iproute2.spec | 12 ++-- ...ix-end-of-line-printing-in-misc-ss.c.patch | 42 ++++++++++++++ 8 files changed, 79 insertions(+), 62 deletions(-) delete mode 100644 examples-fix-bashisms-in-example-script.patch delete mode 100644 iproute2-5.3.0.tar.sign delete mode 100644 iproute2-5.3.0.tar.xz create mode 100644 iproute2-5.4.0.tar.sign create mode 100644 iproute2-5.4.0.tar.xz create mode 100644 ss-fix-end-of-line-printing-in-misc-ss.c.patch diff --git a/examples-fix-bashisms-in-example-script.patch b/examples-fix-bashisms-in-example-script.patch deleted file mode 100644 index b2a41c0..0000000 --- a/examples-fix-bashisms-in-example-script.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Oleksandr Chumachenko -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 - diff --git a/iproute2-5.3.0.tar.sign b/iproute2-5.3.0.tar.sign deleted file mode 100644 index e2b3bd3f6173b68271c30ea98257cab0ebdd08f112012255966641f6b824050e..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$qx4H2?|;5P+wD zV3p0}eloid0KKB_mE92z6~*TvdK9#K8Lz-X9iN5IxcVl={ncZ7$9)En<3dmcasRFRmDmr+GB}oS;iR4cp7`26z_U;%NM1D z199P&jq5(_fD;74z?-=GzRTIEQe+1S6V1ABt!Id>J0AtUoesVo*+18zm=DwV%%er` z1}7sKZ+;xd_%RVWOmN54Mq2h@=?F0Na0*Y}WnS0o{<7=h)PqpAoKxQKo)AL9nIHq_ zeqDXNkRUYBPpQ!v5HIX8cu{rsbB!oS>8%gB%D<51cZ^Z6Uxz{?|#dNDAaB`%=c{hx! zr&JV9QyH+|2mK|c+3s6RH?5RB zkUE!Gza~1;2s<^7`lW5(-O1gQN`EfqPYGb8btFae&-j@s_$Z24D1`xXnRO#>*vq^6 zAxX-%Gt%KuSgFRZSd5Q}`@O|7i_fq^Yl2rZE9VgHQUyKFXB-B8-q{EY>Uz5j+AG@A zWj~n}J3_*sz*KsbML?_F=QoQ*(6Qb%lu1d*$^BevP@g!iDJhh*i0|!74U6T^@HmJUsF$H8hy#PELl&tJqb@miB*Lxbx}zZ4bqVVqF*x;~>tfZcN0 zADj;(ecV)&YFt1VmG`PHP&r?M7;NuZ48O60vp&%Rpya>V&1x&Hwb>;|;(f-Ud_{kJ zH^*v5AA?=Y%q`{e&XrR6Kl*tH6O3*nxtzs)#8O1xEbIjH#<<@>DU8*Q{94PMuLwfo zwa`C@3q{OrbcxtH(b~H_CIe?kFVR7tD)(w|v;#rN+EZ8~T%TsJ&4i9|=(Ke^EcK=@ zeuA^ddc^-|;qTqNGb@(`be5dMX>?tDv2qtM-UCC@{JUkNS2H%HF_mN4KR{m3q{-vK zYjkimqj2@BHv45GN%!?}nq#-(|-amc|MXGDKvTF-%U*sG + +- 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 diff --git a/iproute2.spec b/iproute2.spec index ffa3a6d..d64b3cd 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -17,9 +17,9 @@ Name: iproute2 -Version: 5.3 +Version: 5.4 Release: 0 -%define rversion 5.3.0 +%define rversion 5.4.0 Summary: Linux network configuration utilities License: GPL-2.0-only 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 Patch4: xfrm-support-displaying-transformations-used-for-Mob.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 Patch102: Revert-emp-fix-warning-on-deprecated-bison-directive.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"/{/usr/include,%_libdir,/usr/share} %make_install \ - MODDESTDIR="$b/%_libdir/tc" \ - DOCDIR="%_docdir/%name" + MODDESTDIR="$b/%_libdir/tc" # We have m_xt 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" done 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 %files diff --git a/ss-fix-end-of-line-printing-in-misc-ss.c.patch b/ss-fix-end-of-line-printing-in-misc-ss.c.patch new file mode 100644 index 0000000..d7d08d2 --- /dev/null +++ b/ss-fix-end-of-line-printing-in-misc-ss.c.patch @@ -0,0 +1,42 @@ +From: Brian Vazquez +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 +Fixes: 5883c6eba517 ("ss: show header for --processes/-p") +Signed-off-by: Brian Vazquez +--- + 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;