[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 315311a9df05b32a831ab2bee9148786e784bd02

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  315311a9df05b32a831ab2bee9148786e784bd02 (commit)
       via  146399757da3982ecbaa256e30f63f826f0a4216 (commit)
      from  30e335226cb5a4b49e1229d6883c95a9dcf1bb8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 315311a9df05b32a831ab2bee9148786e784bd02
Merge: 1463997 30e3352
Author: William Harrington <kb0iic at gmail.com>
Date:   Thu Oct 25 15:15:14 2012 -0500

    Merge branch 'master' of git.cross-lfs.org:cross-lfs


commit 146399757da3982ecbaa256e30f63f826f0a4216
Author: William Harrington <kb0iic at gmail.com>
Date:   Thu Oct 25 15:14:48 2012 -0500

    Update iproute2 patch for good, again.

diff --git a/patches/iproute2-3.4.0-libdir-1.patch b/patches/iproute2-3.4.0-libdir-1.patch
index 89b34bc..4cf3298 100644
--- a/patches/iproute2-3.4.0-libdir-1.patch
+++ b/patches/iproute2-3.4.0-libdir-1.patch
@@ -11,9 +11,9 @@ Description: This patch gives the ability to change the libdir.
              Rediffed for Iproute2-3.4.0 by William Harrington
 
 diff -Naur iproute2-3.4.0.orig/Makefile iproute2-3.4.0/Makefile
---- iproute2-3.4.0.orig/Makefile        2012-05-21 21:12:19.000000000 +0000
-+++ iproute2-3.4.0/Makefile     2012-09-16 00:43:20.000000000 +0000
-@@ -13,7 +13,7 @@
+--- iproute2-3.4.0.orig/Makefile	2012-10-25 19:59:31.824412361 +0000
++++ iproute2-3.4.0/Makefile	2012-10-25 20:00:11.334366911 +0000
+@@ -12,7 +12,7 @@
  
  SHARED_LIBS = y
  
@@ -23,8 +23,8 @@ diff -Naur iproute2-3.4.0.orig/Makefile iproute2-3.4.0/Makefile
  DEFINES+= -DNO_SHARED_LIBS
  endif
 diff -Naur iproute2-3.4.0.orig/include/iptables.h iproute2-3.4.0/include/iptables.h
---- iproute2-3.4.0.orig/include/iptables.h      2012-05-21 21:12:19.000000000 +0000
-+++ iproute2-3.4.0/include/iptables.h   2012-09-16 00:43:20.000000000 +0000
+--- iproute2-3.4.0.orig/include/iptables.h	2012-05-21 21:12:19.000000000 +0000
++++ iproute2-3.4.0/include/iptables.h	2012-10-25 20:00:56.064367711 +0000
 @@ -4,8 +4,12 @@
  #include "iptables_common.h"
  #include "libiptc/libiptc.h"
@@ -40,14 +40,14 @@ diff -Naur iproute2-3.4.0.orig/include/iptables.h iproute2-3.4.0/include/iptable
  
  #ifndef IPPROTO_SCTP
 diff -Naur iproute2-3.4.0.orig/misc/arpd.c iproute2-3.4.0/misc/arpd.c
---- iproute2-3.4.0.orig/misc/arpd.c     2012-05-21 21:12:19.000000000 +0000
-+++ iproute2-3.4.0/misc/arpd.c  2012-09-16 00:43:20.000000000 +0000
+--- iproute2-3.4.0.orig/misc/arpd.c	2012-05-21 21:12:19.000000000 +0000
++++ iproute2-3.4.0/misc/arpd.c	2012-10-25 20:01:19.474370303 +0000
 @@ -40,7 +40,7 @@
  int resolve_hosts;
  
- DB     *dbase;
--char   *dbname = "/var/lib/arpd/arpd.db";
+ DB	*dbase;
+-char	*dbname = "/var/lib/arpd/arpd.db";
 +char   *dbname = ARPDDIR "/arpd.db";
  
- int    ifnum;
- int    *ifvec;
+ int	ifnum;
+ int	*ifvec;

-----------------------------------------------------------------------

Summary of changes:
 patches/iproute2-3.4.0-libdir-1.patch |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book