| [70a2865] | 1 | Submitted By: Joe Ciccone <jciccone@gmail.com> |
|---|
| [44cadbb] | 2 | Date: 16-09-2015 |
|---|
| [70a2865] | 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.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 | Renamed for Iproute2-3.12.0 by William Harrington |
|---|
| 14 | Renamed for Iproute2-3.14.0 by William Harrington |
|---|
| [44cadbb] | 15 | Rediffed for Iproute2-4.1.1 by William Harrington |
|---|
| [70a2865] | 16 | |
|---|
| [44cadbb] | 17 | diff -Naur iproute2-4.1.1.orig/Makefile iproute2-4.1.1/Makefile |
|---|
| 18 | --- iproute2-4.1.1.orig/Makefile 2015-07-06 21:57:34.000000000 +0000 |
|---|
| 19 | +++ iproute2-4.1.1/Makefile 2015-09-16 23:57:03.117721908 +0000 |
|---|
| [70a2865] | 20 | @@ -13,7 +13,7 @@ |
|---|
| 21 | |
|---|
| 22 | SHARED_LIBS = y |
|---|
| 23 | |
|---|
| 24 | -DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" |
|---|
| 25 | +DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\" |
|---|
| 26 | ifneq ($(SHARED_LIBS),y) |
|---|
| 27 | DEFINES+= -DNO_SHARED_LIBS |
|---|
| 28 | endif |
|---|
| [44cadbb] | 29 | diff -Naur iproute2-4.1.1.orig/include/iptables.h iproute2-4.1.1/include/iptables.h |
|---|
| 30 | --- iproute2-4.1.1.orig/include/iptables.h 2015-07-06 21:57:34.000000000 +0000 |
|---|
| 31 | +++ iproute2-4.1.1/include/iptables.h 2015-09-16 23:57:03.118722035 +0000 |
|---|
| [70a2865] | 32 | @@ -4,8 +4,12 @@ |
|---|
| 33 | #include "iptables_common.h" |
|---|
| 34 | #include "libiptc/libiptc.h" |
|---|
| 35 | |
|---|
| 36 | +#ifndef LIBDIR |
|---|
| 37 | +#define LIBDIR "/usr/lib" |
|---|
| 38 | +#endif |
|---|
| 39 | + |
|---|
| 40 | #ifndef IPT_LIB_DIR |
|---|
| 41 | -#define IPT_LIB_DIR "/usr/local/lib/iptables" |
|---|
| 42 | +#define IPT_LIB_DIR LIBDIR "/iptables" |
|---|
| 43 | #endif |
|---|
| 44 | |
|---|
| 45 | #ifndef IPPROTO_SCTP |
|---|
| [44cadbb] | 46 | diff -Naur iproute2-4.1.1.orig/misc/arpd.c iproute2-4.1.1/misc/arpd.c |
|---|
| 47 | --- iproute2-4.1.1.orig/misc/arpd.c 2015-07-06 21:57:34.000000000 +0000 |
|---|
| 48 | +++ iproute2-4.1.1/misc/arpd.c 2015-09-16 23:57:03.118722035 +0000 |
|---|
| 49 | @@ -41,7 +41,7 @@ |
|---|
| [70a2865] | 50 | int resolve_hosts; |
|---|
| 51 | |
|---|
| 52 | DB *dbase; |
|---|
| 53 | -char *dbname = "/var/lib/arpd/arpd.db"; |
|---|
| 54 | +char *dbname = ARPDDIR "/arpd.db"; |
|---|
| 55 | |
|---|
| 56 | int ifnum; |
|---|
| 57 | int *ifvec; |
|---|
