[arch-commits] Commit in iproute2/repos (4 files)
Christian Hesse
eworm at archlinux.org
Sat Jan 11 11:59:22 UTC 2020
Date: Saturday, January 11, 2020 @ 11:59:20
Author: eworm
Revision: 373230
archrelease: copy trunk to testing-x86_64
Added:
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 373229, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/0002-ss-fix-end-of-line-printing.patch
(from rev 373229, iproute2/trunk/0002-ss-fix-end-of-line-printing.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 373229, iproute2/trunk/PKGBUILD)
----------------------------------------+
0001-make-iproute2-fhs-compliant.patch | 101 +++++++++++++++++++++++++++++++
0002-ss-fix-end-of-line-printing.patch | 39 +++++++++++
PKGBUILD | 62 +++++++++++++++++++
3 files changed, 202 insertions(+)
Copied: iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch (from rev 373229, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===================================================================
--- testing-x86_64/0001-make-iproute2-fhs-compliant.patch (rev 0)
+++ testing-x86_64/0001-make-iproute2-fhs-compliant.patch 2020-01-11 11:59:20 UTC (rev 373230)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ Makefile | 2 +-
+ netem/Makefile | 4 ++--
+ tc/q_netem.c | 2 +-
+ tc/tc_util.c | 15 +++++++++++++++
+ tc/tc_util.h | 1 +
+ 5 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index eb571a5..db0a04c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include
+
+ SHARED_LIBS = y
+
+-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DDATADIR=\"$(DATADIR)\"
+ ifneq ($(SHARED_LIBS),y)
+ DEFINES+= -DNO_SHARED_LIBS
+ endif
+diff --git a/netem/Makefile b/netem/Makefile
+index e52e125..5b4d283 100644
+--- a/netem/Makefile
++++ b/netem/Makefile
+@@ -20,9 +20,9 @@ stats: stats.c
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(DATADIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(DATADIR)/tc; \
+ done
+
+ clean:
+diff --git a/tc/q_netem.c b/tc/q_netem.c
+index 8fe2204..a15a5c7 100644
+--- a/tc/q_netem.c
++++ b/tc/q_netem.c
+@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata)
+ char *line = NULL;
+ char name[128];
+
+- snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type);
++ snprintf(name, sizeof(name), "%s/%s.dist", get_tc_datadir(), type);
+ if ((f = fopen(name, "r")) == NULL) {
+ fprintf(stderr, "No distribution data for %s (%s: %s)\n",
+ type, name, strerror(errno));
+diff --git a/tc/tc_util.c b/tc/tc_util.c
+index afc4cf5..728b854 100644
+--- a/tc/tc_util.c
++++ b/tc/tc_util.c
+@@ -32,6 +32,10 @@
+ #define LIBDIR "/usr/lib"
+ #endif
+
++#ifndef DATADIR
++#define DATADIR "/usr/share"
++#endif
++
+ static struct db_names *cls_names;
+
+ #define NAMES_DB "/etc/iproute2/tc_cls"
+@@ -73,6 +77,17 @@ const char *get_tc_lib(void)
+ return lib_dir;
+ }
+
++const char *get_tc_datadir(void)
++{
++ const char *data_dir;
++
++ data_dir = getenv("TC_DATA_DIR");
++ if (!data_dir)
++ data_dir = DATADIR "/tc/";
++
++ return data_dir;
++}
++
+ int get_qdisc_handle(__u32 *h, const char *str)
+ {
+ __u32 maj;
+diff --git a/tc/tc_util.h b/tc/tc_util.h
+index 61e60b1..6d448de 100644
+--- a/tc/tc_util.h
++++ b/tc/tc_util.h
+@@ -55,6 +55,7 @@ struct exec_util {
+ };
+
+ const char *get_tc_lib(void);
++const char *get_tc_datadir(void);
+
+ struct qdisc_util *get_qdisc_kind(const char *str);
+ struct filter_util *get_filter_kind(const char *str);
Copied: iproute2/repos/testing-x86_64/0002-ss-fix-end-of-line-printing.patch (from rev 373229, iproute2/trunk/0002-ss-fix-end-of-line-printing.patch)
===================================================================
--- testing-x86_64/0002-ss-fix-end-of-line-printing.patch (rev 0)
+++ testing-x86_64/0002-ss-fix-end-of-line-printing.patch 2020-01-11 11:59:20 UTC (rev 373230)
@@ -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
+
Copied: iproute2/repos/testing-x86_64/PKGBUILD (from rev 373229, iproute2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2020-01-11 11:59:20 UTC (rev 373230)
@@ -0,0 +1,62 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=iproute2
+pkgver=5.4.0
+pkgrel=2
+pkgdesc='IP Routing Utilities'
+arch=('x86_64')
+license=('GPL2')
+url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
+depends=('glibc' 'iptables' 'libelf')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+backup=('etc/iproute2/ematch_map'
+ 'etc/iproute2/rt_dsfield'
+ 'etc/iproute2/rt_protos'
+ 'etc/iproute2/rt_realms'
+ 'etc/iproute2/rt_scopes'
+ 'etc/iproute2/rt_tables')
+makedepends=('linux-atm')
+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'
+ 'SKIP'
+ 'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3'
+ '79cb0378988c7f58c2769a3333bae95b94cbd867c8d88e7331df8f5038d2cc6a')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # 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
+
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm0644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
+ install -Dm0644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
+}
+
More information about the arch-commits
mailing list