[arch-commits] Commit in iproute2/repos (4 files)
Date: Monday, January 9, 2012 @ 13:52:27
Author: stephane
Revision: 146338
db-move: moved iproute2 from [staging] to [testing] (i686)
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 146321, iproute2/repos/staging-i686/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 146321, iproute2/repos/staging-i686/iproute2-fhs.patch)
Deleted:
iproute2/repos/staging-i686/
+
PKGBUILD | 51 ++
iproute2-fhs.patch | 84 +++
2 files changed, 135 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 146321,
iproute2/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-09 18:52:27 UTC (rev 146338)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linux-foundation.org/en/Net:Iproute2";
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
+ '2416b11252364d7a6c742eabb4a6924a75637a46')
+
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 146321,
iproute2/repos/staging-i686/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2012-01-09 18:52:27 UTC (rev 146338)
@@ -0,0 +1,84 @@
+diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
+--- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100
iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100
+@@ -1,11 +1,12 @@
+ DESTDIR=/usr/
+ ROOTDIR=$(DESTDIR)
+ LIBDIR=/usr/lib/
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ CONFDIR=/etc/iproute2
+-DOCDIR=/share/doc/iproute2
+-MANDIR=/share/man
++DOCDIR=/usr/share/doc/iproute2
++MANDIR=/usr/share/man
+ ARPDDIR=/var/lib/arpd
++SHAREDIR=/usr/share
+
+ # Path to db_185.h include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
+diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
+--- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100
iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib/"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share"
+ #endif
+
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@
+
+ lib_dir = getenv("TC_LIB_DIR");
+ if (!lib_dir)
+- lib_dir = LIBDIR "/tc/";
++ lib_dir = SHAREDIR "/tc/";
+
+ return lib_dir;
+ }
+diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
+--- iproute2.old/netem/Makefile2010-08-06 11:30:48.640940183 +0200
iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
+--- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200
iproute2-2.6.35/tc/Makefile2010-08-06 11:49:36.977473380 +0200
+@@ -99,18 +99,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
+- install -m 0755 tc $(DESTDIR)$(SBINDIR)
+- for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
+- done
+- if [ ! -f $(MODDESTDIR)/m_ipt.
[arch-commits] Commit in iproute2/repos (4 files)
Date: Monday, January 9, 2012 @ 13:52:29
Author: stephane
Revision: 146339
db-move: moved iproute2 from [staging] to [testing] (x86_64)
Added:
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 146321, iproute2/repos/staging-x86_64/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 146321, iproute2/repos/staging-x86_64/iproute2-fhs.patch)
Deleted:
iproute2/repos/staging-x86_64/
+
PKGBUILD | 51 ++
iproute2-fhs.patch | 84 +++
2 files changed, 135 insertions(+)
Copied: iproute2/repos/testing-x86_64/PKGBUILD (from rev 146321,
iproute2/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-01-09 18:52:29 UTC (rev 146339)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linux-foundation.org/en/Net:Iproute2";
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
+ '2416b11252364d7a6c742eabb4a6924a75637a46')
+
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/testing-x86_64/iproute2-fhs.patch (from rev 146321,
iproute2/repos/staging-x86_64/iproute2-fhs.patch)
===
--- testing-x86_64/iproute2-fhs.patch (rev 0)
+++ testing-x86_64/iproute2-fhs.patch 2012-01-09 18:52:29 UTC (rev 146339)
@@ -0,0 +1,84 @@
+diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
+--- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100
iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100
+@@ -1,11 +1,12 @@
+ DESTDIR=/usr/
+ ROOTDIR=$(DESTDIR)
+ LIBDIR=/usr/lib/
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ CONFDIR=/etc/iproute2
+-DOCDIR=/share/doc/iproute2
+-MANDIR=/share/man
++DOCDIR=/usr/share/doc/iproute2
++MANDIR=/usr/share/man
+ ARPDDIR=/var/lib/arpd
++SHAREDIR=/usr/share
+
+ # Path to db_185.h include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
+diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
+--- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100
iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib/"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share"
+ #endif
+
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@
+
+ lib_dir = getenv("TC_LIB_DIR");
+ if (!lib_dir)
+- lib_dir = LIBDIR "/tc/";
++ lib_dir = SHAREDIR "/tc/";
+
+ return lib_dir;
+ }
+diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
+--- iproute2.old/netem/Makefile2010-08-06 11:30:48.640940183 +0200
iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
+--- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200
iproute2-2.6.35/tc/Makefile2010-08-06 11:49:36.977473380 +0200
+@@ -99,18 +99,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
+- install -m 0755 tc $(DESTDIR)$(SBINDIR)
+- for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
+- done
+- if [ ! -
[arch-commits] Commit in iproute2/repos (4 files)
Date: Saturday, April 12, 2014 @ 21:23:24
Author: ronald
Revision: 210246
archrelease: copy trunk to testing-x86_64
Added:
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 210245, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 210245, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/unwanted-link-help.patch
(from rev 210245, iproute2/trunk/unwanted-link-help.patch)
--+
PKGBUILD | 61
iproute2-fhs.patch | 75 +
unwanted-link-help.patch | 17 ++
3 files changed, 153 insertions(+)
Copied: iproute2/repos/testing-x86_64/PKGBUILD (from rev 210245,
iproute2/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-04-12 19:23:24 UTC (rev 210246)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.14.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('staticlibs' '!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+iproute2-fhs.patch
+ unwanted-link-help.patch)
+sha1sums=('0b7d9db9e17da77a5bd8c2c75f6ddd607449ba3e'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c'
+ '3b1335f4025f657f388fbf4e5a740871e3129c2a')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ # allow operations on links called "h", "he", "hel", "help"
+ patch -Np1 -i "$srcdir/unwanted-link-help.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" install
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+
+ # usrmove
+ cd "$pkgdir"
+ mv usr/sbin usr/bin
+}
Copied: iproute2/repos/testing-x86_64/iproute2-fhs.patch (from rev 210245,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-x86_64/iproute2-fhs.patch (rev 0)
+++ testing-x86_64/iproute2-fhs.patch 2014-04-12 19:23:24 UTC (rev 210246)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
+
+ clean:
+ rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_em
[arch-commits] Commit in iproute2/repos (4 files)
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
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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
+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=11
