Date: Tuesday, March 22, 2022 @ 19:32:28 Author: eworm Revision: 440578
upgpkg: iproute2 5.17.0-1: new upstream release Modified: iproute2/trunk/0001-make-iproute2-fhs-compliant.patch iproute2/trunk/PKGBUILD ----------------------------------------+ 0001-make-iproute2-fhs-compliant.patch | 32 ++++++++++++++++--------------- PKGBUILD | 6 ++--- 2 files changed, 20 insertions(+), 18 deletions(-) Modified: 0001-make-iproute2-fhs-compliant.patch =================================================================== --- 0001-make-iproute2-fhs-compliant.patch 2022-03-22 16:35:14 UTC (rev 440577) +++ 0001-make-iproute2-fhs-compliant.patch 2022-03-22 19:32:28 UTC (rev 440578) @@ -1,9 +1,8 @@ -From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001 +From d8d8dd628302f5bde4f55f11137690bf40abaa88 Mon Sep 17 00:00:00 2001 From: Christian Hesse <m...@eworm.de> Date: Thu, 28 Jul 2016 08:49:20 +0200 Subject: [PATCH 1/1] make iproute2 fhs compliant -Signed-off-by: Christian Hesse <m...@eworm.de> --- Makefile | 2 +- netem/Makefile | 4 ++-- @@ -13,10 +12,10 @@ 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index eb571a5..db0a04c 100644 +index f6214534..f80f46c9 100644 --- a/Makefile +++ b/Makefile -@@ -14,7 +14,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include +@@ -32,7 +32,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include SHARED_LIBS = y @@ -26,10 +25,10 @@ DEFINES+= -DNO_SHARED_LIBS endif diff --git a/netem/Makefile b/netem/Makefile -index e52e125..5b4d283 100644 +index ba4c5a76..cb197afa 100644 --- a/netem/Makefile +++ b/netem/Makefile -@@ -20,9 +20,9 @@ stats: stats.c +@@ -23,9 +23,9 @@ stats: stats.c $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm install: all @@ -42,23 +41,23 @@ clean: diff --git a/tc/q_netem.c b/tc/q_netem.c -index 8fe2204..a15a5c7 100644 +index f45a64b9..83fa952d 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) +@@ -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); - if ((f = fopen(name, "r")) == NULL) { + f = fopen(name, "r"); + if (f == 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 +index ba34aed7..0adbb9ba 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c -@@ -32,6 +32,10 @@ +@@ -31,6 +31,10 @@ #define LIBDIR "/usr/lib" #endif @@ -69,7 +68,7 @@ static struct db_names *cls_names; #define NAMES_DB "/etc/iproute2/tc_cls" -@@ -73,6 +77,17 @@ const char *get_tc_lib(void) +@@ -72,6 +76,17 @@ const char *get_tc_lib(void) return lib_dir; } @@ -88,10 +87,10 @@ { __u32 maj; diff --git a/tc/tc_util.h b/tc/tc_util.h -index 61e60b1..6d448de 100644 +index b197bcdd..e812b895 100644 --- a/tc/tc_util.h +++ b/tc/tc_util.h -@@ -55,6 +55,7 @@ struct exec_util { +@@ -71,6 +71,7 @@ struct exec_util { }; const char *get_tc_lib(void); @@ -99,3 +98,6 @@ struct qdisc_util *get_qdisc_kind(const char *str); struct filter_util *get_filter_kind(const char *str); +-- +2.35.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-03-22 16:35:14 UTC (rev 440577) +++ PKGBUILD 2022-03-22 19:32:28 UTC (rev 440578) @@ -3,7 +3,7 @@ # Contributor: Judd Vinet <jvi...@zeroflux.org> pkgname=iproute2 -pkgver=5.16.0 +pkgver=5.17.0 pkgrel=1 pkgdesc='IP Routing Utilities' arch=('x86_64') @@ -25,9 +25,9 @@ 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=('c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f' +sha256sums=('6e384f1b42c75e1a9daac57866da37dcff909090ba86eb25a6e764da7893660e' 'SKIP' - 'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3') + '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d') prepare() { cd "${srcdir}/${pkgname}-${pkgver}"