From d27c48cfeeb16718241b7cf2cc21ab15ecfd15937e96f3ab458c3f9586527dc8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 2 Mar 2021 15:08:49 +0000 Subject: [PATCH 1/2] Accepting request 876254 from home:lnussel:usrmove - missed /usr/bin/ip link in usrmerge OBS-URL: https://build.opensuse.org/request/show/876254 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=209 --- iproute2.changes | 5 +++++ iproute2.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/iproute2.changes b/iproute2.changes index 7a2539f..e1892d3 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -7,6 +7,11 @@ Wed Jan 27 18:25:04 UTC 2021 - Jan Engelhardt * ss: add support for XDP statistics * bridge: mdb: add support for source address +------------------------------------------------------------------- +Fri Dec 4 09:49:34 UTC 2020 - Ludwig Nussel + +- missed /usr/bin/ip link in usrmerge + ------------------------------------------------------------------- Sat Oct 17 11:23:47 UTC 2020 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index c560082..051ce2b 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -121,7 +121,9 @@ 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" -%if !0%{?usrmerged} +%if 0%{?usrmerged} +ln -sf "%_sbindir/ip" "$b%_bindir/ip" +%else ln -s "%_sbindir/ip" "$b/sbin" mkdir -p "$b/bin" ln -sf "%_sbindir/ip" "$b/bin/ip" @@ -142,7 +144,9 @@ cp -an README* examples/bpf "$b/%_docdir/%name/" %_bindir/ss %_sbindir/* %exclude %_sbindir/arpd -%if !0%{?usrmerged} +%if 0%{?usrmerged} +%_bindir/ip +%else /sbin/* /bin/ip %endif From 818a8fe36d6cbb4bd0f998378f465cc095dbd2db8d5cfd8c4d342f51f50fdd8b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 6 Mar 2021 08:33:03 +0000 Subject: [PATCH 2/2] - Update to release 5.11 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=210 --- iproute2-5.10.0.tar.sign | Bin 566 -> 0 bytes iproute2-5.10.0.tar.xz | 3 --- iproute2-5.11.0.tar.sign | Bin 0 -> 566 bytes iproute2-5.11.0.tar.xz | 3 +++ iproute2.changes | 9 +++++++++ iproute2.spec | 23 ++++++++++------------- 6 files changed, 22 insertions(+), 16 deletions(-) delete mode 100644 iproute2-5.10.0.tar.sign delete mode 100644 iproute2-5.10.0.tar.xz create mode 100644 iproute2-5.11.0.tar.sign create mode 100644 iproute2-5.11.0.tar.xz diff --git a/iproute2-5.10.0.tar.sign b/iproute2-5.10.0.tar.sign deleted file mode 100644 index 5520e000006af0c8bfcf8236ee11304356e419c1c6962980bbf615225deb49da..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$=QS5P+wD zV3p0}e#KxA0H`9))Q}2CCjampji85_{hUpLE5L1<8m7O?_yR$?qHI}RVbo}xd~KQ_ z7rkQVJ+nR3_!P)Jrfd8UlK}`=(0U)E5PQq>bbMFpFKf-pz3^X?nH@wJYWG{Y5abL zbBJLLhct7IlR?6EY1EosVht?`eP1?P{!H@@1u?pW>(xvUg61ey7T@Ps>^Of0c_qUg zbI@GO^nqu=HFX^+?@B3Zp?L>l9CK}=0;_6hu4*$H&mufSiDkats&OU!SNc+g9H0@k+YD9tay+~Eh5hDZ{`Ybrb&k6G}`F)StdH~OU}|0 zI;chj_h8`dRx6MY7JpE}Bh#e#H{l>DCMpl(DTNc~#`wTJABxsuHD_{6hCIh{3b4G} z2gV^s7~Uj-p4U?}zrWf5XAJ=1=^t&{5H?z$ssIJJ+%=x6BQkaH$#TIEi-x1YqG#k5 zn3z)T%XYpT>ycpe5?2uZR9yifgb$$v^1Fm4&kG?2O`P$q51E|4C~VWzBYVm`H$`%o Esf(8gxc~qF diff --git a/iproute2-5.10.0.tar.xz b/iproute2-5.10.0.tar.xz deleted file mode 100644 index d7b94e8..0000000 --- a/iproute2-5.10.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a54a34ae309c0406b2d1fb3a46158613ffb83d33fefd5d4a27f0010237ac53e9 -size 798776 diff --git a/iproute2-5.11.0.tar.sign b/iproute2-5.11.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..32badb2caab8275b42a6d41abd1e0dfc01a6a0276584d86e303ae644db2599f5 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+mZ^K2fTj%FyxIB-5r+;9T&E$Rs0$?>f#sCTl5P+wD zV3p0}elnmC0Jf{Ehc(tS36W~3TZf1Q^{v7{fo0-7yDDP3SO9d0msM-)?JZLQhw{s& zl{R20&7@D00*U-OO+22)*F|s5N6DH2)7re8R+Jr{J(z)$g$<^6Jdhhx5aE?s?gVba z^TjOvGB=DZ9>3Vwujq?eS)hUal|X33LG(ZAb3>l(551q%#`E2wKCwJ#T_vxxO{h6f zQ_EauYyz3u2%XC7J6DJV=45$tUk6*7uBUabx1+gXqM#ml(vjPdH#c7eb|%ISLd>x> zqdnhgiFzVfZ7vrJpWUTp!>tv4f3u+4X_9H0PQt(|MIc;{z1Vv$&Cm{QFYQa>gOx6HfK-oVel#pIcDXgw)>U)Rj;(2THko90P( zj<{m+;1mt+2&INMD((41gW;4#n)2~c7%LdIXM1%+G39ovC73k^LbjBShMS0GL5xx?aXb{tEmoa3-)) zvUR>?15#dmns4+g5|g?tUYVYZBf=j48<9vDW6gX+4YMs+2=jSnP`mkXr^+$2pg+rd En(}%QD*ylh literal 0 HcmV?d00001 diff --git a/iproute2-5.11.0.tar.xz b/iproute2-5.11.0.tar.xz new file mode 100644 index 0000000..e38f109 --- /dev/null +++ b/iproute2-5.11.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5e2ea108212b3445051b35953ec267f9f3469e1d5c67ac034ab559849505c54 +size 822136 diff --git a/iproute2.changes b/iproute2.changes index e1892d3..7c9c570 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Mar 6 08:31:13 UTC 2021 - Jan Engelhardt + +- Update to release 5.11 + * tc: skip actions that don't have options attribute when + printing + * ip route: Print "trap" nexthop indication + * dcb: new utility + ------------------------------------------------------------------- Wed Jan 27 18:25:04 UTC 2021 - Jan Engelhardt diff --git a/iproute2.spec b/iproute2.spec index 051ce2b..ef15b25 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -18,7 +18,7 @@ %define _buildshell /bin/bash Name: iproute2 -Version: 5.10.0 +Version: 5.11 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0-only @@ -29,8 +29,8 @@ URL: https://wiki.linuxfoundation.org/networking/iproute2 #DL-URL: https://kernel.org/pub/linux/utils/net/iproute2/ #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 #Git-Mirror: https://github.com/shemminger/iproute2 -Source: https://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.xz -Source2: https://kernel.org/pub/linux/utils/net/iproute2/%name-%version.tar.sign +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 Source9: %name.keyring Patch1: adjust-installation-directories-for-openSUSE-SLE.patch Patch2: use-sysconf-_SC_CLK_TCK-if-HZ-undefined.patch @@ -44,12 +44,9 @@ BuildRequires: flex BuildRequires: libelf-devel BuildRequires: pkgconfig >= 0.21 BuildRequires: xz -%define with_xt 1 -%if 0%{?with_xt} BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(xtables) >= 1.4.11 -%endif Provides: %name-doc = %version Provides: iproute = %version-%release Provides: %name(xfrm6_raw) = %version-%release @@ -94,12 +91,12 @@ broadcasting due to limited standard size (512..1024 entries, depending on type) of the kernel ARP cache. %prep -%autosetup -p1 +%autosetup -p1 -n %name-%version.0 find . -name *.orig -delete %build -%global _lto_cflags %{_lto_cflags} -ffat-lto-objects +%global _lto_cflags %_lto_cflags -ffat-lto-objects # build with -fPIC. For details see # https://bugzilla.novell.com/show_bug.cgi?id=388021 xt_libdir="$(pkg-config xtables --variable=xtlibdir)" @@ -111,20 +108,20 @@ xt_cflags="$(pkg-config xtables --cflags)" %install b="%buildroot" -install -d "$b"/{etc/,sbin/,usr/{bin,sbin,share/man/man{3,8}}} -install -d "$b"/{/usr/include,%_libdir,/usr/share} +mkdir -p "$b/usr/bin" "$b/usr/sbin" "$b/sbin" %make_install MODDESTDIR="$b/%_libdir/tc" -# We have m_xt +# We have m_xt instead rm -f "$b/%_libdir/tc/m_ipt.so" + 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" %if 0%{?usrmerged} -ln -sf "%_sbindir/ip" "$b%_bindir/ip" +ln -sf "%_sbindir/ip" "$b/%_bindir/ip" %else -ln -s "%_sbindir/ip" "$b/sbin" +ln -s "%_sbindir/ip" "$b/sbin/" mkdir -p "$b/bin" ln -sf "%_sbindir/ip" "$b/bin/ip" %endif