source: patches/iproute2-3.2.0-libdir-1.patch@ 7bb1bf01

clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 7bb1bf01 was 35e7499, checked in by Jonathan Norman <jon@…>, 13 years ago

Merged with Cosmo-branch, renamed / rediffed patches as required and fixed download links

  • Property mode set to 100644
File size: 1.7 KB
RevLine 
[00a531f6]1Submitted By: Joe Ciccone <jciccone@gmail.com>
[94909a8]2Date: 14-06-2010
[00a531f6]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
[94909a8]10 Renamed for Iproute2-2.6.38 by Jonathan Norman
[00a531f6]11
12diff -Naur iproute2-2.6.37.orig/Makefile iproute2-2.6.37/Makefile
13--- iproute2-2.6.37.orig/Makefile 2011-01-07 12:54:30.000000000 -0500
14+++ iproute2-2.6.37/Makefile 2011-01-08 19:22:59.954895722 -0500
15@@ -12,7 +12,7 @@
16
17 SHARED_LIBS = y
18
19-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
20+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\"
21 ifneq ($(SHARED_LIBS),y)
22 DEFINES+= -DNO_SHARED_LIBS
23 endif
24diff -Naur iproute2-2.6.37.orig/include/iptables.h iproute2-2.6.37/include/iptables.h
25--- iproute2-2.6.37.orig/include/iptables.h 2011-01-07 12:54:30.000000000 -0500
26+++ iproute2-2.6.37/include/iptables.h 2011-01-08 19:22:59.954895722 -0500
27@@ -4,8 +4,12 @@
28 #include "iptables_common.h"
29 #include "libiptc/libiptc.h"
30
31+#ifndef LIBDIR
32+#define LIBDIR "/usr/lib"
33+#endif
34+
35 #ifndef IPT_LIB_DIR
36-#define IPT_LIB_DIR "/usr/local/lib/iptables"
37+#define IPT_LIB_DIR LIBDIR "/iptables"
38 #endif
39
40 #ifndef IPPROTO_SCTP
41diff -Naur iproute2-2.6.37.orig/misc/arpd.c iproute2-2.6.37/misc/arpd.c
42--- iproute2-2.6.37.orig/misc/arpd.c 2011-01-07 12:54:30.000000000 -0500
43+++ iproute2-2.6.37/misc/arpd.c 2011-01-08 19:22:59.954895722 -0500
44@@ -40,7 +40,7 @@
45 int resolve_hosts;
46
47 DB *dbase;
48-char *dbname = "/var/lib/arpd/arpd.db";
49+char *dbname = ARPDDIR "/arpd.db";
50
51 int ifnum;
52 int *ifvec;
Note: See TracBrowser for help on using the repository browser.