From 844978d7280ef6a8c5c49a99469e4bbcfd7b758af934f37add67e172f679fc90 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 11 Jan 2022 19:58:28 +0000 Subject: [PATCH 1/2] Accepting request 945663 from home:gmbr3:Active - update to 5.16: * devlink: Fix cmd_dev_param_set() to check configuration mode * ip: add AMT support * iplink_can: fix configuration ranges in print_usage() and add unit * tc: flower: Fix buffer overflow on large labels * ip/ipnexthop: fix unsigned overflow in parse_nh_group_type_res() * tc/m_vlan: fix print_vlan() conditional on TCA_VLAN_ACT_PUSH_ETH * iplink_can: add new CAN FD bittiming parameters: Transmitter Delay Compensation (TDC) OBS-URL: https://build.opensuse.org/request/show/945663 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=218 --- ...nstallation-directories-for-openSUSE-SLE.patch | 2 +- iproute2-5.15.0.tar.sign | Bin 566 -> 0 bytes iproute2-5.15.0.tar.xz | 3 --- iproute2-5.16.0.tar.sign | Bin 0 -> 566 bytes iproute2-5.16.0.tar.xz | 3 +++ iproute2.changes | 14 ++++++++++++++ iproute2.spec | 3 +-- 7 files changed, 19 insertions(+), 6 deletions(-) delete mode 100644 iproute2-5.15.0.tar.sign delete mode 100644 iproute2-5.15.0.tar.xz create mode 100644 iproute2-5.16.0.tar.sign create mode 100644 iproute2-5.16.0.tar.xz diff --git a/adjust-installation-directories-for-openSUSE-SLE.patch b/adjust-installation-directories-for-openSUSE-SLE.patch index cf69184..9752031 100644 --- a/adjust-installation-directories-for-openSUSE-SLE.patch +++ b/adjust-installation-directories-for-openSUSE-SLE.patch @@ -15,12 +15,12 @@ Match the directory layout of openSUSE and SLE. @@ -14,7 +14,7 @@ endif PREFIX?=/usr - LIBDIR?=$(PREFIX)/lib -SBINDIR?=/sbin +SBINDIR?=/usr/sbin CONFDIR?=/etc/iproute2 NETNS_RUN_DIR?=/var/run/netns NETNS_ETC_DIR?=/etc/netns + DATADIR?=$(PREFIX)/share @@ -31,7 +31,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include SHARED_LIBS = y diff --git a/iproute2-5.15.0.tar.sign b/iproute2-5.15.0.tar.sign deleted file mode 100644 index adf19830c185be0fa607d42cf5760e765bc526b9971202e0194015f40f848067..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0%3rAC;$ox5P+wD zV3p0}ek<7z{xnio02+>{S0B>iepvJ>dBfxKzNEbRk*_v`W6S#;~39Sd8gNq|i*P>Q^d`eS( z+afMnpJID&n=R{vD%G5hlALbAXwXz;fp3cq6>1qj(tfRrIcfauUG}=2@mlHc+O4N1 z;pEy>zX(3*A6PZ%od~wMhA)o=EwgV!)kO$t-fBsRE40VI2>#NtH~@c-Da~4U#>V)N zmqUeYu0c3*}oiT#?>up{}%63*>-VKVJX z9$PCjyhid1ZHjze%^V=G9K%ac-gtz{+N4cO>l*ChH6Xqhkxf3c?57K$j@C+02Z)zM zb##m_jum%)$Kxv*H5gB0BfscuPC23EjgR>V2Gf8e@zODz`xYPFz9wS|xg~KeiMpvh zfhBMqC4S<~Pl3B3uhY+N*;^a~`AcscNOOfjX?YIOl8leH~&Eu?PYLd8a=?L E*oT`5+W-In diff --git a/iproute2-5.15.0.tar.xz b/iproute2-5.15.0.tar.xz deleted file mode 100644 index c907333..0000000 --- a/iproute2-5.15.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff -size 858068 diff --git a/iproute2-5.16.0.tar.sign b/iproute2-5.16.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..fc33694bacc5fabde8999a9ee9f4530f84111f4a78ba9fb966e8c356428f79b7 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0%6?1H2?|;5P+wD zV3p0}evIS~|5`{Ci13nx=s9>#oHW0TE-rTc7cr9P0BJ6lG)+1ZCa>bJB^M$K}*T@z3rJ>j8Cm`o2cQLGfva z%>S>1iv3`YZJq!zvxa?sbC6Sccf7LFQq=hfz|#RrUsi-g`I!l2+GNk>wJN4;f5Cut zWgztXoQVt14u(tk(dFy4mG%K8#YD_D7NwsK^1Fy&lis51^lH(a^HDn3DL?~7^==|e zA9G0JbW67$zWUIIW4;`uIfpnm@Oc_IkW>$WDvjUTTV+`JN>{{rALbTLJB06vkXK@A zEXG{CMIAe-;1ytUD#Jl`$*uzixpKT*_5F*{Q)^GHJ6P8tc(v2S+^!C06Lh{@Hl8gm zu!iwmW6w$=+CNxaNL6wmC)I2U@G1Tkcg6xPTPUr{)XQ4Ts1Us|;e~9W*)b5n|zhHpXs{D-HD#^)PH+s?BCX;O7|b0a8IXSM;8@5Vqrx%Cvj{`FD3 z*Gr0$QkBGIG-HIA3L%d6*`1)!=bx|`aJ^K>GF20)19;IF{x(1Zca|tU)P}R(r@~xK ErQfj`x&QzG literal 0 HcmV?d00001 diff --git a/iproute2-5.16.0.tar.xz b/iproute2-5.16.0.tar.xz new file mode 100644 index 0000000..f5dbb86 --- /dev/null +++ b/iproute2-5.16.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f +size 862504 diff --git a/iproute2.changes b/iproute2.changes index f54bbc5..5e2f3ad 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jan 11 19:49:31 UTC 2022 - Callum Farmer + +- update to 5.16: + * devlink: Fix cmd_dev_param_set() to check configuration mode + * ip: add AMT support + * iplink_can: fix configuration ranges in print_usage() and add + unit + * tc: flower: Fix buffer overflow on large labels + * ip/ipnexthop: fix unsigned overflow in parse_nh_group_type_res() + * tc/m_vlan: fix print_vlan() conditional on TCA_VLAN_ACT_PUSH_ETH + * iplink_can: add new CAN FD bittiming parameters: + Transmitter Delay Compensation (TDC) + ------------------------------------------------------------------- Sat Nov 13 20:03:30 UTC 2021 - Dirk Müller diff --git a/iproute2.spec b/iproute2.spec index feb3b2f..a4decdc 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -18,7 +18,7 @@ %define _buildshell /bin/bash Name: iproute2 -Version: 5.15 +Version: 5.16 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0-only @@ -128,7 +128,6 @@ ln -sf "%_sbindir/ip" "$b/bin/ip" for BIN in lnstat nstat routef routel ss; do ln -sf "%_sbindir/$BIN" "$b/%_bindir/$BIN" done -rm "$b/%_sbindir/ifcfg" mkdir -p "$b/%_docdir/%name" cp -an README* examples/bpf "$b/%_docdir/%name/" %fdupes %buildroot/%_prefix From 4bfdd58394f56dfee21fd7ad0b79ed9520a4129d3a7aa1ab52389adbf5c72dc4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 12 Jan 2022 10:30:34 +0000 Subject: [PATCH 2/2] Accepting request 945690 from home:gmbr3:Active - remove routef from links; it doesn't exist anymore OBS-URL: https://build.opensuse.org/request/show/945690 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=219 --- iproute2.changes | 5 +++++ iproute2.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/iproute2.changes b/iproute2.changes index 5e2f3ad..5b5e6e0 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 11 21:22:27 UTC 2022 - Callum Farmer + +- remove routef from links; it doesn't exist anymore + ------------------------------------------------------------------- Tue Jan 11 19:49:31 UTC 2022 - Callum Farmer diff --git a/iproute2.spec b/iproute2.spec index a4decdc..5e54e55 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -125,7 +125,7 @@ ln -s "%_sbindir/ip" "$b/sbin/" mkdir -p "$b/bin" ln -sf "%_sbindir/ip" "$b/bin/ip" %endif -for BIN in lnstat nstat routef routel ss; do +for BIN in lnstat nstat routel ss; do ln -sf "%_sbindir/$BIN" "$b/%_bindir/$BIN" done mkdir -p "$b/%_docdir/%name" @@ -135,7 +135,6 @@ cp -an README* examples/bpf "$b/%_docdir/%name/" %files %_bindir/lnstat %_bindir/nstat -%_bindir/routef %_bindir/routel %_bindir/ss %_sbindir/*