| [7c59b60] | 1 | Submitted By: Joe Ciccone <jciccone@gmail.com> |
|---|
| 2 | Date: 2010-08-02 |
|---|
| 3 | Initial Package Version: 2.6.18 |
|---|
| 4 | Upstream Status: Unknown |
|---|
| 5 | Origin: Joe Ciccone |
|---|
| 6 | Description: 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.24 by Joe Ciccone |
|---|
| 9 | |
|---|
| 10 | diff -Naur iproute2-2.6.34.orig/Makefile iproute2-2.6.34/Makefile |
|---|
| 11 | --- iproute2-2.6.34.orig/Makefile 2010-05-19 15:32:43.000000000 +0000 |
|---|
| 12 | +++ iproute2-2.6.34/Makefile 2010-08-03 01:55:53.157660978 +0000 |
|---|
| 13 | @@ -12,7 +12,7 @@ |
|---|
| 14 | |
|---|
| 15 | SHARED_LIBS = y |
|---|
| 16 | |
|---|
| 17 | -DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" |
|---|
| 18 | +DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\" |
|---|
| 19 | ifneq ($(SHARED_LIBS),y) |
|---|
| 20 | DEFINES+= -DNO_SHARED_LIBS |
|---|
| 21 | endif |
|---|
| 22 | diff -Naur iproute2-2.6.34.orig/include/iptables.h iproute2-2.6.34/include/iptables.h |
|---|
| 23 | --- iproute2-2.6.34.orig/include/iptables.h 2010-05-19 15:32:43.000000000 +0000 |
|---|
| 24 | +++ iproute2-2.6.34/include/iptables.h 2010-08-03 01:56:54.042453134 +0000 |
|---|
| 25 | @@ -4,8 +4,12 @@ |
|---|
| 26 | #include "iptables_common.h" |
|---|
| 27 | #include "libiptc/libiptc.h" |
|---|
| 28 | |
|---|
| 29 | +#ifndef LIBDIR |
|---|
| 30 | +#define LIBDIR "/usr/lib" |
|---|
| 31 | +#endif |
|---|
| 32 | + |
|---|
| 33 | #ifndef IPT_LIB_DIR |
|---|
| 34 | -#define IPT_LIB_DIR "/usr/local/lib/iptables" |
|---|
| 35 | +#define IPT_LIB_DIR LIBDIR "/iptables" |
|---|
| 36 | #endif |
|---|
| 37 | |
|---|
| 38 | #ifndef IPPROTO_SCTP |
|---|
| 39 | diff -Naur iproute2-2.6.34.orig/misc/arpd.c iproute2-2.6.34/misc/arpd.c |
|---|
| 40 | --- iproute2-2.6.34.orig/misc/arpd.c 2010-05-19 15:32:43.000000000 +0000 |
|---|
| 41 | +++ iproute2-2.6.34/misc/arpd.c 2010-08-03 01:53:40.570451501 +0000 |
|---|
| 42 | @@ -40,7 +40,7 @@ |
|---|
| 43 | int resolve_hosts; |
|---|
| 44 | |
|---|
| 45 | DB *dbase; |
|---|
| 46 | -char *dbname = "/var/lib/arpd/arpd.db"; |
|---|
| 47 | +char *dbname = ARPDDIR "/arpd.db"; |
|---|
| 48 | |
|---|
| 49 | int ifnum; |
|---|
| 50 | int *ifvec; |
|---|
| 51 | diff -Naur iproute2-2.6.34.orig/netem/Makefile iproute2-2.6.34/netem/Makefile |
|---|
| 52 | --- iproute2-2.6.34.orig/netem/Makefile 2010-05-19 15:32:43.000000000 +0000 |
|---|
| 53 | +++ iproute2-2.6.34/netem/Makefile 2010-08-03 01:52:20.742452152 +0000 |
|---|
| 54 | @@ -20,9 +20,9 @@ |
|---|
| 55 | $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm |
|---|
| 56 | |
|---|
| 57 | install: all |
|---|
| 58 | - mkdir -p $(DESTDIR)/lib/tc |
|---|
| 59 | + mkdir -p $(DESTDIR)$(LIBDIR)/tc |
|---|
| 60 | for i in $(DISTDATA); \ |
|---|
| 61 | - do install -m 755 $$i $(DESTDIR)/lib/tc; \ |
|---|
| 62 | + do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ |
|---|
| 63 | done |
|---|
| 64 | |
|---|
| 65 | clean: |
|---|
