source: patches/iproute2-3.14.0-libdir-1.patch @ 92574e0

clfs-3.0.0-systemdsystemd
Last change on this file since 92574e0 was 70a2865, checked in by William Harrington <kb0iic@…>, 9 years ago

Rename iproute2 3.12.0 libdir patch for 3.14.0 upgrade and add an entry to the patch header for rename.

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