[arch-commits] Commit in iproute2/trunk (2 files)

[Christian Hesse]

    Date: Saturday, January 11, 2020 @ 11:59:08
  Author: eworm
Revision: 373229

upgpkg: iproute2 5.4.0-2

ss: fix end-of-line printing (FS#64994)

Added:
  iproute2/trunk/0002-ss-fix-end-of-line-printing.patch
Modified:
  iproute2/trunk/PKGBUILD

----------------------------------------+
 0002-ss-fix-end-of-line-printing.patch |   39 +++++++++++++++++++++++++++++++
 PKGBUILD                               |   13 +++++++---
 2 files changed, 48 insertions(+), 4 deletions(-)

Added: 0002-ss-fix-end-of-line-printing.patch
===================================================================
--- 0002-ss-fix-end-of-line-printing.patch	                        (rev 0)
+++ 0002-ss-fix-end-of-line-printing.patch	2020-01-11 11:59:08 UTC (rev 373229)
@@ -0,0 +1,39 @@
+From 9eee92a41ae630b2c9e92ae2875ca56801c96b73 Mon Sep 17 00:00:00 2001
+From: Brian Vazquez <brianvv at google.com>
+Date: Wed, 4 Dec 2019 13:32:28 -0800
+Subject: ss: fix end-of-line printing in misc/ss.c
+
+The previous change to ss to show header broke the printing of
+end-of-line for the last entry.
+
+Tested:
+
+diff <(./ss.old -nltp) <(misc/ss -nltp)
+38c38
+< LISTEN   0  128   [::1]:35417  [::]:*  users:(("foo",pid=65254,fd=116))
+\ No newline at end of file
+
+Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
+---
+ misc/ss.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/misc/ss.c b/misc/ss.c
+index c58e5c4d..95f1d37a 100644
+--- a/misc/ss.c
++++ b/misc/ss.c
+@@ -1290,6 +1290,11 @@ static void render(void)
+ 
+ 		token = buf_token_next(token);
+ 	}
++	/* Deal with final end-of-line when the last non-empty field printed
++	 * is not the last field.
++	 */
++	if (line_started)
++		printf("\n");
+ 
+ 	buf_free_all();
+ 	current_field = columns;
+-- 
+cgit 1.2-0.3.lf.el7
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-11 11:57:43 UTC (rev 373228)
+++ PKGBUILD	2020-01-11 11:59:08 UTC (rev 373229)
@@ -4,7 +4,7 @@
 
 pkgname=iproute2
 pkgver=5.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='IP Routing Utilities'
 arch=('x86_64')
 license=('GPL2')
@@ -22,17 +22,22 @@
 options=('staticlibs')
 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')
+        '0001-make-iproute2-fhs-compliant.patch'
+        '0002-ss-fix-end-of-line-printing.patch')
 sha256sums=('fe97aa60a0d4c5ac830be18937e18dc3400ca713a33a89ad896ff1e3d46086ae'
             'SKIP'
-            'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')
+            'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3'
+            '79cb0378988c7f58c2769a3333bae95b94cbd867c8d88e7331df8f5038d2cc6a')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # set correct fhs structure
-  patch -Np1 -i "${srcdir}/0001-make-iproute2-fhs-compliant.patch"
+  patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch
 
+  # ss: fix end-of-line printing
+  patch -Np1 -i "${srcdir}"/0002-ss-fix-end-of-line-printing.patch
+
   # do not treat warnings as errors
   sed -i 's/-Werror//' Makefile