[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 78a403bd6236ed6c7a5c0f810c5627bb9a774754

Fri Sep 14 07:13:08 PDT 2012

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  78a403bd6236ed6c7a5c0f810c5627bb9a774754 (commit)
      from  f1778eba0ffa989d12daf033f80f582e4eb1bec0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 78a403bd6236ed6c7a5c0f810c5627bb9a774754
Author: William Harrington <kb0iic at gmail.com>
Date:   Fri Sep 14 09:13:02 2012 -0500

    Fix iproute2-3.4.0-libdir-1 patch.

diff --git a/patches/iproute2-3.4.0-libdir-1.patch b/patches/iproute2-3.4.0-libdir-1.patch
index 3c96a50..ee8969f 100644
--- a/patches/iproute2-3.4.0-libdir-1.patch
+++ b/patches/iproute2-3.4.0-libdir-1.patch
@@ -11,8 +11,8 @@ Description: This patch gives the ability to change the libdir.
              Rediffed for Iproute2-3.4.0 by William Harrington
 
 diff -Naur iproute2-3.4.0.orig/Makefile iproute2-3.4.0/Makefile
---- iproute2-3.4.0.orig/Makefile	2012-05-21 21:12:19.000000000 +0000
-+++ iproute2-3.4.0/Makefile	2012-08-26 18:34:17.338322481 +0000
+--- iproute2-3.4.0.orig/Makefile        2012-05-21 21:12:19.000000000 +0000
++++ iproute2-3.4.0/Makefile     2012-09-14 14:10:33.000000000 +0000
 @@ -13,7 +13,7 @@
  
  SHARED_LIBS = y
@@ -22,98 +22,9 @@ diff -Naur iproute2-3.4.0.orig/Makefile iproute2-3.4.0/Makefile
  ifneq ($(SHARED_LIBS),y)
  DEFINES+= -DNO_SHARED_LIBS
  endif
-diff -Naur iproute2-3.4.0.orig/Makefile.orig iproute2-3.4.0/Makefile.orig
---- iproute2-3.4.0.orig/Makefile.orig	1970-01-01 00:00:00.000000000 +0000
-+++ iproute2-3.4.0/Makefile.orig	2012-05-21 21:12:19.000000000 +0000
-@@ -0,0 +1,85 @@
-+ROOTDIR=$(DESTDIR)
-+PREFIX=/usr
-+LIBDIR=$(PREFIX)/lib
-+SBINDIR=/sbin
-+CONFDIR=/etc/iproute2
-+DATADIR=$(PREFIX)/share
-+DOCDIR=$(DATADIR)/doc/iproute2
-+MANDIR=$(DATADIR)/man
-+ARPDDIR=/var/lib/arpd
-+
-+# Path to db_185.h include
-+DBM_INCLUDE:=$(ROOTDIR)/usr/include
-+
-+SHARED_LIBS = y
-+
-+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
-+ifneq ($(SHARED_LIBS),y)
-+DEFINES+= -DNO_SHARED_LIBS
-+endif
-+
-+DEFINES+=-DCONFDIR=\"$(CONFDIR)\"
-+
-+#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
-+LDLIBS=-lresolv
-+ADDLIB=
-+
-+#options for decnet
-+ADDLIB+=dnet_ntop.o dnet_pton.o
-+
-+#options for ipx
-+ADDLIB+=ipx_ntop.o ipx_pton.o
-+
-+CC = gcc
-+HOSTCC = gcc
-+DEFINES += -D_GNU_SOURCE
-+CCOPTS = -O2
-+WFLAGS = -Wall -Wstrict-prototypes
-+CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
-+YACCFLAGS = -d -t -v
-+
-+SUBDIRS=lib ip tc misc netem genl man
-+
-+LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
-+LDLIBS += $(LIBNETLINK)
-+
-+all: Config
-+	@set -e; \
-+	for i in $(SUBDIRS); \
-+	do $(MAKE) $(MFLAGS) -C $$i; done
-+
-+Config:
-+	sh configure $(KERNEL_INCLUDE)
-+
-+install: all
-+	install -m 0755 -d $(DESTDIR)$(SBINDIR)
-+	install -m 0755 -d $(DESTDIR)$(CONFDIR)
-+	install -m 0755 -d $(DESTDIR)$(ARPDDIR)
-+	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
-+	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
-+	install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \
-+		$(DESTDIR)$(DOCDIR)/examples
-+	install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
-+		$(DESTDIR)$(DOCDIR)/examples/diffserv
-+	@for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done
-+	install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
-+
-+snapshot:
-+	echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \
-+		> include/SNAPSHOT.h
-+
-+clean:
-+	@for i in $(SUBDIRS) doc; \
-+	do $(MAKE) $(MFLAGS) -C $$i clean; done
-+
-+clobber:
-+	touch Config
-+	$(MAKE) $(MFLAGS) clean
-+	rm -f Config cscope.*
-+
-+distclean: clobber
-+
-+cscope:
-+	cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc
-+
-+.EXPORT_ALL_VARIABLES:
 diff -Naur iproute2-3.4.0.orig/include/iptables.h iproute2-3.4.0/include/iptables.h
---- iproute2-3.4.0.orig/include/iptables.h	2012-05-21 21:12:19.000000000 +0000
-+++ iproute2-3.4.0/include/iptables.h	2012-08-26 18:34:17.338322481 +0000
+--- iproute2-3.4.0.orig/include/iptables.h      2012-05-21 21:12:19.000000000 +0000
++++ iproute2-3.4.0/include/iptables.h   2012-09-14 14:10:33.000000000 +0000
 @@ -4,8 +4,12 @@
  #include "iptables_common.h"
  #include "libiptc/libiptc.h"
@@ -129,14 +40,14 @@ diff -Naur iproute2-3.4.0.orig/include/iptables.h iproute2-3.4.0/include/iptable
  
  #ifndef IPPROTO_SCTP
 diff -Naur iproute2-3.4.0.orig/misc/arpd.c iproute2-3.4.0/misc/arpd.c
---- iproute2-3.4.0.orig/misc/arpd.c	2012-05-21 21:12:19.000000000 +0000
-+++ iproute2-3.4.0/misc/arpd.c	2012-08-26 18:34:17.338322481 +0000
+--- iproute2-3.4.0.orig/misc/arpd.c     2012-05-21 21:12:19.000000000 +0000
++++ iproute2-3.4.0/misc/arpd.c  2012-09-14 14:10:33.000000000 +0000
 @@ -40,7 +40,7 @@
  int resolve_hosts;
  
- DB	*dbase;
--char	*dbname = "/var/lib/arpd/arpd.db";
-+char	*dbname = ARPDDIR "/arpd.db";
+ DB     *dbase;
+-char   *dbname = "/var/lib/arpd/arpd.db";
++char   *dbname = ARPDDIR "/arpd.db";
  
- int	ifnum;
- int	*ifvec;
+ int    ifnum;
+ int    *ifvec;

-----------------------------------------------------------------------

Summary of changes:
 patches/iproute2-3.4.0-libdir-1.patch |  111 +++-----------------------------
 1 files changed, 11 insertions(+), 100 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book

