r868 - trunk/iproute2

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Mar 13 22:01:34 PST 2005


Author: jim
Date: 2005-03-13 23:01:33 -0700 (Sun, 13 Mar 2005)
New Revision: 868

Added:
   trunk/iproute2/iproute2-2.6.11_050310-remove_db-1.patch
Removed:
   trunk/iproute2/iproute2-050209-remove_db-1.patch
   trunk/iproute2/iproute2-2.6.9-050209-htons_fix-1.patch
Log:
Added: iproute2-2.6.11_050310-remove_db-1.patch

Deleted: trunk/iproute2/iproute2-050209-remove_db-1.patch
===================================================================
--- trunk/iproute2/iproute2-050209-remove_db-1.patch	2005-03-14 04:44:40 UTC (rev 867)
+++ trunk/iproute2/iproute2-050209-remove_db-1.patch	2005-03-14 06:01:33 UTC (rev 868)
@@ -1,30 +0,0 @@
-Submitted By: Jeremy Utley <jeremy at linuxfromscratch.org>
-Date: 2004-11-04
-Initial Package Version: 2.6.9-041019
-Upstream Status - Not submitted - LFS Specific
-Origin: Based on inital work by Jim Gifford, ported to apply to the latest version
-Description: Disables compilation of the arpd program, which requres Berkley DB.
-
-
-diff -Naur iproute2-2.6.9/misc/Makefile iproute2-2.6.9-new/misc/Makefile
---- iproute2-2.6.9/misc/Makefile	2004-10-19 20:49:02.000000000 +0000
-+++ iproute2-2.6.9-new/misc/Makefile	2004-11-04 19:14:43.704002010 +0000
-@@ -1,7 +1,7 @@
- SSOBJ=ss.o ssfilter.o
- LNSTATOBJ=lnstat.o lnstat_util.o
- 
--TARGETS=ss nstat ifstat rtacct arpd lnstat
-+TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../Config
- 
-@@ -18,9 +18,6 @@
- rtacct: rtacct.c
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LIBNETLINK) -lm
- 
--arpd: arpd.c
--	$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LIBNETLINK) -ldb -lpthread
--
- ssfilter.c: ssfilter.y
- 	bison ssfilter.y -o ssfilter.c
- 

Added: trunk/iproute2/iproute2-2.6.11_050310-remove_db-1.patch
===================================================================
--- trunk/iproute2/iproute2-2.6.11_050310-remove_db-1.patch	2005-03-14 04:44:40 UTC (rev 867)
+++ trunk/iproute2/iproute2-2.6.11_050310-remove_db-1.patch	2005-03-14 06:01:33 UTC (rev 868)
@@ -0,0 +1,30 @@
+Submitted By: Jeremy Utley <jeremy at linuxfromscratch.org>
+Date: 2004-11-04
+Initial Package Version: 2.6.9-041019
+Upstream Status - Not submitted - LFS Specific
+Origin: Based on inital work by Jim Gifford, ported to apply to the latest version
+Description: Disables compilation of the arpd program, which requres Berkley DB.
+
+
+diff -Naur iproute2-2.6.9/misc/Makefile iproute2-2.6.9-new/misc/Makefile
+--- iproute2-2.6.9/misc/Makefile	2004-10-19 20:49:02.000000000 +0000
++++ iproute2-2.6.9-new/misc/Makefile	2004-11-04 19:14:43.704002010 +0000
+@@ -1,7 +1,7 @@
+ SSOBJ=ss.o ssfilter.o
+ LNSTATOBJ=lnstat.o lnstat_util.o
+ 
+-TARGETS=ss nstat ifstat rtacct arpd lnstat
++TARGETS=ss nstat ifstat rtacct lnstat
+ 
+ include ../Config
+ 
+@@ -18,9 +18,6 @@
+ rtacct: rtacct.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LIBNETLINK) -lm
+ 
+-arpd: arpd.c
+-	$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LIBNETLINK) -ldb -lpthread
+-
+ ssfilter.c: ssfilter.y
+ 	bison ssfilter.y -o ssfilter.c
+ 

Deleted: trunk/iproute2/iproute2-2.6.9-050209-htons_fix-1.patch
===================================================================
--- trunk/iproute2/iproute2-2.6.9-050209-htons_fix-1.patch	2005-03-14 04:44:40 UTC (rev 867)
+++ trunk/iproute2/iproute2-2.6.9-050209-htons_fix-1.patch	2005-03-14 06:01:33 UTC (rev 868)
@@ -1,23 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-02-10
-Initial Package Version: 050207
-Origin: Stephen Hemminger
-Upstream Status: Next Release
-Description: Fixes compile issue
-	     
-	undefined reference to `__constant_htons' 
-
---- iproute2-2.6.9-050209/ip/iptunnel.c.orig	2005-02-10 19:02:45.774340480 +0000
-+++ iproute2-2.6.9-050209/ip/iptunnel.c	2005-02-10 19:03:21.531904504 +0000
-@@ -29,6 +29,11 @@
- #include <linux/if.h>
- #include <linux/if_arp.h>
- #include <linux/ip.h>
-+
-+#ifndef __constant_htons
-+#define __constant_htons(x)  htons(x)
-+#endif
-+
- #include <linux/if_tunnel.h>
- 
- #include "rt_names.h"




More information about the patches mailing list