iproute2: update to 5.14
Update iproute2 to latest stable 5.14; for the changes see https://lwn.net/Articles/867940/ Refresh patches Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
parent
0be4dea48e
commit
f413e4835e
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=iproute2
|
PKG_NAME:=iproute2
|
||||||
PKG_VERSION:=5.13.0
|
PKG_VERSION:=5.14.0
|
||||||
PKG_RELEASE:=$(AUTORELEASE)
|
PKG_RELEASE:=$(AUTORELEASE)
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
|
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
|
||||||
PKG_HASH:=72a2e53774cac9e65f7b617deebb2059f87e8960d6e9713e4d788cea966f1b36
|
PKG_HASH:=210fa785a52f3763c4287fd5ae63e246f6311bfaa48c424baab6d383bb7591d4
|
||||||
PKG_BUILD_PARALLEL:=1
|
PKG_BUILD_PARALLEL:=1
|
||||||
PKG_BUILD_DEPENDS:=iptables
|
PKG_BUILD_DEPENDS:=iptables
|
||||||
PKG_LICENSE:=GPL-2.0
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -39,7 +39,8 @@ int main(int argc, char **argv) {
|
@@ -34,7 +34,8 @@ int main(int argc, char **argv) {
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -367,7 +367,7 @@ check_selinux()
|
@@ -387,7 +387,7 @@ check_selinux()
|
||||||
|
|
||||||
check_mnl()
|
check_mnl()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -235,7 +235,7 @@ EOF
|
@@ -255,7 +255,7 @@ EOF
|
||||||
|
|
||||||
check_elf()
|
check_elf()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -425,7 +425,7 @@ EOF
|
@@ -445,7 +445,7 @@ EOF
|
||||||
|
|
||||||
check_cap()
|
check_cap()
|
||||||
{
|
{
|
||||||
|
|
|
@ -30,11 +30,11 @@
|
||||||
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
|
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
|
||||||
" ip [ -force ] -batch filename\n"
|
" ip [ -force ] -batch filename\n"
|
||||||
+#ifndef IPROUTE2_TINY
|
+#ifndef IPROUTE2_TINY
|
||||||
"where OBJECT := { address | addrlabel | fou | help | ila | l2tp | link |\n"
|
"where OBJECT := { address | addrlabel | fou | help | ila | l2tp | link |\n"
|
||||||
" macsec | maddress | monitor | mptcp | mroute | mrule |\n"
|
" macsec | maddress | monitor | mptcp | mroute | mrule |\n"
|
||||||
" neighbor | neighbour | netconf | netns | nexthop | ntable |\n"
|
" neighbor | neighbour | netconf | netns | nexthop | ntable |\n"
|
||||||
" ntbl | route | rule | sr | tap | tcpmetrics |\n"
|
" ntbl | route | rule | sr | tap | tcpmetrics |\n"
|
||||||
" token | tunnel | tuntap | vrf | xfrm }\n"
|
" token | tunnel | tuntap | vrf | xfrm }\n"
|
||||||
+#else
|
+#else
|
||||||
+ "where OBJECT := { address | ila | link | macsec | maddress | monitor |\n"
|
+ "where OBJECT := { address | ila | link | macsec | maddress | monitor |\n"
|
||||||
+ " mroute | mrule | neighbor | neighbour | netns | route |\n"
|
+ " mroute | mrule | neighbor | neighbour | netns | route |\n"
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
|
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
|
||||||
" -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
|
" -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
|
||||||
" -f[amily] { inet | inet6 | mpls | bridge | link } |\n"
|
" -f[amily] { inet | inet6 | mpls | bridge | link } |\n"
|
||||||
@@ -90,36 +96,50 @@ static const struct cmd {
|
@@ -91,36 +97,50 @@ static const struct cmd {
|
||||||
int (*func)(int argc, char **argv);
|
int (*func)(int argc, char **argv);
|
||||||
} cmds[] = {
|
} cmds[] = {
|
||||||
{ "address", do_ipaddr },
|
{ "address", do_ipaddr },
|
||||||
|
|
|
@ -31,7 +31,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
|
||||||
if (!end || end == arg || *end || res > 255)
|
if (!end || end == arg || *end || res > 255)
|
||||||
--- a/include/uapi/linux/rtnetlink.h
|
--- a/include/uapi/linux/rtnetlink.h
|
||||||
+++ b/include/uapi/linux/rtnetlink.h
|
+++ b/include/uapi/linux/rtnetlink.h
|
||||||
@@ -249,6 +249,7 @@ enum {
|
@@ -256,6 +256,7 @@ enum {
|
||||||
RTN_THROW, /* Not in this table */
|
RTN_THROW, /* Not in this table */
|
||||||
RTN_NAT, /* Translate this address */
|
RTN_NAT, /* Translate this address */
|
||||||
RTN_XRESOLVE, /* Use external resolver */
|
RTN_XRESOLVE, /* Use external resolver */
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -259,7 +259,7 @@ int main(int argc, char **argv) {
|
@@ -279,7 +279,7 @@ int main(int argc, char **argv) {
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
local ret=$?
|
local ret=$?
|
||||||
|
|
||||||
rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test
|
rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test
|
||||||
@@ -277,7 +277,7 @@ int main(int argc, char **argv) {
|
@@ -297,7 +297,7 @@ int main(int argc, char **argv) {
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -411,14 +411,8 @@ EOF
|
@@ -431,14 +431,8 @@ EOF
|
||||||
if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
|
if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
|
||||||
echo "no"
|
echo "no"
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -354,7 +354,7 @@ check_libbpf()
|
@@ -374,7 +374,7 @@ check_libbpf()
|
||||||
check_selinux()
|
check_selinux()
|
||||||
# SELinux is a compile time option in the ss utility
|
# SELinux is a compile time option in the ss utility
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue