source: patches/iproute2-3.12.0-libdir-1.patch @ 83e4c6d

clfs-3.0.0-systemdclfs-3.0.0-sysvinitsystemdsysvinit
Last change on this file since 83e4c6d was 7d77fcf, checked in by William Harrington <kb0iic@…>, 9 years ago

Rename iproute2 libdir patch from 3.10.0 to 3.12.0.

  • Property mode set to 100644
File size: 1.9 KB
RevLine 
[5ecce60]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
[7d77fcf]13             Renamed for Iproute2-3.12.0 by William Harrington
[5ecce60]14
15diff -Naur iproute2-3.8.0.orig/Makefile iproute2-3.8.0/Makefile
16--- iproute2-3.8.0.orig/Makefile        2013-02-21 16:41:20.000000000 +0000
17+++ iproute2-3.8.0/Makefile     2013-06-03 12:31:18.891352195 +0000
18@@ -13,7 +13,7 @@
19 
20 SHARED_LIBS = y
21 
22-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
23+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\"
24 ifneq ($(SHARED_LIBS),y)
25 DEFINES+= -DNO_SHARED_LIBS
26 endif
27diff -Naur iproute2-3.8.0.orig/include/iptables.h iproute2-3.8.0/include/iptables.h
28--- iproute2-3.8.0.orig/include/iptables.h      2013-02-21 16:41:20.000000000 +0000
29+++ iproute2-3.8.0/include/iptables.h   2013-06-03 12:31:18.891352195 +0000
30@@ -4,8 +4,12 @@
31 #include "iptables_common.h"
32 #include "libiptc/libiptc.h"
33 
34+#ifndef LIBDIR
35+#define LIBDIR "/usr/lib"
36+#endif
37+
38 #ifndef IPT_LIB_DIR
39-#define IPT_LIB_DIR "/usr/local/lib/iptables"
40+#define IPT_LIB_DIR LIBDIR "/iptables"
41 #endif
42 
43 #ifndef IPPROTO_SCTP
44diff -Naur iproute2-3.8.0.orig/misc/arpd.c iproute2-3.8.0/misc/arpd.c
45--- iproute2-3.8.0.orig/misc/arpd.c     2013-02-21 16:41:20.000000000 +0000
46+++ iproute2-3.8.0/misc/arpd.c  2013-06-03 12:31:18.891352195 +0000
47@@ -40,7 +40,7 @@
48 int resolve_hosts;
49 
50 DB     *dbase;
51-char   *dbname = "/var/lib/arpd/arpd.db";
52+char   *dbname = ARPDDIR "/arpd.db";
53 
54 int    ifnum;
55 int    *ifvec;
Note: See TracBrowser for help on using the repository browser.