[arch-commits] Commit in iproute2/repos (3 files)
Christian Hesse
eworm at gemini.archlinux.org
Wed Apr 27 21:12:11 UTC 2022
Date: Wednesday, April 27, 2022 @ 21:12:11
Author: eworm
Revision: 444155
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 444154, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 444154, iproute2/trunk/PKGBUILD)
----------------------------------------+
0001-make-iproute2-fhs-compliant.patch | 103 +++++++++++++++++++++++++++++++
PKGBUILD | 64 +++++++++++++++++++
2 files changed, 167 insertions(+)
Copied: iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch (from rev 444154, 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 2022-04-27 21:12:11 UTC (rev 444155)
@@ -0,0 +1,103 @@
+From d8d8dd628302f5bde4f55f11137690bf40abaa88 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
+
+---
+ 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 f6214534..f80f46c9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,7 +32,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 ba4c5a76..cb197afa 100644
+--- a/netem/Makefile
++++ b/netem/Makefile
+@@ -23,9 +23,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 f45a64b9..83fa952d 100644
+--- a/tc/q_netem.c
++++ b/tc/q_netem.c
+@@ -128,7 +128,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);
+ f = fopen(name, "r");
+ if (f == NULL) {
+ fprintf(stderr, "No distribution data for %s (%s: %s)\n",
+diff --git a/tc/tc_util.c b/tc/tc_util.c
+index ba34aed7..0adbb9ba 100644
+--- a/tc/tc_util.c
++++ b/tc/tc_util.c
+@@ -31,6 +31,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"
+@@ -72,6 +76,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 b197bcdd..e812b895 100644
+--- a/tc/tc_util.h
++++ b/tc/tc_util.h
+@@ -71,6 +71,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);
+--
+2.35.1
+
Copied: iproute2/repos/testing-x86_64/PKGBUILD (from rev 444154, iproute2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2022-04-27 21:12:11 UTC (rev 444155)
@@ -0,0 +1,64 @@
+# 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.17.0
+pkgrel=3
+pkgdesc='IP Routing Utilities'
+arch=('x86_64')
+license=('GPL2')
+url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
+depends=('glibc' 'iptables' 'libelf' 'libbpf')
+optdepends=('db: userspace arp daemon'
+ 'libcap: tipc'
+ 'linux-atm: ATM support')
+provides=('iproute')
+backup=('etc/iproute2/bpf_pinning'
+ 'etc/iproute2/ematch_map'
+ 'etc/iproute2/group'
+ 'etc/iproute2/nl_protos'
+ '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' 'debug')
+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')
+sha256sums=('6e384f1b42c75e1a9daac57866da37dcff909090ba86eb25a6e764da7893660e'
+ 'SKIP'
+ '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # set correct fhs structure
+ patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch
+
+ # do not treat warnings as errors
+ sed -i 's/-Werror//' Makefile
+
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ export CFLAGS+=' -ffat-lto-objects'
+
+ ./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