Date: Thursday, February 23, 2023 @ 10:29:50
Author: eworm
Revision: 469468
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 469467, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/0002-bdb-5-3.patch
(from rev 469467, iproute2/trunk/0002-bdb-5-3.patch)
iproute2/repos/testing-x86_64/0003-tc-add-missing-separator.patch
(from rev 469467, iproute2/trunk/0003-tc-add-missing-separator.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 469467, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/keys/
----------------------------------------+
0001-make-iproute2-fhs-compliant.patch | 103 +++++++++++++++++++++++++++++++
0002-bdb-5-3.patch | 22 ++++++
0003-tc-add-missing-separator.patch | 29 ++++++++
PKGBUILD | 74 ++++++++++++++++++++++
4 files changed, 228 insertions(+)
Copied: iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 469467, 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 2023-02-23
10:29:50 UTC (rev 469468)
@@ -0,0 +1,103 @@
+From d8d8dd628302f5bde4f55f11137690bf40abaa88 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <[email protected]>
+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 $@ [email protected] -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/0002-bdb-5-3.patch (from rev 469467,
iproute2/trunk/0002-bdb-5-3.patch)
===================================================================
--- testing-x86_64/0002-bdb-5-3.patch (rev 0)
+++ testing-x86_64/0002-bdb-5-3.patch 2023-02-23 10:29:50 UTC (rev 469468)
@@ -0,0 +1,22 @@
+--- a/configure 2022-12-13 01:08:01.607329918 +0100
++++ b/configure 2022-12-13 01:08:58.083857594 +0100
+@@ -433,7 +433,7 @@
+ return 0;
+ }
+ EOF
+- if $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null
2>&1; then
++ if $CC -I$INCLUDE -I/usr/include/db5.3 -o $TMPDIR/dbtest $TMPDIR/dbtest.c
-ldb-5.3 >/dev/null 2>&1; then
+ echo "HAVE_BERKELEY_DB:=y" >>$CONFIG
+ echo "yes"
+ else
+--- a/misc/Makefile 2022-12-13 12:21:04.709608051 +0100
++++ b/misc/Makefile 2022-12-13 12:21:19.966264418 +0100
+@@ -25,7 +25,7 @@
+ $(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rtacct rtacct.c
$(LDLIBS) -lm
+
+ arpd: arpd.c
+- $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(CPPFLAGS) $(LDFLAGS) -o
arpd arpd.c $(LDLIBS) -ldb
++ $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(CPPFLAGS) $(LDFLAGS) -o
arpd arpd.c $(LDLIBS) -ldb-5.3
+
+ ssfilter.tab.c: ssfilter.y
+ $(QUIET_YACC)$(YACC) -b ssfilter ssfilter.y
Copied: iproute2/repos/testing-x86_64/0003-tc-add-missing-separator.patch (from
rev 469467, iproute2/trunk/0003-tc-add-missing-separator.patch)
===================================================================
--- testing-x86_64/0003-tc-add-missing-separator.patch
(rev 0)
+++ testing-x86_64/0003-tc-add-missing-separator.patch 2023-02-23 10:29:50 UTC
(rev 469468)
@@ -0,0 +1,29 @@
+From 095b223e9b46b07b29875b4ce5110763a7636b8a Mon Sep 17 00:00:00 2001
+From: Christian Hesse <[email protected]>
+Date: Thu, 23 Feb 2023 11:04:45 +0100
+Subject: [PATCH 1/1] tc: add missing separator
+
+This is missing a separator, that was removed in commit
+010a8388aea11e767ba3a2506728b9ad9760df0e. Let's add it back.
+
+Signed-off-by: Christian Hesse <[email protected]>
+---
+ tc/tc_class.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tc/tc_class.c b/tc/tc_class.c
+index c1feb009..096fa2ec 100644
+--- a/tc/tc_class.c
++++ b/tc/tc_class.c
+@@ -356,7 +356,7 @@ int print_class(struct nlmsghdr *n, void *arg)
+ print_string(PRINT_ANY, "parent", "parent %s ", abuf);
+ }
+ if (t->tcm_info)
+- print_0xhex(PRINT_ANY, "leaf", "leaf %x", t->tcm_info>>16);
++ print_0xhex(PRINT_ANY, "leaf", "leaf %x: ", t->tcm_info>>16);
+
+ q = get_qdisc_kind(RTA_DATA(tb[TCA_KIND]));
+ if (tb[TCA_OPTIONS]) {
+--
+2.39.2
+
Copied: iproute2/repos/testing-x86_64/PKGBUILD (from rev 469467,
iproute2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2023-02-23 10:29:50 UTC (rev 469468)
@@ -0,0 +1,74 @@
+# Maintainer: Christian Hesse <[email protected]>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd Vinet <[email protected]>
+
+pkgname=iproute2
+pkgver=6.2.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' 'libcap' 'libelf' 'libbpf')
+makedepends=('db5.3')
+optdepends=('db5.3: userspace arp daemon'
+ 'linux-atm: ATM support'
+ 'python: for routel')
+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')
+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-bdb-5-3.patch'
+ '0003-tc-add-missing-separator.patch')
+sha256sums=('4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62'
+ 'SKIP'
+ '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d'
+ '611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6'
+ '4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # set correct fhs structure
+ patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch
+
+ # use Berkeley DB 5.3
+ patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
+
+ # tc: add missing separator
+ patch -Np1 -i "${srcdir}"/0003-tc-add-missing-separator.patch
+
+ # do not treat warnings as errors
+ sed -i 's/-Werror//' Makefile
+
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ export CFLAGS+=' -ffat-lto-objects'
+
+ ./configure
+ make DBM_INCLUDE='/usr/include/db5.3'
+}
+
+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"
+}
