Changeset 73ace20 for patches/iproute2-3.4.0-libdir-1.patch

Timestamp:

Oct 10, 2012, 6:42:21 PM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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

File:

• patches/iproute2-3.4.0-libdir-1.patch (moved) (moved from patches/iproute2-2.6.38-libdir-1.patch ) (3 diffs)

patches/iproute2-3.4.0-libdir-1.patch

@@ -9 +9 @@
              Updated for Iproute2-2.6.37 by Joe Ciccone
              Renamed for Iproute2-2.6.38 by Jonathan Norman
+             Rediffed for Iproute2-3.4.0 by William Harrington
 
-diff -Naur iproute2-2.6.37.orig/Makefile iproute2-2.6.37/Makefile
---- iproute2-2.6.37.orig/Makefile       2011-01-07 12:54:30.000000000 -0500
-+++ iproute2-2.6.37/Makefile    2011-01-08 19:22:59.954895722 -0500
-@@ -12,7 +12,7 @@
+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 @@
  
  SHARED_LIBS = y
@@ -22 +23 @@
  DEFINES+= -DNO_SHARED_LIBS
  endif
-diff -Naur iproute2-2.6.37.orig/include/iptables.h iproute2-2.6.37/include/iptables.h
---- iproute2-2.6.37.orig/include/iptables.h     2011-01-07 12:54:30.000000000 -0500
-+++ iproute2-2.6.37/include/iptables.h  2011-01-08 19:22:59.954895722 -0500
+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
 @@ -4,8 +4,12 @@
  #include "iptables_common.h"
@@ -39 +40 @@
  
  #ifndef IPPROTO_SCTP
-diff -Naur iproute2-2.6.37.orig/misc/arpd.c iproute2-2.6.37/misc/arpd.c
---- iproute2-2.6.37.orig/misc/arpd.c    2011-01-07 12:54:30.000000000 -0500
-+++ iproute2-2.6.37/misc/arpd.c 2011-01-08 19:22:59.954895722 -0500
+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
 @@ -40,7 +40,7 @@
  int resolve_hosts;
  
- DB     *dbase;
--char   *dbname = "/var/lib/arpd/arpd.db";
-+char   *dbname = ARPDDIR "/arpd.db";
+ DB     *dbase;
+-char   *dbname = "/var/lib/arpd/arpd.db";
++char   *dbname = ARPDDIR "/arpd.db";
  
- int    ifnum;
- int    *ifvec;
+ int    ifnum;
+ int    *ifvec;