Browse Source

[testing] -> [core] 'iproute2-5.1.0-1' move

master
artoo 4 months ago
parent
commit
a8f3742a2a
Signed by: artoo <artoo@artixlinux.org> GPG Key ID: 3292CD0BB0DB310B

+ 2
- 2
iproute2/repos/core-x86_64/PKGBUILD View File

@@ -3,7 +3,7 @@
# Contributor: Judd Vinet <jvinet@zeroflux.org>

pkgname=iproute2
pkgver=5.0.0
pkgver=5.1.0
pkgrel=1
pkgdesc='IP Routing Utilities'
arch=('x86_64')
@@ -24,7 +24,7 @@ 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')
sha256sums=('df047302a39650ef832c07e8dab5df7a23218cd398bd310c8628e386161d20ba'
sha256sums=('dc5a980873eabf6b00c0be976b6e5562b1400d47d1d07d2ac35d5e5acbcf7bcf'
'SKIP'
'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')


+ 0
- 101
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch View File

@@ -1,101 +0,0 @@
From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@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@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);

+ 0
- 58
iproute2/repos/testing-x86_64/PKGBUILD View File

@@ -1,58 +0,0 @@
# Maintainer: Christian Hesse <mail@eworm.de>
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>

pkgname=iproute2
pkgver=5.1.0
pkgrel=1
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')
groups=('base')
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')
sha256sums=('dc5a980873eabf6b00c0be976b6e5562b1400d47d1d07d2ac35d5e5acbcf7bcf'
'SKIP'
'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')

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}"

./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"
}


Loading…
Cancel
Save