[Lunar-commits] <moonbase-core> Merge branch 'iproute2-3.9' of git://github.com/v4hn/moonbase-core into v4hn-iproute2-3.9

[Stefan Wold]

commit 0d1a3a2d64413f755ef156a8e9d94d3ebe3ddf6c
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Tue, 21 May 2013 00:22:44 -0700
URL: https://github.com/lunar-linux/moonbase-core/commit/0d1a3a2d64413f755ef156a8e9d94d3ebe3ddf6c

Merge branch 'iproute2-3.9' of git://github.com/v4hn/moonbase-core into v4hn-iproute2-3.9

Conflicts:
	net/iproute2/BUILD
	net/iproute2/DETAILS
---
  net/iproute2/BUILD   | +11/-11   
  net/iproute2/DETAILS | +1/-1     
  2 files changed, 12 insertions(+), 12 deletions(-)

--- a/net/iproute2/BUILD
+++ b/net/iproute2/BUILD
@@ -1,14 +1,14 @@
-(
+patch_it $SOURCE2 1 &&
 
-  patch_it $SOURCE2 1 &&
+# fixed in next version
+# http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/commit/?id=824c843556a80cd3b4003d1e9e583cfdf632d0c0
+sedit "s:sizeof(th\.hdr\[i\]):HDR_LINE_LENGTH:" misc/lnstat.c &&
 
-  if ! in_depends $MODULE db; then
-    sedit 's/arpd//' misc/Makefile
-  fi &&
+if ! in_depends $MODULE db; then
+  sedit 's/arpd//' misc/Makefile
+fi &&
 
-  ./configure &&
-  KERNEL_INCLUDE=/usr/include/ make &&
-  prepare_install &&
-  make install
-
-) > $C_FIFO 2>&1
+./configure &&
+KERNEL_INCLUDE=/usr/include/ make &&
+prepare_install &&
+make install
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -8,7 +8,7 @@
      SOURCE2_VFY=sha1:b39063237e7a2c68fcfb731fe5bf5b3177e1b2dc
         WEB_SITE=http://www.linuxfoundation.org/collaborate/workgroups/networking/$MODULE
          ENTERED=20021106
-         UPDATED=20130505
+         UPDATED=20130518
            SHORT="Professional tools to control networking in Linux kernels"
 
 cat << EOF