upg iproute2
This commit is contained in:
parent
960d518d29
commit
9cf449086a
3 changed files with 47 additions and 9 deletions
29
iproute2/0003-tc-add-missing-separator.patch
Normal file
29
iproute2/0003-tc-add-missing-separator.patch
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
From 095b223e9b46b07b29875b4ce5110763a7636b8a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christian Hesse <mail@eworm.de>
|
||||||
|
Date: Thu, 23 Feb 2023 11:04:45 +0100
|
||||||
|
Subject: [PATCH 1/1] tc: add missing separator
|
||||||
|
|
||||||
|
This is missing a separator, that was removed in commit
|
||||||
|
010a8388aea11e767ba3a2506728b9ad9760df0e. Let's add it back.
|
||||||
|
|
||||||
|
Signed-off-by: Christian Hesse <mail@eworm.de>
|
||||||
|
---
|
||||||
|
tc/tc_class.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tc/tc_class.c b/tc/tc_class.c
|
||||||
|
index c1feb009..096fa2ec 100644
|
||||||
|
--- a/tc/tc_class.c
|
||||||
|
+++ b/tc/tc_class.c
|
||||||
|
@@ -356,7 +356,7 @@ int print_class(struct nlmsghdr *n, void *arg)
|
||||||
|
print_string(PRINT_ANY, "parent", "parent %s ", abuf);
|
||||||
|
}
|
||||||
|
if (t->tcm_info)
|
||||||
|
- print_0xhex(PRINT_ANY, "leaf", "leaf %x", t->tcm_info>>16);
|
||||||
|
+ print_0xhex(PRINT_ANY, "leaf", "leaf %x: ", t->tcm_info>>16);
|
||||||
|
|
||||||
|
q = get_qdisc_kind(RTA_DATA(tb[TCA_KIND]));
|
||||||
|
if (tb[TCA_OPTIONS]) {
|
||||||
|
--
|
||||||
|
2.39.2
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
## rebuild after any libbpf upgrade ##
|
## rebuild after any libbpf upgrade ##
|
||||||
pkgname=iproute2
|
pkgname=iproute2
|
||||||
pkgver=6.2.0
|
pkgver=6.2.0
|
||||||
pkgrel=01
|
pkgrel=02
|
||||||
pkgdesc='IP Routing Utilities'
|
pkgdesc='IP Routing Utilities'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
|
url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
|
||||||
|
@ -35,9 +35,8 @@ options=('staticlibs')
|
||||||
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
|
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
|
||||||
"sha256sums::https://mirrors.edge.kernel.org/pub/linux/utils/net/$pkgname/sha256sums.asc"
|
"sha256sums::https://mirrors.edge.kernel.org/pub/linux/utils/net/$pkgname/sha256sums.asc"
|
||||||
'0001-make-iproute2-fhs-compliant.patch'
|
'0001-make-iproute2-fhs-compliant.patch'
|
||||||
'0002-bdb-5-3.patch')
|
'0002-bdb-5-3.patch'
|
||||||
# 'bdb5.3.patch'
|
'0003-tc-add-missing-separator.patch')
|
||||||
# 'fix_overlapping_buffers.patch')
|
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
|
@ -48,6 +47,9 @@ prepare() {
|
||||||
# use Berkeley DB 5.3
|
# use Berkeley DB 5.3
|
||||||
patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
|
patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
|
||||||
|
|
||||||
|
# tc: add missing separator
|
||||||
|
patch -Np1 -i "${srcdir}"/0003-tc-add-missing-separator.patch
|
||||||
|
|
||||||
# do not treat warnings as errors
|
# do not treat warnings as errors
|
||||||
sed -i 's/-Werror//' Makefile
|
sed -i 's/-Werror//' Makefile
|
||||||
}
|
}
|
||||||
|
@ -84,7 +86,9 @@ sha256sums=(4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62 #
|
||||||
39fe4931168c6730eb4c63581a60616f39cf8a63e012a8cbd9372fd10c1283d0 # iproute2-6.2.0.tar.sign
|
39fe4931168c6730eb4c63581a60616f39cf8a63e012a8cbd9372fd10c1283d0 # iproute2-6.2.0.tar.sign
|
||||||
05ed581236e4e913c0a80208eeba11d601dca72279317cbf86fb6098a9a962bf # sha256sums
|
05ed581236e4e913c0a80208eeba11d601dca72279317cbf86fb6098a9a962bf # sha256sums
|
||||||
758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d # 0001-make-iproute2-fhs-compliant.patch
|
758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d # 0001-make-iproute2-fhs-compliant.patch
|
||||||
611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6) # 0002-bdb-5-3.patch
|
611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6 # 0002-bdb-5-3.patch
|
||||||
|
4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382) # 0003-tc-add-missing-separator.patch
|
||||||
|
|
||||||
|
## 8198eb79b71b9f3b7ec4fbb7935f28c98192077cc6933ca0e817955480ac0260 iproute2-6.2.0-02-x86_64.pkg.tar.lz
|
||||||
|
|
||||||
## 1c69ff0b8050d20e35ad1fc99cd896f39d9e14e020453fdec5e0d9c701c65c30 iproute2-6.2.0-01-x86_64.pkg.tar.lz
|
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
pkgname=iproute2
|
pkgname=iproute2
|
||||||
pkgver=6.2.0
|
pkgver=6.2.0
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
pkgdesc='IP Routing Utilities'
|
pkgdesc='IP Routing Utilities'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
license=('GPL2')
|
license=('GPL2')
|
||||||
|
@ -29,11 +29,13 @@ options=('staticlibs')
|
||||||
validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
|
validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
|
||||||
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
|
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
|
||||||
'0001-make-iproute2-fhs-compliant.patch'
|
'0001-make-iproute2-fhs-compliant.patch'
|
||||||
'0002-bdb-5-3.patch')
|
'0002-bdb-5-3.patch'
|
||||||
|
'0003-tc-add-missing-separator.patch')
|
||||||
sha256sums=('4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62'
|
sha256sums=('4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d'
|
'758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d'
|
||||||
'611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6')
|
'611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6'
|
||||||
|
'4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
|
@ -44,6 +46,9 @@ prepare() {
|
||||||
# use Berkeley DB 5.3
|
# use Berkeley DB 5.3
|
||||||
patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
|
patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
|
||||||
|
|
||||||
|
# tc: add missing separator
|
||||||
|
patch -Np1 -i "${srcdir}"/0003-tc-add-missing-separator.patch
|
||||||
|
|
||||||
# do not treat warnings as errors
|
# do not treat warnings as errors
|
||||||
sed -i 's/-Werror//' Makefile
|
sed -i 's/-Werror//' Makefile
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue