Changeset 7520


Ignore:
Timestamp:
2007-06-07T19:43:50+02:00 (11 years ago)
Author:
pavlov
Message:

fix ipset bitops not working

Location:
trunk/package/ipset
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/ipset/Makefile

    r6582 r7520  
    3030                COPT_FLAGS="$(TARGET_CFLAGS)" \ 
    3131                KERNEL_DIR="$(LINUX_DIR)" \ 
     32                PREFIX="/usr" \ 
    3233        ) 
    3334endef 
  • trunk/package/ipset/patches/001-kernel_26.patch

    r7490 r7520  
    1 Index: ipset-2.2.3/ipset.c 
    2 =================================================================== 
    3 --- ipset-2.2.3.orig/ipset.c    2007-06-04 13:22:37.544147704 +0200 
    4 +++ ipset-2.2.3/ipset.c 2007-06-04 13:22:37.644132504 +0200 
    5 @@ -21,7 +21,6 @@ 
     1diff -ruN ipset-2.2.3/ipset.c ipset-2.2.3.new/ipset.c 
     2--- ipset-2.2.3/ipset.c 2005-04-05 02:56:02.000000000 -0500 
     3+++ ipset-2.2.3.new/ipset.c     2007-05-31 14:05:13.763087750 -0500 
     4@@ -21,7 +21,7 @@ 
    65 #include <stdarg.h> 
    76 #include <netdb.h> 
    87 #include <dlfcn.h> 
    98-#include <asm/bitops.h> 
     9+#include <linux/bitops.h> 
    1010  
    1111 #include "ipset.h" 
    1212  
    13 Index: ipset-2.2.3/ipset_iphash.c 
    14 =================================================================== 
    15 --- ipset-2.2.3.orig/ipset_iphash.c     2007-06-04 13:22:37.550146792 +0200 
    16 +++ ipset-2.2.3/ipset_iphash.c  2007-06-04 13:22:37.644132504 +0200 
    17 @@ -25,7 +25,6 @@ 
     13diff -ruN ipset-2.2.3/ipset_iphash.c ipset-2.2.3.new/ipset_iphash.c 
     14--- ipset-2.2.3/ipset_iphash.c  2005-01-19 07:38:57.000000000 -0600 
     15+++ ipset-2.2.3.new/ipset_iphash.c      2007-05-31 14:05:32.212240750 -0500 
     16@@ -25,7 +25,7 @@ 
    1817 #include <sys/types.h> 
    1918 #include <netinet/in.h> 
    2019 #include <arpa/inet.h> 
    2120-#include <asm/bitops.h> 
     21+#include <linux/bitops.h> 
    2222 #include <asm/types.h> 
    2323  
    2424 #include <linux/netfilter_ipv4/ip_set_iphash.h> 
    25 Index: ipset-2.2.3/ipset_ipmap.c 
    26 =================================================================== 
    27 --- ipset-2.2.3.orig/ipset_ipmap.c      2007-06-04 13:22:37.556145880 +0200 
    28 +++ ipset-2.2.3/ipset_ipmap.c   2007-06-04 13:22:37.644132504 +0200 
    29 @@ -22,7 +22,6 @@ 
     25diff -ruN ipset-2.2.3/ipset_ipmap.c ipset-2.2.3.new/ipset_ipmap.c 
     26--- ipset-2.2.3/ipset_ipmap.c   2005-01-19 07:38:57.000000000 -0600 
     27+++ ipset-2.2.3.new/ipset_ipmap.c       2007-05-31 14:05:47.969225500 -0500 
     28@@ -22,7 +22,7 @@ 
    3029 #include <sys/socket.h> 
    3130 #include <netinet/in.h> 
    3231 #include <arpa/inet.h> 
    3332-#include <asm/bitops.h> 
     33+#include <linux/bitops.h> 
    3434  
    3535 #include <linux/netfilter_ipv4/ip_set_ipmap.h> 
    3636 #include "ipset.h" 
    37 Index: ipset-2.2.3/ipset_macipmap.c 
    38 =================================================================== 
    39 --- ipset-2.2.3.orig/ipset_macipmap.c   2007-06-04 13:22:37.561145120 +0200 
    40 +++ ipset-2.2.3/ipset_macipmap.c        2007-06-04 13:22:37.645132352 +0200 
    41 @@ -24,7 +24,6 @@ 
     37diff -ruN ipset-2.2.3/ipset_macipmap.c ipset-2.2.3.new/ipset_macipmap.c 
     38--- ipset-2.2.3/ipset_macipmap.c        2005-01-19 07:38:57.000000000 -0600 
     39+++ ipset-2.2.3.new/ipset_macipmap.c    2007-05-31 14:06:17.627079000 -0500 
     40@@ -24,7 +24,7 @@ 
    4241 #include <sys/socket.h> 
    4342 #include <netinet/in.h> 
    4443 #include <arpa/inet.h> 
    4544-#include <asm/bitops.h> 
     45+#include <linux/bitops.h> 
    4646 #include <linux/if_ether.h> 
    4747  
    4848 #include <linux/netfilter_ipv4/ip_set_macipmap.h> 
    49 Index: ipset-2.2.3/ipset_nethash.c 
    50 =================================================================== 
    51 --- ipset-2.2.3.orig/ipset_nethash.c    2007-06-04 13:22:37.567144208 +0200 
    52 +++ ipset-2.2.3/ipset_nethash.c 2007-06-04 13:22:37.645132352 +0200 
    53 @@ -25,7 +25,6 @@ 
     49diff -ruN ipset-2.2.3/ipset_nethash.c ipset-2.2.3.new/ipset_nethash.c 
     50--- ipset-2.2.3/ipset_nethash.c 2005-05-09 00:44:25.000000000 -0500 
     51+++ ipset-2.2.3.new/ipset_nethash.c     2007-05-31 14:06:43.392689250 -0500 
     52@@ -25,7 +25,7 @@ 
    5453 #include <sys/types.h> 
    5554 #include <netinet/in.h> 
    5655 #include <arpa/inet.h> 
    5756-#include <asm/bitops.h> 
     57+#include <linux/bitops.h> 
    5858 #include <asm/types.h> 
    5959  
    6060 #include <linux/netfilter_ipv4/ip_set_nethash.h> 
    61 Index: ipset-2.2.3/ipset_portmap.c 
    62 =================================================================== 
    63 --- ipset-2.2.3.orig/ipset_portmap.c    2007-06-04 13:22:37.573143296 +0200 
    64 +++ ipset-2.2.3/ipset_portmap.c 2007-06-04 13:22:37.645132352 +0200 
    65 @@ -21,7 +21,6 @@ 
     61diff -ruN ipset-2.2.3/ipset_portmap.c ipset-2.2.3.new/ipset_portmap.c 
     62--- ipset-2.2.3/ipset_portmap.c 2005-01-19 07:38:57.000000000 -0600 
     63+++ ipset-2.2.3.new/ipset_portmap.c     2007-05-31 14:06:58.521634750 -0500 
     64@@ -21,7 +21,7 @@ 
    6665 #include <sys/socket.h> 
    6766 #include <netinet/in.h> 
    6867 #include <arpa/inet.h> 
    6968-#include <asm/bitops.h> 
     69+#include <linux/bitops.h> 
    7070  
    7171 #include <linux/netfilter_ipv4/ip_set_portmap.h> 
Note: See TracChangeset for help on using the changeset viewer.