[arch-commits] Commit in iproute2/trunk (3 files)
Christian Hesse
eworm at archlinux.org
Thu Jul 28 06:58:38 UTC 2016
Date: Thursday, July 28, 2016 @ 06:58:38
Author: eworm
Revision: 272536
upgpkg: iproute2 4.6.0-1
A "new" upstream release. Probably we will wait for version 4.7.0 to
be moved to [core].
Added:
iproute2/trunk/0001-make-iproute2-fhs-compliant.patch
Modified:
iproute2/trunk/PKGBUILD
Deleted:
iproute2/trunk/iproute2-fhs.patch
----------------------------------------+
0001-make-iproute2-fhs-compliant.patch | 104 +++++++++++++++++++++++++++++++
PKGBUILD | 12 +--
iproute2-fhs.patch | 87 -------------------------
3 files changed, 110 insertions(+), 93 deletions(-)
Added: 0001-make-iproute2-fhs-compliant.patch
===================================================================
--- 0001-make-iproute2-fhs-compliant.patch (rev 0)
+++ 0001-make-iproute2-fhs-compliant.patch 2016-07-28 06:58:38 UTC (rev 272536)
@@ -0,0 +1,104 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 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
+
+Signed-off-by: Christian Hesse <mail at 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 {
+ };
+
+ extern const char *get_tc_lib(void);
++extern const char *get_tc_datadir(void);
+
+ extern struct qdisc_util *get_qdisc_kind(const char *str);
+ extern struct filter_util *get_filter_kind(const char *str);
+--
+2.9.0
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-07-28 06:35:03 UTC (rev 272535)
+++ PKGBUILD 2016-07-28 06:58:38 UTC (rev 272536)
@@ -3,8 +3,8 @@
# Contributor: Judd Vinet <jvinet at zeroflux.org>
pkgname=iproute2
-pkgver=4.5.0
-pkgrel=2
+pkgver=4.6.0
+pkgrel=1
pkgdesc="IP Routing Utilities"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -21,16 +21,16 @@
'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
- iproute2-fhs.patch)
-sha1sums=('f6271aaf9b24b9c465622bea8a29a883034d8d49'
+ '0001-make-iproute2-fhs-compliant.patch')
+sha1sums=('04ad96e2eb21893a987f10b9c8f6cb2945bce56b'
'SKIP'
- '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935')
+ '1d048b8e798af6e0f7dc16576dd5531be3bbbd70')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
# set correct fhs structure
- patch -Np1 -i "${srcdir}/iproute2-fhs.patch"
+ patch -Np1 -i "${srcdir}/0001-make-iproute2-fhs-compliant.patch"
# do not treat warnings as errors
sed -i 's/-Werror//' Makefile
Deleted: iproute2-fhs.patch
===================================================================
--- iproute2-fhs.patch 2016-07-28 06:35:03 UTC (rev 272535)
+++ iproute2-fhs.patch 2016-07-28 06:58:38 UTC (rev 272536)
@@ -1,87 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 67176be..6549447 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,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 cd990a0..7d4e71f 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 aa6de24..22bb6d5 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 = NULL;
-
- #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 {
- };
-
- extern const char *get_tc_lib(void);
-+extern const char *get_tc_datadir(void);
-
- extern struct qdisc_util *get_qdisc_kind(const char *str);
- extern struct filter_util *get_filter_kind(const char *str);
More information about the arch-commits
mailing list