source: patches/iproute2-3.4.0-libdir-1.patch@ 36a0aca

clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 36a0aca was 06b2d12, checked in by William Harrington <kb0iic@…>, 12 years ago

delete old patches and add new patches.
  • Property mode set to 100644
File size: 4.0 KB

  • iproute2-3.4.0 

    Submitted By: Joe Ciccone <jciccone@gmail.com>
Date: 14-06-2010
Initial Package Version: 2.6.18
Upstream Status: Unknown
Origin: Joe Ciccone
Description: This patch gives the ability to change the libdir.
             Updated for Iproute2-2.6.28 by Jim Gifford
             Updated for Iproute2-2.6.34 by Joe Ciccone
             Updated for Iproute2-2.6.37 by Joe Ciccone
             Renamed for Iproute2-2.6.38 by Jonathan Norman
             Rediffed for Iproute2-3.4.0 by William Harrington

diff -Naur iproute2-3.4.0.orig/Makefile iproute2-3.4.0/Makefile
    old new  
    1313
    1414SHARED_LIBS = y
    1515
    16 DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
     16DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\"
    1717ifneq ($(SHARED_LIBS),y)
    1818DEFINES+= -DNO_SHARED_LIBS
    1919endif

  • Makefile.orig 

    diff -Naur iproute2-3.4.0.orig/Makefile.orig iproute2-3.4.0/Makefile.orig
    old new  
     1ROOTDIR=$(DESTDIR)
     2PREFIX=/usr
     3LIBDIR=$(PREFIX)/lib
     4SBINDIR=/sbin
     5CONFDIR=/etc/iproute2
     6DATADIR=$(PREFIX)/share
     7DOCDIR=$(DATADIR)/doc/iproute2
     8MANDIR=$(DATADIR)/man
     9ARPDDIR=/var/lib/arpd
     10
     11# Path to db_185.h include
     12DBM_INCLUDE:=$(ROOTDIR)/usr/include
     13
     14SHARED_LIBS = y
     15
     16DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
     17ifneq ($(SHARED_LIBS),y)
     18DEFINES+= -DNO_SHARED_LIBS
     19endif
     20
     21DEFINES+=-DCONFDIR=\"$(CONFDIR)\"
     22
     23#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
     24LDLIBS=-lresolv
     25ADDLIB=
     26
     27#options for decnet
     28ADDLIB+=dnet_ntop.o dnet_pton.o
     29
     30#options for ipx
     31ADDLIB+=ipx_ntop.o ipx_pton.o
     32
     33CC = gcc
     34HOSTCC = gcc
     35DEFINES += -D_GNU_SOURCE
     36CCOPTS = -O2
     37WFLAGS = -Wall -Wstrict-prototypes
     38CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
     39YACCFLAGS = -d -t -v
     40
     41SUBDIRS=lib ip tc misc netem genl man
     42
     43LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
     44LDLIBS += $(LIBNETLINK)
     45
     46all: Config
     47        @set -e; \
     48        for i in $(SUBDIRS); \
     49        do $(MAKE) $(MFLAGS) -C $$i; done
     50
     51Config:
     52        sh configure $(KERNEL_INCLUDE)
     53
     54install: all
     55        install -m 0755 -d $(DESTDIR)$(SBINDIR)
     56        install -m 0755 -d $(DESTDIR)$(CONFDIR)
     57        install -m 0755 -d $(DESTDIR)$(ARPDDIR)
     58        install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
     59        install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
     60        install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \
     61                $(DESTDIR)$(DOCDIR)/examples
     62        install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
     63                $(DESTDIR)$(DOCDIR)/examples/diffserv
     64        @for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
     65        install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
     66
     67snapshot:
     68        echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \
     69                > include/SNAPSHOT.h
     70
     71clean:
     72        @for i in $(SUBDIRS) doc; \
     73        do $(MAKE) $(MFLAGS) -C $$i clean; done
     74
     75clobber:
     76        touch Config
     77        $(MAKE) $(MFLAGS) clean
     78        rm -f Config cscope.*
     79
     80distclean: clobber
     81
     82cscope:
     83        cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc
     84
     85.EXPORT_ALL_VARIABLES:

  • include/iptables.h 

    diff -Naur iproute2-3.4.0.orig/include/iptables.h iproute2-3.4.0/include/iptables.h
    old new  
    44#include "iptables_common.h"
    55#include "libiptc/libiptc.h"
    66
     7#ifndef LIBDIR
     8#define LIBDIR "/usr/lib"
     9#endif
     10
    711#ifndef IPT_LIB_DIR
    8 #define IPT_LIB_DIR "/usr/local/lib/iptables"
     12#define IPT_LIB_DIR LIBDIR "/iptables"
    913#endif
    1014
    1115#ifndef IPPROTO_SCTP

  • iproute2-3.4.0 

    diff -Naur iproute2-3.4.0.orig/misc/arpd.c iproute2-3.4.0/misc/arpd.c
    old new  
    4040int resolve_hosts;
    4141
    4242DB      *dbase;
    43 char    *dbname = "/var/lib/arpd/arpd.db";
     43char    *dbname = ARPDDIR "/arpd.db";
    4444
    4545int     ifnum;
    4646int     *ifvec;
Note: See TracBrowser for help on using the repository browser.