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

Christian Hesse eworm at archlinux.org
Mon Jan 27 14:16:03 UTC 2020


    Date: Monday, January 27, 2020 @ 14:16:02
  Author: eworm
Revision: 374079

upgpkg: iproute2 5.5.0-1

new upstream release

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

----------------------------------------+
 0002-ss-fix-end-of-line-printing.patch |   39 -------------------------------
 PKGBUILD                               |   15 +++--------
 2 files changed, 5 insertions(+), 49 deletions(-)

Deleted: 0002-ss-fix-end-of-line-printing.patch
===================================================================
--- 0002-ss-fix-end-of-line-printing.patch	2020-01-27 13:36:58 UTC (rev 374078)
+++ 0002-ss-fix-end-of-line-printing.patch	2020-01-27 14:16:02 UTC (rev 374079)
@@ -1,39 +0,0 @@
-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-27 13:36:58 UTC (rev 374078)
+++ PKGBUILD	2020-01-27 14:16:02 UTC (rev 374079)
@@ -3,8 +3,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=iproute2
-pkgver=5.4.0
-pkgrel=2
+pkgver=5.5.0
+pkgrel=1
 pkgdesc='IP Routing Utilities'
 arch=('x86_64')
 license=('GPL2')
@@ -22,12 +22,10 @@
 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'
-        '0002-ss-fix-end-of-line-printing.patch')
-sha256sums=('fe97aa60a0d4c5ac830be18937e18dc3400ca713a33a89ad896ff1e3d46086ae'
+        '0001-make-iproute2-fhs-compliant.patch')
+sha256sums=('bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b'
             'SKIP'
-            'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3'
-            '79cb0378988c7f58c2769a3333bae95b94cbd867c8d88e7331df8f5038d2cc6a')
+            'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -35,9 +33,6 @@
   # set correct fhs structure
   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
 



More information about the arch-commits mailing list