[arch-commits] Commit in iproute2/repos/testing-x86_64 (4 files)
Date: Monday, November 13, 2017 @ 20:57:43
Author: eworm
Revision: 309882
archrelease: copy trunk to testing-x86_64
Added:
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 309881, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 309881, iproute2/trunk/PKGBUILD)
Deleted:
iproute2/repos/testing-x86_64/0001-make-iproute2-fhs-compliant.patch
iproute2/repos/testing-x86_64/PKGBUILD
+
0001-make-iproute2-fhs-compliant.patch | 202 +++
PKGBUILD | 126 +--
2 files changed, 164 insertions(+), 164 deletions(-)
Deleted: 0001-make-iproute2-fhs-compliant.patch
===
--- 0001-make-iproute2-fhs-compliant.patch 2017-11-13 20:57:38 UTC (rev
309881)
+++ 0001-make-iproute2-fhs-compliant.patch 2017-11-13 20:57:43 UTC (rev
309882)
@@ -1,101 +0,0 @@
-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-x86_64/0001-make-iproute2-fhs-compliant.patch
(from rev 309881, iproute2/trunk/0001-make-iproute2-fhs-compliant.patch)
===
--- 0001-make-iproute2-fhs-compliant.patch (rev 0)
+++ 0001-make-iproute2-fhs-compliant.patch 2017-11-13 20:57:43 UTC (rev
309882)
@@ -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
[arch-commits] Commit in iproute2/repos/testing-x86_64 (4 files)
Date: Monday, June 18, 2012 @ 11:21:48
Author: ronald
Revision: 162009
archrelease: copy trunk to testing-x86_64
Added:
iproute2/repos/testing-x86_64/PKGBUILD
(from rev 162008, iproute2/trunk/PKGBUILD)
iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 162008, iproute2/trunk/iproute2-fhs.patch)
Deleted:
iproute2/repos/testing-x86_64/PKGBUILD
iproute2/repos/testing-x86_64/iproute2-fhs.patch
+
PKGBUILD | 100 +-
iproute2-fhs.patch | 149 +--
2 files changed, 125 insertions(+), 124 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2012-06-18 15:21:07 UTC (rev 162008)
+++ PKGBUILD2012-06-18 15:21:48 UTC (rev 162009)
@@ -1,50 +0,0 @@
-# $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-x86_64/PKGBUILD (from rev 162008,
iproute2/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-06-18 15:21:48 UTC (rev 162009)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ronald van Haren
+# Contributor: Judd Vinet
+
+pkgname=iproute2
+pkgver=3.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' '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'
+ '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"
+}
Deleted: iproute2-fhs.patch
===
--- iproute2-fhs.patch 2012-06-18 15:21:07 UTC (rev 162008)
+++ iproute2-fhs.patch 2012-06-18 15:21:48 UTC (rev 162009)
@@ -1,74 +0,0 @@
-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,
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Monday, July 18, 2011 @ 16:47:32 Author: ronald Revision: 132001 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Saturday, June 4, 2011 @ 18:38:48 Author: tomegun Revision: 126339 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Saturday, June 4, 2011 @ 18:38:34 Author: tomegun Revision: 126338 archrelease: remove testing-x86_64 Deleted: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Thursday, May 5, 2011 @ 04:47:55 Author: ronald Revision: 122632 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Thursday, May 5, 2011 @ 04:47:39 Author: ronald Revision: 122631 archrelease: remove testing-x86_64 Deleted: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Wednesday, May 4, 2011 @ 07:16:04 Author: ronald Revision: 122516 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Saturday, January 22, 2011 @ 13:52:39 Author: ronald Revision: 107232 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Thursday, August 12, 2010 @ 10:15:41 Author: ronald Revision: 87345 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Thursday, August 12, 2010 @ 10:15:26 Author: ronald Revision: 87344 archrelease: remove testing-x86_64 Deleted: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Monday, August 9, 2010 @ 03:51:20 Author: ronald Revision: 87028 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Monday, August 9, 2010 @ 03:50:45 Author: ronald Revision: 87027 archrelease: remove testing-x86_64 Deleted: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Friday, August 6, 2010 @ 05:54:04 Author: ronald Revision: 86872 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Monday, June 14, 2010 @ 02:50:31 Author: ronald Revision: 82593 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Monday, June 14, 2010 @ 02:50:16 Author: ronald Revision: 82592 archrelease: remove testing-x86_64 Deleted: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Friday, June 11, 2010 @ 06:57:36 Author: ronald Revision: 82460 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Thursday, March 4, 2010 @ 16:11:11 Author: ronald Revision: 71151 archrelease: copy trunk to testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Thursday, January 7, 2010 @ 15:41:33 Author: ronald Revision: 62372 Initialized merge tracking via "svnmerge" with revisions "1-62370" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/iproute2/trunk Modified: iproute2/repos/testing-x86_64/(properties) Property changes on: iproute2/repos/testing-x86_64 ___ Added: svnmerge-integrated + /iproute2/trunk:1-62370
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Thursday, January 7, 2010 @ 15:41:21 Author: ronald Revision: 62371 archrelease: new repo testing-x86_64 Added: iproute2/repos/testing-x86_64/
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Wednesday, November 11, 2009 @ 16:32:43 Author: ronald Revision: 58701 Initialized merge tracking via "svnmerge" with revisions "1-58699" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/iproute2/trunk Modified: iproute2/repos/testing-x86_64/(properties) Property changes on: iproute2/repos/testing-x86_64 ___ Added: svnmerge-integrated + /iproute2/trunk:1-58699
[arch-commits] Commit in iproute2/repos (testing-x86_64)
Date: Wednesday, November 11, 2009 @ 16:32:31 Author: ronald Revision: 58700 archrelease: new repo testing-x86_64 Added: iproute2/repos/testing-x86_64/
