From b5cb1795de1f0959de1e228bd2e784d1cea921a7 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 4 Jun 2007 11:25:53 +0000
Subject: refresh all package patches in the buildroot using quilt

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/ipset/patches/001-kernel_26.patch | 42 ++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'package/ipset')

diff --git a/package/ipset/patches/001-kernel_26.patch b/package/ipset/patches/001-kernel_26.patch
index 46112ab25..4101f46bf 100644
--- a/package/ipset/patches/001-kernel_26.patch
+++ b/package/ipset/patches/001-kernel_26.patch
@@ -1,6 +1,7 @@
-diff -Nur ipset-2.2.3.orig/ipset.c ipset-2.2.3/ipset.c
---- ipset-2.2.3.orig/ipset.c	2005-04-05 09:56:02.000000000 +0200
-+++ ipset-2.2.3/ipset.c	2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset.c
+===================================================================
+--- ipset-2.2.3.orig/ipset.c	2007-06-04 13:22:37.544147704 +0200
++++ ipset-2.2.3/ipset.c	2007-06-04 13:22:37.644132504 +0200
 @@ -21,7 +21,6 @@
  #include <stdarg.h>
  #include <netdb.h>
@@ -9,9 +10,10 @@ diff -Nur ipset-2.2.3.orig/ipset.c ipset-2.2.3/ipset.c
  
  #include "ipset.h"
  
-diff -Nur ipset-2.2.3.orig/ipset_iphash.c ipset-2.2.3/ipset_iphash.c
---- ipset-2.2.3.orig/ipset_iphash.c	2005-01-19 14:38:57.000000000 +0100
-+++ ipset-2.2.3/ipset_iphash.c	2005-09-29 13:07:26.308102000 +0200
+Index: ipset-2.2.3/ipset_iphash.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_iphash.c	2007-06-04 13:22:37.550146792 +0200
++++ ipset-2.2.3/ipset_iphash.c	2007-06-04 13:22:37.644132504 +0200
 @@ -25,7 +25,6 @@
  #include <sys/types.h>
  #include <netinet/in.h>
@@ -20,9 +22,10 @@ diff -Nur ipset-2.2.3.orig/ipset_iphash.c ipset-2.2.3/ipset_iphash.c
  #include <asm/types.h>
  
  #include <linux/netfilter_ipv4/ip_set_iphash.h>
-diff -Nur ipset-2.2.3.orig/ipset_ipmap.c ipset-2.2.3/ipset_ipmap.c
---- ipset-2.2.3.orig/ipset_ipmap.c	2005-01-19 14:38:57.000000000 +0100
-+++ ipset-2.2.3/ipset_ipmap.c	2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset_ipmap.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_ipmap.c	2007-06-04 13:22:37.556145880 +0200
++++ ipset-2.2.3/ipset_ipmap.c	2007-06-04 13:22:37.644132504 +0200
 @@ -22,7 +22,6 @@
  #include <sys/socket.h>
  #include <netinet/in.h>
@@ -31,9 +34,10 @@ diff -Nur ipset-2.2.3.orig/ipset_ipmap.c ipset-2.2.3/ipset_ipmap.c
  
  #include <linux/netfilter_ipv4/ip_set_ipmap.h>
  #include "ipset.h"
-diff -Nur ipset-2.2.3.orig/ipset_macipmap.c ipset-2.2.3/ipset_macipmap.c
---- ipset-2.2.3.orig/ipset_macipmap.c	2005-01-19 14:38:57.000000000 +0100
-+++ ipset-2.2.3/ipset_macipmap.c	2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset_macipmap.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_macipmap.c	2007-06-04 13:22:37.561145120 +0200
++++ ipset-2.2.3/ipset_macipmap.c	2007-06-04 13:22:37.645132352 +0200
 @@ -24,7 +24,6 @@
  #include <sys/socket.h>
  #include <netinet/in.h>
@@ -42,9 +46,10 @@ diff -Nur ipset-2.2.3.orig/ipset_macipmap.c ipset-2.2.3/ipset_macipmap.c
  #include <linux/if_ether.h>
  
  #include <linux/netfilter_ipv4/ip_set_macipmap.h>
-diff -Nur ipset-2.2.3.orig/ipset_nethash.c ipset-2.2.3/ipset_nethash.c
---- ipset-2.2.3.orig/ipset_nethash.c	2005-05-09 07:44:25.000000000 +0200
-+++ ipset-2.2.3/ipset_nethash.c	2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset_nethash.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_nethash.c	2007-06-04 13:22:37.567144208 +0200
++++ ipset-2.2.3/ipset_nethash.c	2007-06-04 13:22:37.645132352 +0200
 @@ -25,7 +25,6 @@
  #include <sys/types.h>
  #include <netinet/in.h>
@@ -53,9 +58,10 @@ diff -Nur ipset-2.2.3.orig/ipset_nethash.c ipset-2.2.3/ipset_nethash.c
  #include <asm/types.h>
  
  #include <linux/netfilter_ipv4/ip_set_nethash.h>
-diff -Nur ipset-2.2.3.orig/ipset_portmap.c ipset-2.2.3/ipset_portmap.c
---- ipset-2.2.3.orig/ipset_portmap.c	2005-01-19 14:38:57.000000000 +0100
-+++ ipset-2.2.3/ipset_portmap.c	2005-09-29 13:07:07.446923250 +0200
+Index: ipset-2.2.3/ipset_portmap.c
+===================================================================
+--- ipset-2.2.3.orig/ipset_portmap.c	2007-06-04 13:22:37.573143296 +0200
++++ ipset-2.2.3/ipset_portmap.c	2007-06-04 13:22:37.645132352 +0200
 @@ -21,7 +21,6 @@
  #include <sys/socket.h>
  #include <netinet/in.h>
-- 
cgit v1.2.3