[arch-commits] Commit in iproute2/repos (6 files)
Date: Tuesday, September 5, 2017 @ 18:01:55
Author: eworm
Revision: 304702
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 304701, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 304701, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 304701, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 304701, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 101
testing-i686/PKGBUILD | 82
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
testing-x86_64/PKGBUILD | 82
4 files changed, 366 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 304701, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2017-09-05 18:01:55 UTC
(rev 304702)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 304701,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-09-05 18:01:55 UTC (rev 304702)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Christian Hesse
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgbase=iproute2
+pkgname=(iproute2 iproute2-doc)
+pkgver=4.13.0
+pkgrel=1
+pkgdesc='IP Routing Utilities'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.linuxfoundation.org/collaborate/workgroups/n
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, July 10, 2017 @ 13:13:40
Author: eworm
Revision: 300020
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 300019, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 300019, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 300019, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 300019, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 101
testing-i686/PKGBUILD | 82
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
testing-x86_64/PKGBUILD | 82
4 files changed, 366 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 300019, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2017-07-10 13:13:40 UTC
(rev 300020)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 300019,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-07-10 13:13:40 UTC (rev 300020)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Christian Hesse
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgbase=iproute2
+pkgname=(iproute2 iproute2-doc)
+pkgver=4.12.0
+pkgrel=2
+pkgdesc='IP Routing Utilities'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.linuxfoundation.org/collaborate/workgroups/networ
[arch-commits] Commit in iproute2/repos (6 files)
Date: Wednesday, July 5, 2017 @ 17:44:36
Author: eworm
Revision: 299704
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 299703, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 299703, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 299703, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 299703, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 101
testing-i686/PKGBUILD | 82
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
testing-x86_64/PKGBUILD | 82
4 files changed, 366 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 299703, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2017-07-05 17:44:36 UTC
(rev 299704)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 299703,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-07-05 17:44:36 UTC (rev 299704)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Christian Hesse
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgbase=iproute2
+pkgname=(iproute2 iproute2-doc)
+pkgver=4.12.0
+pkgrel=1
+pkgdesc='IP Routing Utilities'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.linuxfoundation.org/collaborate/workgroups/netw
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, May 1, 2017 @ 18:23:52
Author: eworm
Revision: 295134
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 295133, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 295133, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 295133, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 295133, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 101
testing-i686/PKGBUILD | 82
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
testing-x86_64/PKGBUILD | 82
4 files changed, 366 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 295133, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2017-05-01 18:23:52 UTC
(rev 295134)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 295133,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-05-01 18:23:52 UTC (rev 295134)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Christian Hesse
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgbase=iproute2
+pkgname=(iproute2 iproute2-doc)
+pkgver=4.11.0
+pkgrel=1
+pkgdesc='IP Routing Utilities'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.linuxfoundation.org/collaborate/workgroups/networki
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, March 27, 2017 @ 18:06:00
Author: eworm
Revision: 291733
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
iproute2/repos/staging-i686/
iproute2/repos/staging-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 291732, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/staging-i686/PKGBUILD
(from rev 291732, iproute2/trunk/PKGBUILD)
iproute2/repos/staging-x86_64/
iproute2/repos/staging-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 291732, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/staging-x86_64/PKGBUILD
(from rev 291732, iproute2/trunk/PKGBUILD)
---+
staging-i686/0001-make-iproute2-fhs-compliant.patch | 101
staging-i686/PKGBUILD | 82
staging-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
staging-x86_64/PKGBUILD | 82
4 files changed, 366 insertions(+)
Copied: iproute2/repos/staging-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 291732, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- staging-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ staging-i686/0001-make-iproute2-fhs-compliant.patch 2017-03-27 18:06:00 UTC
(rev 291733)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/staging-i686/PKGBUILD (from rev 291732,
iproute2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2017-03-27 18:06:00 UTC (rev 291733)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Christian Hesse
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgbase=iproute2
+pkgname=(iproute2 iproute2-doc)
+pkgver=4.10.0
+pkgrel=3
+pkgdesc='IP Routing Utilities'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.linuxfoundation.org/collaborate/workgroups/netwo
[arch-commits] Commit in iproute2/repos (6 files)
Date: Saturday, February 25, 2017 @ 18:43:54
Author: eworm
Revision: 289542
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 289541, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 289541, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 289541, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 289541, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 101
testing-i686/PKGBUILD | 82
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
testing-x86_64/PKGBUILD | 82
4 files changed, 366 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 289541, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2017-02-25 18:43:54 UTC
(rev 289542)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 289541,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-02-25 18:43:54 UTC (rev 289542)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Christian Hesse
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgbase=iproute2
+pkgname=(iproute2 iproute2-doc)
+pkgver=4.10.0
+pkgrel=2
+pkgdesc='IP Routing Utilities'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.linuxfoundation.org/collaborate/workgroups/
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, February 20, 2017 @ 18:37:32
Author: eworm
Revision: 289325
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 289324, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 289324, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 289324, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 289324, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 101
testing-i686/PKGBUILD | 82
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
testing-x86_64/PKGBUILD | 82
4 files changed, 366 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 289324, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2017-02-20 18:37:32 UTC
(rev 289325)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 289324,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-02-20 18:37:32 UTC (rev 289325)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Christian Hesse
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgbase=iproute2
+pkgname=(iproute2 iproute2-doc)
+pkgver=4.10.0
+pkgrel=1
+pkgdesc='IP Routing Utilities'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.linuxfoundation.org/collaborate/workgroups/ne
[arch-commits] Commit in iproute2/repos (6 files)
Date: Tuesday, December 13, 2016 @ 07:58:36
Author: eworm
Revision: 283098
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 283097, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 283097, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 283097, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 283097, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 101
testing-i686/PKGBUILD | 82
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
testing-x86_64/PKGBUILD | 82
4 files changed, 366 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 283097, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2016-12-13 07:58:36 UTC
(rev 283098)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 283097,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-12-13 07:58:36 UTC (rev 283098)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Christian Hesse
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgbase=iproute2
+pkgname=(iproute2 iproute2-doc)
+pkgver=4.9.0
+pkgrel=1
+pkgdesc='IP Routing Utilities'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.linuxfoundation.org/collaborate/workgroups/ne
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, October 10, 2016 @ 06:24:15
Author: eworm
Revision: 278142
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 278141, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 278141, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 278141, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 278141, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 101
testing-i686/PKGBUILD | 78
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
testing-x86_64/PKGBUILD | 78
4 files changed, 358 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 278141, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2016-10-10 06:24:15 UTC
(rev 278142)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 278141,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-10-10 06:24:15 UTC (rev 278142)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgbase=iproute2
+pkgname=(iproute2 iproute2-doc)
+pkgver=4.8.0
+pkgrel=1
+pkgdesc='IP Routing Utilities'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2'
+makedepends=('
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, August 8, 2016 @ 19:18:21
Author: eworm
Revision: 273512
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 273511, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 273511, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 273511, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 273511, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 101
testing-i686/PKGBUILD | 60 +
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 101
testing-x86_64/PKGBUILD | 60 +
4 files changed, 322 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 273511, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2016-08-08 19:18:21 UTC
(rev 273512)
@@ -0,0 +1,101 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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);
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 273511,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-08-08 19:18:21 UTC (rev 273512)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=4.7.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'iptables')
+makedepends=('linux-atm'
[arch-commits] Commit in iproute2/repos (6 files)
Date: Thursday, July 28, 2016 @ 06:58:41
Author: eworm
Revision: 272537
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 272536, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-i686/PKGBUILD
(from rev 272536, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 272536, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 272536, iproute2/trunk/PKGBUILD)
---+
testing-i686/0001-make-iproute2-fhs-compliant.patch | 104
testing-i686/PKGBUILD | 60 +
testing-x86_64/0001-make-iproute2-fhs-compliant.patch | 104
testing-x86_64/PKGBUILD | 60 +
4 files changed, 328 insertions(+)
Copied: iproute2/repos/testing-i686/0001-make-iproute2-fhs-compliant.patch
(from rev 272536, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- testing-i686/0001-make-iproute2-fhs-compliant.patch
(rev 0)
+++ testing-i686/0001-make-iproute2-fhs-compliant.patch 2016-07-28 06:58:41 UTC
(rev 272537)
@@ -0,0 +1,104 @@
+From f0624f6cc656cb177b64e2664f2a806221bfab58 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Thu, 28 Jul 2016 08:49:20 +0200
+Subject: [PATCH 1/1] make iproute2 fhs compliant
+
+Signed-off-by: Christian Hesse
+---
+ 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
+
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 272536,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-07-28 06:58:41 UTC (rev 272537)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=4.6.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('g
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, March 14, 2016 @ 13:45:12
Author: bpiotrowski
Revision: 261452
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
iproute2/repos/staging-i686/
iproute2/repos/staging-i686/PKGBUILD
(from rev 261451, iproute2/trunk/PKGBUILD)
iproute2/repos/staging-i686/iproute2-fhs.patch
(from rev 261451, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/staging-x86_64/
iproute2/repos/staging-x86_64/PKGBUILD
(from rev 261451, iproute2/trunk/PKGBUILD)
iproute2/repos/staging-x86_64/iproute2-fhs.patch
(from rev 261451, iproute2/trunk/iproute2-fhs.patch)
---+
staging-i686/PKGBUILD | 60
staging-i686/iproute2-fhs.patch | 87
staging-x86_64/PKGBUILD | 60
staging-x86_64/iproute2-fhs.patch | 87
4 files changed, 294 insertions(+)
Copied: iproute2/repos/staging-i686/PKGBUILD (from rev 261451,
iproute2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-03-14 12:45:12 UTC (rev 261452)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=4.4.0
+pkgrel=2
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('staticlibs' '!makeflags')
+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')
+validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
+source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
+iproute2-fhs.patch)
+sha1sums=('68372be70c5c0503196d03913f4b1e201956d1b6'
+ 'SKIP'
+ '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # set correct fhs structure
+ patch -Np1 -i "${srcdir}/iproute2-fhs.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}" install
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
+
+ # move binaries
+ cd "${pkgdir}"
+ mv sbin usr/bin
+
+}
Copied: iproute2/repos/staging-i686/iproute2-fhs.patch (from rev 261451,
iproute2/trunk/iproute2-fhs.patch)
===
--- staging-i686/iproute2-fhs.patch (rev 0)
+++ staging-i686/iproute2-fhs.patch 2016-03-14 12:45:12 UTC (rev 261452)
@@ -0,0 +1,87 @@
+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
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, March 14, 2016 @ 12:04:08
Author: bpiotrowski
Revision: 261436
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 261435, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 261435, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 261435, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 261435, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 60
testing-i686/iproute2-fhs.patch | 87
testing-x86_64/PKGBUILD | 60
testing-x86_64/iproute2-fhs.patch | 87
4 files changed, 294 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 261435,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-03-14 11:04:08 UTC (rev 261436)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=4.4.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('staticlibs' '!makeflags')
+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')
+validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
+source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
+iproute2-fhs.patch)
+sha1sums=('68372be70c5c0503196d03913f4b1e201956d1b6'
+ 'SKIP'
+ '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # set correct fhs structure
+ patch -Np1 -i "${srcdir}/iproute2-fhs.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}" install
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
+
+ # move binaries
+ cd "${pkgdir}"
+ mv sbin usr/bin
+
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 261435,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2016-03-14 11:04:08 UTC (rev 261436)
@@ -0,0 +1,87 @@
+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
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, August 5, 2013 @ 15:23:54
Author: bpiotrowski
Revision: 192053
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
iproute2/repos/staging-i686/
iproute2/repos/staging-i686/PKGBUILD
(from rev 192052, iproute2/trunk/PKGBUILD)
iproute2/repos/staging-i686/iproute2-fhs.patch
(from rev 192052, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/staging-x86_64/
iproute2/repos/staging-x86_64/PKGBUILD
(from rev 192052, iproute2/trunk/PKGBUILD)
iproute2/repos/staging-x86_64/iproute2-fhs.patch
(from rev 192052, iproute2/trunk/iproute2-fhs.patch)
---+
staging-i686/PKGBUILD | 56 ++
staging-i686/iproute2-fhs.patch | 75
staging-x86_64/PKGBUILD | 56 ++
staging-x86_64/iproute2-fhs.patch | 75
4 files changed, 262 insertions(+)
Copied: iproute2/repos/staging-i686/PKGBUILD (from rev 192052,
iproute2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-08-05 13:23:54 UTC (rev 192053)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.10.0
+pkgrel=2
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+iproute2-fhs.patch)
+sha1sums=('e94b5dc9dc586006b272f67134ec07f6fbc81bd7'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.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" install
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+
+ # usrmove
+ cd "$pkgdir"
+ mv usr/sbin usr/bin
+}
Copied: iproute2/repos/staging-i686/iproute2-fhs.patch (from rev 192052,
iproute2/trunk/iproute2-fhs.patch)
===
--- staging-i686/iproute2-fhs.patch (rev 0)
+++ staging-i686/iproute2-fhs.patch 2013-08-05 13:23:54 UTC (rev 192053)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
+
+ clean:
+ rm -f $(TCOBJ) $(TCLIB) libtc.a tc
[arch-commits] Commit in iproute2/repos (6 files)
Date: Wednesday, July 31, 2013 @ 19:31:23
Author: bpiotrowski
Revision: 191869
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 191868, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 191868, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 191868, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 191868, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 56 ++
testing-i686/iproute2-fhs.patch | 75
testing-x86_64/PKGBUILD | 56 ++
testing-x86_64/iproute2-fhs.patch | 75
4 files changed, 262 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 191868,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-07-31 17:31:23 UTC (rev 191869)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.10.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+iproute2-fhs.patch)
+sha1sums=('e94b5dc9dc586006b272f67134ec07f6fbc81bd7'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.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" install
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+
+ # usrmove
+ cd "$pkgdir"
+ mv usr/sbin usr/bin
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 191868,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2013-07-31 17:31:23 UTC (rev 191869)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
+
+ clean:
+ rm -f $(TCOBJ) $(TCLIB) libtc.a
[arch-commits] Commit in iproute2/repos (6 files)
Date: Thursday, May 30, 2013 @ 16:24:32
Author: tomegun
Revision: 186696
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
iproute2/repos/staging-i686/
iproute2/repos/staging-i686/PKGBUILD
(from rev 186695, iproute2/trunk/PKGBUILD)
iproute2/repos/staging-i686/iproute2-fhs.patch
(from rev 186695, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/staging-x86_64/
iproute2/repos/staging-x86_64/PKGBUILD
(from rev 186695, iproute2/trunk/PKGBUILD)
iproute2/repos/staging-x86_64/iproute2-fhs.patch
(from rev 186695, iproute2/trunk/iproute2-fhs.patch)
---+
staging-i686/PKGBUILD | 56 ++
staging-i686/iproute2-fhs.patch | 75
staging-x86_64/PKGBUILD | 56 ++
staging-x86_64/iproute2-fhs.patch | 75
4 files changed, 262 insertions(+)
Copied: iproute2/repos/staging-i686/PKGBUILD (from rev 186695,
iproute2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-05-30 14:24:32 UTC (rev 186696)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.9.0
+pkgrel=2
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('3f48a6d3019f1766f26cda6c4de5d3858837d92b'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.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" install
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+
+ # usrmove
+ cd "$pkgdir"
+ mv usr/sbin usr/bin
+}
Copied: iproute2/repos/staging-i686/iproute2-fhs.patch (from rev 186695,
iproute2/trunk/iproute2-fhs.patch)
===
--- staging-i686/iproute2-fhs.patch (rev 0)
+++ staging-i686/iproute2-fhs.patch 2013-05-30 14:24:32 UTC (rev 186696)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
+
+ clean:
+ rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.s
[arch-commits] Commit in iproute2/repos (6 files)
Date: Saturday, May 4, 2013 @ 13:24:14
Author: foutrelis
Revision: 184225
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 184224, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 184224, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 184224, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 184224, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 57 +++
testing-i686/iproute2-fhs.patch | 75
testing-x86_64/PKGBUILD | 57 +++
testing-x86_64/iproute2-fhs.patch | 75
4 files changed, 264 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 184224,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-05-04 11:24:14 UTC (rev 184225)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.9.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('3f48a6d3019f1766f26cda6c4de5d3858837d92b'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.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" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 184224,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2013-05-04 11:24:14 UTC (rev 184225)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_x
[arch-commits] Commit in iproute2/repos (6 files)
Date: Tuesday, March 12, 2013 @ 16:33:08
Author: foutrelis
Revision: 179931
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 179930, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 179930, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 179930, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 179930, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 51
testing-i686/iproute2-fhs.patch | 75
testing-x86_64/PKGBUILD | 51
testing-x86_64/iproute2-fhs.patch | 75
4 files changed, 252 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 179930,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-03-12 15:33:08 UTC (rev 179931)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.8.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('6d40dd2b91aad9ae084c99973dcdfdbf6fb353fc'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 179930,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2013-03-12 15:33:08 UTC (rev 179931)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
+
+ clean:
+
[arch-commits] Commit in iproute2/repos (6 files)
Date: Wednesday, January 30, 2013 @ 21:19:47
Author: ronald
Revision: 176350
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 176349, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 176349, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 176349, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 176349, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 51
testing-i686/iproute2-fhs.patch | 75
testing-x86_64/PKGBUILD | 51
testing-x86_64/iproute2-fhs.patch | 75
4 files changed, 252 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 176349,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2013-01-30 20:19:47 UTC (rev 176350)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.7.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+groups=('base')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('9b45ede534fd49d2ec5a7fe0f69e1926ef767a76'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 176349,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2013-01-30 20:19:47 UTC (rev 176350)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
+
+ clean:
+
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, October 15, 2012 @ 14:55:23
Author: ronald
Revision: 168760
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 168759, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 168759, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 168759, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 168759, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 50
testing-i686/iproute2-fhs.patch | 75
testing-x86_64/PKGBUILD | 50
testing-x86_64/iproute2-fhs.patch | 75
4 files changed, 250 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 168759,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-10-15 18:55:23 UTC (rev 168760)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.6.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('6fa16fd2158d0f289ef454cad46555ead1c33c2d'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 168759,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2012-10-15 18:55:23 UTC (rev 168760)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
+
+ clean:
+ rm -f $(TCOBJ) $(
[arch-commits] Commit in iproute2/repos (6 files)
Date: Saturday, August 4, 2012 @ 14:56:16
Author: ronald
Revision: 164765
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 164764, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 164764, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 164764, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 164764, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 50
testing-i686/iproute2-fhs.patch | 75
testing-x86_64/PKGBUILD | 50
testing-x86_64/iproute2-fhs.patch | 75
4 files changed, 250 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 164764,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-08-04 18:56:16 UTC (rev 164765)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.5.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('a78f621a1932315baf7be2f3f1d6e6c5ed62'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 164764,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2012-08-04 18:56:16 UTC (rev 164765)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
+
+ clean:
+ rm -f $(TCOBJ) $(TCLIB) libt
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, June 18, 2012 @ 04:42:44
Author: ronald
Revision: 161999
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 161998, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 161998, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 161998, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 161998, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 50
testing-i686/iproute2-fhs.patch | 74
testing-x86_64/PKGBUILD | 50
testing-x86_64/iproute2-fhs.patch | 74
4 files changed, 248 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 161998,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-06-18 08:42:44 UTC (rev 161999)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('fcea492dea2f3ecf9d35f279e2f1a7ea6ca0d527'
+ '4f2b120f62ba2b725ccddc18943bd590e3287cfb')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 161998,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2012-06-18 08:42:44 UTC (rev 161999)
@@ -0,0 +1,74 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,7 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
+
+ clean:
+ rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.ya
[arch-commits] Commit in iproute2/repos (6 files)
Date: Tuesday, March 20, 2012 @ 16:19:00
Author: ibiru
Revision: 153934
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 153933, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 153933, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 153933, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 153933, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 50 +
testing-i686/iproute2-fhs.patch | 84
testing-x86_64/PKGBUILD | 50 +
testing-x86_64/iproute2-fhs.patch | 84
4 files changed, 268 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 153933,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-03-20 20:19:00 UTC (rev 153934)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.3.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('25307c2418b9d4c6433d61a296f50b886da84b8c'
+ '2416b11252364d7a6c742eabb4a6924a75637a46')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 153933,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2012-03-20 20:19:00 UTC (rev 153934)
@@ -0,0 +1,84 @@
+diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
+--- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100
iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100
+@@ -1,11 +1,12 @@
+ DESTDIR=/usr/
+ ROOTDIR=$(DESTDIR)
+ LIBDIR=/usr/lib/
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ CONFDIR=/etc/iproute2
+-DOCDIR=/share/doc/iproute2
+-MANDIR=/share/man
++DOCDIR=/usr/share/doc/iproute2
++MANDIR=/usr/share/man
+ ARPDDIR=/var/lib/arpd
++SHAREDIR=/usr/share
+
+ # Path to db_185.h include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
+diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
+--- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100
iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib/"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share"
+ #endif
+
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@
+
+ lib_dir = getenv("TC_LIB_DIR");
+ if (!lib_dir)
+- lib_dir = LIBDIR "/tc/";
++ lib_dir = SHAREDIR "/tc/";
+
+ return lib_dir;
+ }
+diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
+--- iproute2.old/netem/Makefile2010-08-06 11:30:48.640940183 +0200
iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
+--- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200
iproute2-2.6.35/tc/Makef
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, January 23, 2012 @ 10:27:38
Author: ibiru
Revision: 147158
db-move: moved iproute2 from [testing] to [core] (x86_64)
Added:
iproute2/repos/core-x86_64/PKGBUILD
(from rev 147156, iproute2/repos/testing-x86_64/PKGBUILD)
iproute2/repos/core-x86_64/fix-ip-l.patch
(from rev 147156, iproute2/repos/testing-x86_64/fix-ip-l.patch)
iproute2/repos/core-x86_64/iproute2-fhs.patch
(from rev 147156, iproute2/repos/testing-x86_64/iproute2-fhs.patch)
Deleted:
iproute2/repos/core-x86_64/PKGBUILD
iproute2/repos/core-x86_64/iproute2-fhs.patch
iproute2/repos/testing-x86_64/
+
PKGBUILD | 106
fix-ip-l.patch | 27
iproute2-fhs.patch | 168 +--
3 files changed, 166 insertions(+), 135 deletions(-)
Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-01-23 15:27:36 UTC (rev 147157)
+++ core-x86_64/PKGBUILD2012-01-23 15:27:38 UTC (rev 147158)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren
-# Contributor: Judd Vinet
-
-pkgname=iproute2
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="IP Routing Utilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.linux-foundation.org/en/Net:Iproute2";
-depends=('glibc' 'db')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-provides=('iproute')
-conflicts=('iproute')
-replaces=('iproute')
-options=('!makeflags')
-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')
-source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
- iproute2-fhs.patch)
-sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
- '2416b11252364d7a6c742eabb4a6924a75637a46')
-
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- # set correct fhs structure
- patch -Np1 -i "$srcdir/iproute2-fhs.patch"
-
- ./configure
-
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- # allow loopback to be started before /usr is mounted, this may not be
supported in the future
- mkdir -p "$pkgdir/sbin"
- mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
- ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
-
- # libnetlink isn't installed, install it FS#19385
- install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
- install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
-}
Copied: iproute2/repos/core-x86_64/PKGBUILD (from rev 147156,
iproute2/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2012-01-23 15:27:38 UTC (rev 147158)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.2.0
+pkgrel=2
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linux-foundation.org/en/Net:Iproute2";
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch
+fix-ip-l.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
+ '2416b11252364d7a6c742eabb4a6924a75637a46'
+ '2ec5513c44f89046438d65e2cda1a014010e3b73')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ #upstream fixes
+ patch -Np1 -i "$srcdir/fix-ip-l.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/core-x86_64/fix-ip-l.patch (from rev 147156,
iproute2/repos/testing-x86_64/fix-ip-l.patch)
===
--- core-x86_64/fix-ip-l.patch (rev 0)
+++ core-x86_64/fix-ip-l.patch 2012-01-23 15:27:38 UTC (rev 147158)
@@ -0,0 +1,27 @@
+From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger
+Date: Fri, 20 Jan 2012 08:16:02 -0800
+Subject: [PATCH] i
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, January 23, 2012 @ 10:27:36
Author: ibiru
Revision: 147157
db-move: moved iproute2 from [testing] to [core] (i686)
Added:
iproute2/repos/core-i686/PKGBUILD
(from rev 147156, iproute2/repos/testing-i686/PKGBUILD)
iproute2/repos/core-i686/fix-ip-l.patch
(from rev 147156, iproute2/repos/testing-i686/fix-ip-l.patch)
iproute2/repos/core-i686/iproute2-fhs.patch
(from rev 147156, iproute2/repos/testing-i686/iproute2-fhs.patch)
Deleted:
iproute2/repos/core-i686/PKGBUILD
iproute2/repos/core-i686/iproute2-fhs.patch
iproute2/repos/testing-i686/
+
PKGBUILD | 106
fix-ip-l.patch | 27
iproute2-fhs.patch | 168 +--
3 files changed, 166 insertions(+), 135 deletions(-)
Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD 2012-01-23 14:30:07 UTC (rev 147156)
+++ core-i686/PKGBUILD 2012-01-23 15:27:36 UTC (rev 147157)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren
-# Contributor: Judd Vinet
-
-pkgname=iproute2
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="IP Routing Utilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.linux-foundation.org/en/Net:Iproute2";
-depends=('glibc' 'db')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-provides=('iproute')
-conflicts=('iproute')
-replaces=('iproute')
-options=('!makeflags')
-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')
-source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
- iproute2-fhs.patch)
-sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
- '2416b11252364d7a6c742eabb4a6924a75637a46')
-
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- # set correct fhs structure
- patch -Np1 -i "$srcdir/iproute2-fhs.patch"
-
- ./configure
-
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- # allow loopback to be started before /usr is mounted, this may not be
supported in the future
- mkdir -p "$pkgdir/sbin"
- mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
- ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
-
- # libnetlink isn't installed, install it FS#19385
- install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
- install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
-}
Copied: iproute2/repos/core-i686/PKGBUILD (from rev 147156,
iproute2/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-01-23 15:27:36 UTC (rev 147157)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.2.0
+pkgrel=2
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linux-foundation.org/en/Net:Iproute2";
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch
+fix-ip-l.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
+ '2416b11252364d7a6c742eabb4a6924a75637a46'
+ '2ec5513c44f89046438d65e2cda1a014010e3b73')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ #upstream fixes
+ patch -Np1 -i "$srcdir/fix-ip-l.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/core-i686/fix-ip-l.patch (from rev 147156,
iproute2/repos/testing-i686/fix-ip-l.patch)
===
--- core-i686/fix-ip-l.patch(rev 0)
+++ core-i686/fix-ip-l.patch2012-01-23 15:27:36 UTC (rev 147157)
@@ -0,0 +1,27 @@
+From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger
+Date: Fri, 20 Jan 2012 08:16:02 -0800
+Subject: [PATCH] ip: make 'ip l' be 'ip link'
+
+Restore compatiablity for those
[arch-commits] Commit in iproute2/repos (6 files)
Date: Monday, January 9, 2012 @ 10:18:24
Author: ibiru
Revision: 146312
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
iproute2/repos/staging-i686/
iproute2/repos/staging-i686/PKGBUILD
(from rev 146311, iproute2/trunk/PKGBUILD)
iproute2/repos/staging-i686/iproute2-fhs.patch
(from rev 146311, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/staging-x86_64/
iproute2/repos/staging-x86_64/PKGBUILD
(from rev 146311, iproute2/trunk/PKGBUILD)
iproute2/repos/staging-x86_64/iproute2-fhs.patch
(from rev 146311, iproute2/trunk/iproute2-fhs.patch)
---+
staging-i686/PKGBUILD | 51 +
staging-i686/iproute2-fhs.patch | 84
staging-x86_64/PKGBUILD | 51 +
staging-x86_64/iproute2-fhs.patch | 84
4 files changed, 270 insertions(+)
Copied: iproute2/repos/staging-i686/PKGBUILD (from rev 146311,
iproute2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-09 15:18:24 UTC (rev 146312)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linux-foundation.org/en/Net:Iproute2";
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
+ '2416b11252364d7a6c742eabb4a6924a75637a46')
+
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # set correct fhs structure
+ patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p "$pkgdir/sbin"
+ mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+ ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+ install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}
Copied: iproute2/repos/staging-i686/iproute2-fhs.patch (from rev 146311,
iproute2/trunk/iproute2-fhs.patch)
===
--- staging-i686/iproute2-fhs.patch (rev 0)
+++ staging-i686/iproute2-fhs.patch 2012-01-09 15:18:24 UTC (rev 146312)
@@ -0,0 +1,84 @@
+diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
+--- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100
iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100
+@@ -1,11 +1,12 @@
+ DESTDIR=/usr/
+ ROOTDIR=$(DESTDIR)
+ LIBDIR=/usr/lib/
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ CONFDIR=/etc/iproute2
+-DOCDIR=/share/doc/iproute2
+-MANDIR=/share/man
++DOCDIR=/usr/share/doc/iproute2
++MANDIR=/usr/share/man
+ ARPDDIR=/var/lib/arpd
++SHAREDIR=/usr/share
+
+ # Path to db_185.h include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
+diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
+--- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100
iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib/"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share"
+ #endif
+
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@
+
+ lib_dir = getenv("TC_LIB_DIR");
+ if (!lib_dir)
+- lib_dir = LIBDIR "/tc/";
++ lib_dir = SHAREDIR "/tc/";
+
+ return lib_dir;
+ }
+diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
+--- iproute2.old/netem/Makefile2010-08-06 11:30:48.640940183 +0200
iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
+--- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200
iproute2-2.6.35/tc/Makefile2010-08-06 11:4
[arch-commits] Commit in iproute2/repos (6 files)
Date: Thursday, November 3, 2011 @ 16:58:44
Author: ronald
Revision: 141994
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iproute2/repos/testing-i686/
iproute2/repos/testing-i686/PKGBUILD
(from rev 141993, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 141993, iproute2/trunk/iproute2-fhs.patch)
iproute2/repos/testing-x86_64/
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 141993, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 141993, iproute2/trunk/iproute2-fhs.patch)
---+
testing-i686/PKGBUILD | 51 +
testing-i686/iproute2-fhs.patch | 84
testing-x86_64/PKGBUILD | 51 +
testing-x86_64/iproute2-fhs.patch | 84
4 files changed, 270 insertions(+)
Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 141993,
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-11-03 20:58:44 UTC (rev 141994)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=2.6.39
+pkgrel=2
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linux-foundation.org/en/Net:Iproute2";
+depends=('perl')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+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')
+source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz
+ 'iproute2-fhs.patch')
+sha1sums=('9044ad0b4a34a377a54197724373330294d743c7'
+ '2416b11252364d7a6c742eabb4a6924a75637a46')
+
+
+build() {
+ cd $srcdir/iproute2-${pkgver}
+
+ # set correct fhs structure
+ patch -Np1 -i ${srcdir}/iproute2-fhs.patch
+
+ ./configure
+
+ make
+}
+
+package() {
+ cd $srcdir/iproute2-${pkgver}
+
+ make DESTDIR=$pkgdir install
+
+ # allow loopback to be started before /usr is mounted, this may not be
supported in the future
+ mkdir -p ${pkgdir}/sbin
+ mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip
+ ln -s /sbin/ip ${pkgdir}/usr/sbin/ip
+
+ # libnetlink isn't installed, install it FS#19385
+ install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
+ install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a
+}
Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 141993,
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2011-11-03 20:58:44 UTC (rev 141994)
@@ -0,0 +1,84 @@
+diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile
+--- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100
iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100
+@@ -1,11 +1,12 @@
+ DESTDIR=/usr/
+ ROOTDIR=$(DESTDIR)
+ LIBDIR=/usr/lib/
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
+ CONFDIR=/etc/iproute2
+-DOCDIR=/share/doc/iproute2
+-MANDIR=/share/man
++DOCDIR=/usr/share/doc/iproute2
++MANDIR=/usr/share/man
+ ARPDDIR=/var/lib/arpd
++SHAREDIR=/usr/share
+
+ # Path to db_185.h include
+ DBM_INCLUDE:=$(ROOTDIR)/usr/include
+diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
+--- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100
iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100
+@@ -24,8 +24,8 @@
+ #include "utils.h"
+ #include "tc_util.h"
+
+-#ifndef LIBDIR
+-#define LIBDIR "/usr/lib/"
++#ifndef SHAREDIR
++#define SHAREDIR "/usr/share"
+ #endif
+
+ const char *get_tc_lib(void)
+@@ -34,7 +34,7 @@
+
+ lib_dir = getenv("TC_LIB_DIR");
+ if (!lib_dir)
+- lib_dir = LIBDIR "/tc/";
++ lib_dir = SHAREDIR "/tc/";
+
+ return lib_dir;
+ }
+diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
+--- iproute2.old/netem/Makefile2010-08-06 11:30:48.640940183 +0200
iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
+--- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200
iproute2-2.6.35/tc/Makefile
