From e89f2382c1927651fba03466e12ddf4fb58af7b2570c1a7a63d21105303b3e36 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Mar 2022 14:50:12 +0000 Subject: [PATCH] Accepting request 965034 from home:gmbr3:Active - update to 5.17: * lib/fs: fix memory leak in get_task_name() * bridge: Remove vlan listing from `bridge link` * bond: add arp_missed_max option * libnetlink: fix socket leak in rtnl_open_byproto() * dcb: Fix error reporting when accessing "dcb app" * tc_util: Fix parsing action control with space and slash * lib: fix ax25.h include for musl * uapi: add missing rose and ax25 files * rdma: Fix res_print_uint() and add res_print_u64() * tc: Add support for ce_threshold_value/mask in fq_codel - Add tmpfiles.d conf for /run/netns OBS-URL: https://build.opensuse.org/request/show/965034 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=222 --- ...tallation-directories-for-openSUSE-SLE.patch | 4 ++-- iproute2-5.16.0.tar.sign | Bin 566 -> 0 bytes iproute2-5.16.0.tar.xz | 3 --- iproute2-5.17.0.tar.sign | Bin 0 -> 566 bytes iproute2-5.17.0.tar.xz | 3 +++ iproute2.changes | 16 ++++++++++++++++ iproute2.spec | 9 ++++++++- iproute2.tmpfiles | 2 ++ 8 files changed, 31 insertions(+), 6 deletions(-) delete mode 100644 iproute2-5.16.0.tar.sign delete mode 100644 iproute2-5.16.0.tar.xz create mode 100644 iproute2-5.17.0.tar.sign create mode 100644 iproute2-5.17.0.tar.xz create mode 100644 iproute2.tmpfiles diff --git a/adjust-installation-directories-for-openSUSE-SLE.patch b/adjust-installation-directories-for-openSUSE-SLE.patch index 4529af8..f17deb5 100644 --- a/adjust-installation-directories-for-openSUSE-SLE.patch +++ b/adjust-installation-directories-for-openSUSE-SLE.patch @@ -61,6 +61,6 @@ Match the directory layout of openSUSE and SLE. - snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type); + snprintf(name, sizeof(name), "%s/%s.dist", PKGDATADIR, type); - if ((f = fopen(name, "r")) == NULL) { + f = fopen(name, "r"); + if (f == NULL) { fprintf(stderr, "No distribution data for %s (%s: %s)\n", - type, name, strerror(errno)); diff --git a/iproute2-5.16.0.tar.sign b/iproute2-5.16.0.tar.sign deleted file mode 100644 index fc33694bacc5fabde8999a9ee9f4530f84111f4a78ba9fb966e8c356428f79b7..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/iproute2-5.16.0.tar.xz b/iproute2-5.16.0.tar.xz deleted file mode 100644 index f5dbb86..0000000 --- a/iproute2-5.16.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f -size 862504 diff --git a/iproute2-5.17.0.tar.sign b/iproute2-5.17.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..1edb22cd2662c83ef45b9447ad14c45bd1a808488414151dc71a77365e5834ea GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0%AGjSpW(N5P+wD zV3p0}e#BT0|3d2q#Gvn@vyn4|B&Ktq9S{)!9(l|QNHw1N`E-b1DJwKl8nt{0FH%Fd zn2^51Q2)y-pZ^*!G^RR+-P^g1-bA1kEJ{PnMgu-v+xuz`)o9l4l2}mhJ^j1J&fcDu z)8W=^(~6fw_+~V$+v(=$6#G?M$wRezJ2xb zm8QsU`HKm>aFHEcdRmS))k91Ak&-_9-2)akuQxkfl@3dzraU12Zj z$q3kFlgz!9mWi0Ea{he9`sncjO!kJ$!Bnv5V;7D2L^_1g<+V0A+QBl;)L7F>2T*d6 zU;7KVdR0q$gr~FsYj4A}Kf8Y~6ai=NKosmHjaY1az7mGhXQ)`>u4L4)O?{yieRa@l zwZpdSiU(r=&~F->!{YCU+$LmWEV#HxxGf&Etjg9L`bQn!a5Lb EHnPYXiU0rr literal 0 HcmV?d00001 diff --git a/iproute2-5.17.0.tar.xz b/iproute2-5.17.0.tar.xz new file mode 100644 index 0000000..1c9a439 --- /dev/null +++ b/iproute2-5.17.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e384f1b42c75e1a9daac57866da37dcff909090ba86eb25a6e764da7893660e +size 870908 diff --git a/iproute2.changes b/iproute2.changes index 741c0fa..eed34fc 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Mar 26 13:58:23 UTC 2022 - Callum Farmer + +- update to 5.17: + * lib/fs: fix memory leak in get_task_name() + * bridge: Remove vlan listing from `bridge link` + * bond: add arp_missed_max option + * libnetlink: fix socket leak in rtnl_open_byproto() + * dcb: Fix error reporting when accessing "dcb app" + * tc_util: Fix parsing action control with space and slash + * lib: fix ax25.h include for musl + * uapi: add missing rose and ax25 files + * rdma: Fix res_print_uint() and add res_print_u64() + * tc: Add support for ce_threshold_value/mask in fq_codel +- Add tmpfiles.d conf for /run/netns + ------------------------------------------------------------------- Fri Mar 4 09:43:42 UTC 2022 - Callum Farmer diff --git a/iproute2.spec b/iproute2.spec index 232f5a2..e28a310 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -18,7 +18,7 @@ %define _buildshell /bin/bash Name: iproute2 -Version: 5.16 +Version: 5.17 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0-only @@ -31,6 +31,7 @@ URL: https://wiki.linuxfoundation.org/networking/iproute2 #Git-Mirror: https://github.com/shemminger/iproute2 ## not updated Source: https://kernel.org/pub/linux/utils/net/iproute2/%name-%version.0.tar.xz Source2: https://kernel.org/pub/linux/utils/net/iproute2/%name-%version.0.tar.sign +Source3: %name.tmpfiles Source9: %name.keyring Patch1: adjust-installation-directories-for-openSUSE-SLE.patch Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch @@ -119,6 +120,7 @@ install -pm0644 "lib/libnetlink.a" "$b/%_libdir/" chmod -x "$b/%_libdir/libnetlink.a" install -pm0644 "include/libnetlink.h" "$b/%_includedir/" chmod -x "$b/%_includedir/libnetlink.h" +install -Dm0644 "%SOURCE3" "$b/%_tmpfilesdir/%name.conf" %if 0%{?usrmerged} ln -sf "%_sbindir/ip" "$b/%_bindir/ip" %else @@ -133,12 +135,17 @@ mkdir -p "$b/%_docdir/%name" cp -an README* examples/bpf "$b/%_docdir/%name/" %fdupes %buildroot/%_prefix +%post +%tmpfiles_create %_tmpfilesdir/%name.conf + %files %_bindir/lnstat %_bindir/nstat %_bindir/routel %_bindir/ss %_sbindir/* +%_tmpfilesdir/%name.conf +%ghost %dir %_rundir/netns %exclude %_sbindir/arpd %if 0%{?usrmerged} %_bindir/ip diff --git a/iproute2.tmpfiles b/iproute2.tmpfiles new file mode 100644 index 0000000..9fe53a9 --- /dev/null +++ b/iproute2.tmpfiles @@ -0,0 +1,2 @@ +#Type Path Mode User Group Age Argument +d /run/netns 0755 root root - -