Date: Thursday, February 23, 2023 @ 10:29:47 Author: eworm Revision: 469467
upgpkg: iproute2 6.2.0-2: tc: add missing separator https://lore.kernel.org/netdev/20230223101503.52222-1-list%40eworm.de/T/#u Added: iproute2/trunk/0003-tc-add-missing-separator.patch Modified: iproute2/trunk/PKGBUILD -------------------------------------+ 0003-tc-add-missing-separator.patch | 29 +++++++++++++++++++++++++++++ PKGBUILD | 11 ++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) Added: 0003-tc-add-missing-separator.patch =================================================================== --- 0003-tc-add-missing-separator.patch (rev 0) +++ 0003-tc-add-missing-separator.patch 2023-02-23 10:29:47 UTC (rev 469467) @@ -0,0 +1,29 @@ +From 095b223e9b46b07b29875b4ce5110763a7636b8a Mon Sep 17 00:00:00 2001 +From: Christian Hesse <[email protected]> +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 <[email protected]> +--- + 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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-23 09:35:03 UTC (rev 469466) +++ PKGBUILD 2023-02-23 10:29:47 UTC (rev 469467) @@ -4,7 +4,7 @@ pkgname=iproute2 pkgver=6.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='IP Routing Utilities' arch=('x86_64') license=('GPL2') @@ -29,11 +29,13 @@ validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} '0001-make-iproute2-fhs-compliant.patch' - '0002-bdb-5-3.patch') + '0002-bdb-5-3.patch' + '0003-tc-add-missing-separator.patch') sha256sums=('4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62' 'SKIP' '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d' - '611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6') + '611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6' + '4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -44,6 +46,9 @@ # use Berkeley DB 5.3 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 sed -i 's/-Werror//' Makefile
