remove /etc/firewall.* from being kept as they no longer are used in trunk

[openwrt.git] / package / iproute2 / patches / 004-darwin_fixes.patch

diff --git a/package/iproute2/patches/004-darwin_fixes.patch b/package/iproute2/patches/004-darwin_fixes.patch
index 775705c..da7c3ec 100644 (file)
--- a/package/iproute2/patches/004-darwin_fixes.patch
+++ b/package/iproute2/patches/004-darwin_fixes.patch
@@ -1,24 +1,26 @@
-diff -urN iproute2-2.6.15-060110/netem/maketable.c iproute2-2.6.15-060110.new/netem/maketable.c
---- iproute2-2.6.15-060110/netem/maketable.c   2005-02-09 23:05:41.000000000 +0100
-+++ iproute2-2.6.15-060110.new/netem/maketable.c       2007-04-08 22:40:21.000000000 +0200
+Index: iproute-2.6.20-070313/netem/maketable.c
+===================================================================
+--- iproute-2.6.20-070313.orig/netem/maketable.c       2007-06-09 13:53:56.000000000 +0100
++++ iproute-2.6.20-070313/netem/maketable.c    2007-06-09 13:54:01.000000000 +0100
 @@ -10,7 +10,9 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <math.h>
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
  #include <malloc.h>
 +#endif
  #include <string.h>
  #include <sys/types.h>
  #include <sys/stat.h>
-diff -urN iproute2-2.6.15-060110/netem/normal.c iproute2-2.6.15-060110.new/netem/normal.c
---- iproute2-2.6.15-060110/netem/normal.c      2005-03-30 20:11:49.000000000 +0200
-+++ iproute2-2.6.15-060110.new/netem/normal.c  2007-04-08 22:47:26.000000000 +0200
+Index: iproute-2.6.20-070313/netem/normal.c
+===================================================================
+--- iproute-2.6.20-070313.orig/netem/normal.c  2007-06-09 13:53:56.000000000 +0100
++++ iproute-2.6.20-070313/netem/normal.c       2007-06-09 13:54:01.000000000 +0100
 @@ -8,8 +8,12 @@
  #include <string.h>
  #include <limits.h>
  
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
  #include <linux/types.h>
  #include <linux/pkt_sched.h>
 +#else
@@ -27,14 +29,15 @@ diff -urN iproute2-2.6.15-060110/netem/normal.c iproute2-2.6.15-060110.new/netem
  
  #define TABLESIZE 16384
  #define TABLEFACTOR NETEM_DIST_SCALE
-diff -urN iproute2-2.6.15-060110/netem/pareto.c iproute2-2.6.15-060110.new/netem/pareto.c
---- iproute2-2.6.15-060110/netem/pareto.c      2005-02-09 23:05:41.000000000 +0100
-+++ iproute2-2.6.15-060110.new/netem/pareto.c  2007-04-08 22:48:36.000000000 +0200
+Index: iproute-2.6.20-070313/netem/pareto.c
+===================================================================
+--- iproute-2.6.20-070313.orig/netem/pareto.c  2007-06-09 13:53:56.000000000 +0100
++++ iproute-2.6.20-070313/netem/pareto.c       2007-06-09 13:54:01.000000000 +0100
 @@ -7,8 +7,12 @@
  #include <math.h>
  #include <limits.h>
  
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
  #include <linux/types.h>
  #include <linux/pkt_sched.h>
 +#else
@@ -43,14 +46,15 @@ diff -urN iproute2-2.6.15-060110/netem/pareto.c iproute2-2.6.15-060110.new/netem
  
  static const double a=3.0;
  #define TABLESIZE     16384
-diff -urN iproute2-2.6.15-060110/netem/paretonormal.c iproute2-2.6.15-060110.new/netem/paretonormal.c
---- iproute2-2.6.15-060110/netem/paretonormal.c        2005-08-08 22:24:41.000000000 +0200
-+++ iproute2-2.6.15-060110.new/netem/paretonormal.c    2007-04-08 22:49:56.000000000 +0200
+Index: iproute-2.6.20-070313/netem/paretonormal.c
+===================================================================
+--- iproute-2.6.20-070313.orig/netem/paretonormal.c    2007-06-09 13:53:56.000000000 +0100
++++ iproute-2.6.20-070313/netem/paretonormal.c 2007-06-09 13:54:01.000000000 +0100
 @@ -15,10 +15,13 @@
  #include <string.h>
  #include <math.h>
  #include <limits.h>
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
  #include <malloc.h>
 -
  #include <linux/types.h>