diff --git a/0008-iprule-Fix-destination-prefix-output.patch b/0008-iprule-Fix-destination-prefix-output.patch new file mode 100644 index 0000000..a5b8b83 --- /dev/null +++ b/0008-iprule-Fix-destination-prefix-output.patch @@ -0,0 +1,40 @@ +From b068329d161b5841e9e451fcf542987c3e487e70 Mon Sep 17 00:00:00 2001 +From: Stefan Bader +Date: Tue, 28 Aug 2018 16:27:29 +0200 +Subject: [PATCH] iprule: Fix destination prefix output + +When adding support for JSON output the new code for printing +the destination prefix adds a stray blank character before +the bitmask. This causes some user-space parsing to fail. + +Current output: + ...: from x.x.x.x/l to y.y.y.y /l +Previous output: + ...: from x.x.x.x/l to y.y.y.y/l + +Fixes: 0dd4ccc5 "iprule: add json support" +Signed-off-by: Stefan Bader +Acked-by: Luca Boccassi +Signed-off-by: Stephen Hemminger +(cherry picked from commit 1a75322c5a8dee6e1ed0017d76c87ef85c505b98) +Signed-off-by: Phil Sutter +--- + ip/iprule.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ip/iprule.c b/ip/iprule.c +index 8b9421431c26a..744d6d88e3433 100644 +--- a/ip/iprule.c ++++ b/ip/iprule.c +@@ -239,7 +239,7 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) + + print_string(PRINT_FP, NULL, "to ", NULL); + print_color_string(PRINT_ANY, ifa_family_color(frh->family), +- "dst", "%s ", dst); ++ "dst", "%s", dst); + if (frh->dst_len != host_len) + print_uint(PRINT_ANY, "dstlen", "/%u ", frh->dst_len); + else +-- +2.18.0 + diff --git a/iproute.spec b/iproute.spec index aebcf71..1c37fba 100644 --- a/iproute.spec +++ b/iproute.spec @@ -2,7 +2,7 @@ Summary: Advanced IP routing and network device configuration tools Name: iproute Version: 4.18.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz @@ -21,6 +21,8 @@ Patch4: 0004-bridge-Fix-check-for-colored-output.patch Patch5: 0005-Merge-common-code-for-conditionally-colored-output.patch Patch6: 0006-Make-colored-output-configurable.patch Patch7: 0007-lib-Make-check_enable_color-return-boolean.patch +# Fix for bz#1623488 +Patch8: 0008-iprule-Fix-destination-prefix-output.patch License: GPLv2+ and Public Domain BuildRequires: gcc @@ -167,6 +169,9 @@ rm -rf '%{buildroot}%{_docdir}' %{_includedir}/iproute2/bpf_elf.h %changelog +* Fri Aug 31 2018 Phil Sutter - 4.18.0-4 +- iprule: Fix destination prefix output + * Thu Aug 23 2018 Phil Sutter - 4.18.0-3 - Make colored output configurable