source: patches/iproute2-3.8.0-libdir-1.patch@ 121626c

clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 121626c was 4996aa59, checked in by William Harrington <kb0iic@…>, 12 years ago

Add iproute2 3.8.0 patch.

  • Property mode set to 100644
File size: 1.8 KB
RevLine 
[4996aa59]1Submitted By: Joe Ciccone <jciccone@gmail.com>
2Date: 14-06-2010
3Initial Package Version: 2.6.18
4Upstream Status: Unknown
5Origin: Joe Ciccone
6Description: This patch gives the ability to change the libdir.
7 Updated for Iproute2-2.6.28 by Jim Gifford
8 Updated for Iproute2-2.6.34 by Joe Ciccone
9 Updated for Iproute2-2.6.37 by Joe Ciccone
10 Renamed for Iproute2-2.6.38 by Jonathan Norman
11 Rediffed for Iproute2-3.4.0 by William Harrington
12 Rediffed for Iproute2-3.8.0 by William Harrington
13
14diff -Naur iproute2-3.8.0.orig/Makefile iproute2-3.8.0/Makefile
15--- iproute2-3.8.0.orig/Makefile 2013-02-21 16:41:20.000000000 +0000
16+++ iproute2-3.8.0/Makefile 2013-06-03 12:31:18.891352195 +0000
17@@ -13,7 +13,7 @@
18
19 SHARED_LIBS = y
20
21-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
22+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\"
23 ifneq ($(SHARED_LIBS),y)
24 DEFINES+= -DNO_SHARED_LIBS
25 endif
26diff -Naur iproute2-3.8.0.orig/include/iptables.h iproute2-3.8.0/include/iptables.h
27--- iproute2-3.8.0.orig/include/iptables.h 2013-02-21 16:41:20.000000000 +0000
28+++ iproute2-3.8.0/include/iptables.h 2013-06-03 12:31:18.891352195 +0000
29@@ -4,8 +4,12 @@
30 #include "iptables_common.h"
31 #include "libiptc/libiptc.h"
32
33+#ifndef LIBDIR
34+#define LIBDIR "/usr/lib"
35+#endif
36+
37 #ifndef IPT_LIB_DIR
38-#define IPT_LIB_DIR "/usr/local/lib/iptables"
39+#define IPT_LIB_DIR LIBDIR "/iptables"
40 #endif
41
42 #ifndef IPPROTO_SCTP
43diff -Naur iproute2-3.8.0.orig/misc/arpd.c iproute2-3.8.0/misc/arpd.c
44--- iproute2-3.8.0.orig/misc/arpd.c 2013-02-21 16:41:20.000000000 +0000
45+++ iproute2-3.8.0/misc/arpd.c 2013-06-03 12:31:18.891352195 +0000
46@@ -40,7 +40,7 @@
47 int resolve_hosts;
48
49 DB *dbase;
50-char *dbname = "/var/lib/arpd/arpd.db";
51+char *dbname = ARPDDIR "/arpd.db";
52
53 int ifnum;
54 int *ifvec;
Note: See TracBrowser for help on using the repository browser.