Browse Source

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

master
artoo 1 month 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 @@
3 3
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
4 4
 
5 5
 pkgname=iproute2
6
-pkgver=5.0.0
6
+pkgver=5.1.0
7 7
 pkgrel=1
8 8
 pkgdesc='IP Routing Utilities'
9 9
 arch=('x86_64')
@@ -24,7 +24,7 @@ options=('staticlibs')
24 24
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
25 25
 source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
26 26
         '0001-make-iproute2-fhs-compliant.patch')
27
-sha256sums=('df047302a39650ef832c07e8dab5df7a23218cd398bd310c8628e386161d20ba'
27
+sha256sums=('dc5a980873eabf6b00c0be976b6e5562b1400d47d1d07d2ac35d5e5acbcf7bcf'
28 28
             'SKIP'
29 29
             'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')
30 30
 

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

@@ -1,101 +0,0 @@
1
-From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
2
-From: Christian Hesse <mail@eworm.de>
3
-Date: Thu, 28 Jul 2016 08:49:20 +0200
4
-Subject: [PATCH 1/1] make iproute2 fhs compliant
5
-
6
-Signed-off-by: Christian Hesse <mail@eworm.de>
7
----
8
- Makefile       |  2 +-
9
- netem/Makefile |  4 ++--
10
- tc/q_netem.c   |  2 +-
11
- tc/tc_util.c   | 15 +++++++++++++++
12
- tc/tc_util.h   |  1 +
13
- 5 files changed, 20 insertions(+), 4 deletions(-)
14
-
15
-diff --git a/Makefile b/Makefile
16
-index eb571a5..db0a04c 100644
17
---- a/Makefile
18
-+++ b/Makefile
19
-@@ -14,7 +14,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include
20
- 
21
- SHARED_LIBS = y
22
- 
23
--DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
24
-+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DDATADIR=\"$(DATADIR)\"
25
- ifneq ($(SHARED_LIBS),y)
26
- DEFINES+= -DNO_SHARED_LIBS
27
- endif
28
-diff --git a/netem/Makefile b/netem/Makefile
29
-index e52e125..5b4d283 100644
30
---- a/netem/Makefile
31
-+++ b/netem/Makefile
32
-@@ -20,9 +20,9 @@ stats: stats.c
33
- 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
34
- 
35
- install: all
36
--	mkdir -p $(DESTDIR)$(LIBDIR)/tc
37
-+	mkdir -p $(DESTDIR)$(DATADIR)/tc
38
- 	for i in $(DISTDATA); \
39
--	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
40
-+	do install -m 644 $$i $(DESTDIR)$(DATADIR)/tc; \
41
- 	done
42
- 
43
- clean:
44
-diff --git a/tc/q_netem.c b/tc/q_netem.c
45
-index 8fe2204..a15a5c7 100644
46
---- a/tc/q_netem.c
47
-+++ b/tc/q_netem.c
48
-@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata)
49
- 	char *line = NULL;
50
- 	char name[128];
51
- 
52
--	snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type);
53
-+	snprintf(name, sizeof(name), "%s/%s.dist", get_tc_datadir(), type);
54
- 	if ((f = fopen(name, "r")) == NULL) {
55
- 		fprintf(stderr, "No distribution data for %s (%s: %s)\n",
56
- 			type, name, strerror(errno));
57
-diff --git a/tc/tc_util.c b/tc/tc_util.c
58
-index afc4cf5..728b854 100644
59
---- a/tc/tc_util.c
60
-+++ b/tc/tc_util.c
61
-@@ -32,6 +32,10 @@
62
- #define LIBDIR "/usr/lib"
63
- #endif
64
- 
65
-+#ifndef DATADIR
66
-+#define DATADIR "/usr/share"
67
-+#endif
68
-+
69
- static struct db_names *cls_names;
70
- 
71
- #define NAMES_DB "/etc/iproute2/tc_cls"
72
-@@ -73,6 +77,17 @@ const char *get_tc_lib(void)
73
- 	return lib_dir;
74
- }
75
- 
76
-+const char *get_tc_datadir(void)
77
-+{
78
-+	const char *data_dir;
79
-+
80
-+	data_dir = getenv("TC_DATA_DIR");
81
-+	if (!data_dir)
82
-+		data_dir = DATADIR "/tc/";
83
-+
84
-+	return data_dir;
85
-+}
86
-+
87
- int get_qdisc_handle(__u32 *h, const char *str)
88
- {
89
- 	__u32 maj;
90
-diff --git a/tc/tc_util.h b/tc/tc_util.h
91
-index 61e60b1..6d448de 100644
92
---- a/tc/tc_util.h
93
-+++ b/tc/tc_util.h
94
-@@ -55,6 +55,7 @@ struct exec_util {
95
- };
96
- 
97
- const char *get_tc_lib(void);
98
-+const char *get_tc_datadir(void);
99
- 
100
- struct qdisc_util *get_qdisc_kind(const char *str);
101
- struct filter_util *get_filter_kind(const char *str);

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

@@ -1,58 +0,0 @@
1
-# Maintainer: Christian Hesse <mail@eworm.de>
2
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
3
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
4
-
5
-pkgname=iproute2
6
-pkgver=5.1.0
7
-pkgrel=1
8
-pkgdesc='IP Routing Utilities'
9
-arch=('x86_64')
10
-license=('GPL2')
11
-url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
12
-depends=('glibc' 'iptables' 'libelf')
13
-optdepends=('linux-atm: ATM support')
14
-groups=('base')
15
-provides=('iproute')
16
-backup=('etc/iproute2/ematch_map'
17
-        'etc/iproute2/rt_dsfield'
18
-        'etc/iproute2/rt_protos'
19
-        'etc/iproute2/rt_realms'
20
-        'etc/iproute2/rt_scopes'
21
-        'etc/iproute2/rt_tables')
22
-makedepends=('linux-atm')
23
-options=('staticlibs')
24
-validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
25
-source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
26
-        '0001-make-iproute2-fhs-compliant.patch')
27
-sha256sums=('dc5a980873eabf6b00c0be976b6e5562b1400d47d1d07d2ac35d5e5acbcf7bcf'
28
-            'SKIP'
29
-            'f60fefe4c17d3b768824bb50ae6416292bcebba06d73452e23f4147b46b827d3')
30
-
31
-prepare() {
32
-  cd "${srcdir}/${pkgname}-${pkgver}"
33
-
34
-  # set correct fhs structure
35
-  patch -Np1 -i "${srcdir}/0001-make-iproute2-fhs-compliant.patch"
36
-
37
-  # do not treat warnings as errors
38
-  sed -i 's/-Werror//' Makefile
39
-
40
-}
41
-
42
-build() {
43
-  cd "${srcdir}/${pkgname}-${pkgver}"
44
-
45
-  ./configure
46
-  make
47
-}
48
-
49
-package() {
50
-  cd "${srcdir}/${pkgname}-${pkgver}"
51
-
52
-  make DESTDIR="${pkgdir}" SBINDIR="/usr/bin" install
53
-
54
-  # libnetlink isn't installed, install it FS#19385
55
-  install -Dm0644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
56
-  install -Dm0644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
57
-}
58
-

Loading…
Cancel
Save