Merge ~smb/ubuntu/+source/iproute2:lp1789431 into ubuntu/+source/iproute2:ubuntu/cosmic-devel

[Stefan Bader]

[Christian Ehrhardt  (paelzer)]

Nice and clean.
Changelog - ack
Patch - ack
Submitted to get rid of it eventually - ack
Patch Headers - ack
Actual problem to be fixed - ack

I can't find anything bad, please go on uploading +1

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/iproute2
 * [new tag] upload/4.18.0-1ubuntu2 -> upload/4.18.0-1ubuntu2

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading iproute2_4.18.0-1ubuntu2.dsc: done.
  Uploading iproute2_4.18.0-1ubuntu2.debian.tar.xz: done.
  Uploading iproute2_4.18.0-1ubuntu2_source.buildinfo: done.
  Uploading iproute2_4.18.0-1ubuntu2_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

Please track migration - hopefully no further issues this time

diff --git a/debian/changelog b/debian/changelog
index 83be82c..9673707 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+iproute2 (4.18.0-1ubuntu2) cosmic; urgency=low
+
+  * d/p/1006-ubuntu-iprule-fix-output.patch
+    Fix destination prefix output of "ip rule show" (LP: #1789431).
+
+ -- Stefan Bader <[e-mail]>  Tue, 28 Aug 2018 16:38:47 +0200
+
 iproute2 (4.18.0-1ubuntu1) cosmic; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/patches/1006-ubuntu-iprule-fix-output.patch b/debian/patches/1006-ubuntu-iprule-fix-output.patch
new file mode 100644
index 0000000..5cb5bd0
--- /dev/null
+++ b/debian/patches/1006-ubuntu-iprule-fix-output.patch
@@ -0,0 +1,31 @@
+Description: 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 <[e-mail]>
+Author: Stefan Bader <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1789431
+Forwarded: yes
+Forward-info: https://marc.info/?l=linux-netdev&m=153546645305223&w=2
+Last-Update: 2018-08-28
+
+Index: iproute2/ip/iprule.c
+===================================================================
+--- iproute2.orig/ip/iprule.c
++++ iproute2/ip/iprule.c
+@@ -239,7 +239,7 @@ int print_rule(const struct sockaddr_nl
+ 
+ 		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
diff --git a/debian/patches/series b/debian/patches/series
index 265cc49..5aa32c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 1001-ubuntu-poc-fan-driver-v3.patch
 1002-ubuntu-poc-fan-driver-vxlan.patch
 1005-ubuntu-fix-testsuite-kenv.patch
+1006-ubuntu-iprule-fix-output.patch