diff --git a/iproute2-5.10.0.tar.sign b/iproute2-5.10.0.tar.sign deleted file mode 100644 index 5520e00..0000000 Binary files a/iproute2-5.10.0.tar.sign and /dev/null differ 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 0000000..32badb2 Binary files /dev/null and b/iproute2-5.11.0.tar.sign differ 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