Changeset 15501


Ignore:
Timestamp:
2009-04-30T01:31:23+02:00 (9 years ago)
Author:
jow
Message:

[brcm-2.4] drop iptables 1.3.8 and switch to to 1.4.3.2, refresh layer7 kernel patches and add packages for libiptc + libxtables

Location:
trunk
Files:
1 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/iptables/Makefile

    r15487 r15501  
    1111PKG_NAME:=iptables 
    1212 
    13 ifeq ($(CONFIG_LINUX_2_4),y) 
    14   PKG_VERSION:=1.3.8 
    15   PKG_RELEASE:=4 
    16   PKG_MD5SUM:=0a9209f928002e5eee9cdff8fef4d4b3 
    17   MAKE_TARGETS:=experimental install-experimental install-devel 
    18 endif 
    19  
    20 ifeq ($(CONFIG_LINUX_2_6),y) 
    21   PKG_VERSION:=1.4.3.2 
    22   PKG_RELEASE:=1 
    23   PKG_MD5SUM:=545698693b636cfc844aafc6729fd48a 
    24 endif 
     13PKG_VERSION:=1.4.3.2 
     14PKG_RELEASE:=1 
     15PKG_MD5SUM:=545698693b636cfc844aafc6729fd48a 
    2516 
    2617PKG_VERSION?=<IPTABLES_VERSION> 
     
    4132endif 
    4233 
     34 
     35define Package/libiptc 
     36  SECTION:=libs 
     37  CATEGORY:=Libraries 
     38  URL:=http://netfilter.org/ 
     39  TITLE:=IPv4/IPv6 firewall - shared libiptc library 
     40endef 
     41 
     42define Package/libxtables 
     43  SECTION:=libs 
     44  CATEGORY:=Libraries 
     45  URL:=http://netfilter.org/ 
     46  TITLE:=IPv4/IPv6 firewall - shared xtables library 
     47endef 
     48 
     49 
    4350define Package/iptables/Default 
    4451  SECTION:=net 
    4552  CATEGORY:=Base system 
    4653  URL:=http://netfilter.org/ 
     54  DEPENDS:=+libiptc +libxtables 
    4755endef 
    4856 
     
    107115 
    108116define Package/iptables-mod-imq 
    109 $(call Package/iptables/Module, +kmod-ipt-imq @!LINUX_2_6_27) 
     117$(call Package/iptables/Module, +kmod-ipt-imq) 
    110118  TITLE:=IMQ support 
    111119endef 
     
    242250endef 
    243251 
    244 ifeq ($(KERNEL),2.4) 
    245   define Build/Configure 
    246         chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* 
    247         rm -f $(PKG_BUILD_DIR)/.configured* 
    248         $(MAKE) -C $(PKG_BUILD_DIR) \ 
    249                 clean 
    250   endef 
    251 endif 
    252  
    253252TARGET_CPPFLAGS := -I$(PKG_BUILD_DIR)/include $(TARGET_CPPFLAGS) 
    254253TARGET_CFLAGS += $(FPIC) 
     
    288287endef 
    289288 
     289 
     290define Package/libiptc/install 
     291        $(INSTALL_DIR) $(1)/usr/lib 
     292        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so.0 $(1)/usr/lib/ 
     293endef 
     294 
     295define Package/libxtables/install 
     296        $(INSTALL_DIR) $(1)/usr/lib 
     297        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so.2 $(1)/usr/lib/ 
     298endef 
     299 
     300 
    290301define Package/iptables-utils/install 
    291302        $(INSTALL_DIR) $(1)/usr/sbin 
     
    324335        $(INSTALL_DIR) $$(1)/etc/l7-protocols; \ 
    325336        $(CP) files/l7/*.pat $$(1)/etc/l7-protocols/ 
     337 
     338 
     339$(eval $(call BuildPackage,libiptc)) 
     340$(eval $(call BuildPackage,libxtables)) 
    326341 
    327342$(eval $(call BuildPackage,iptables)) 
  • trunk/package/iptables/patches/1.4.3.2/002-layer7_2.17.patch

    r13458 r15501  
    1 diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_layer7.c 
    2 --- iptables.old/extensions/libxt_layer7.c      1970-01-01 01:00:00.000000000 +0100 
    3 +++ iptables.new/extensions/libxt_layer7.c      2008-08-22 16:00:52.000000000 +0200 
     1diff -Nur a/libxt_layer7.c b/libxt_layer7.c 
     2--- a/libxt_layer7.c    1970-01-01 01:00:00.000000000 +0100 
     3+++ b/libxt_layer7.c    2008-08-22 16:00:52.000000000 +0200 
    44@@ -0,0 +1,368 @@ 
    55+/*  
     
    371371+       xtables_register_match(&layer7); 
    372372+} 
    373 diff -Nur iptables.old/extensions/libxt_layer7.man iptables.new/extensions/libxt_layer7.man 
    374 --- iptables.old/extensions/libxt_layer7.man    1970-01-01 01:00:00.000000000 +0100 
    375 +++ iptables.new/extensions/libxt_layer7.man    2008-08-22 16:00:52.000000000 +0200 
     373diff -Nur a/libxt_layer7.man b/libxt_layer7.man 
     374--- a/libxt_layer7.man  1970-01-01 01:00:00.000000000 +0100 
     375+++ b/libxt_layer7.man  2008-08-22 16:00:52.000000000 +0200 
    376376@@ -0,0 +1,14 @@ 
    377377+This module matches packets based on the application layer data of  
  • trunk/package/iptables/patches/1.4.3.2/005-imq1.patch

    r13458 r15501  
    1 --- iptables-1.4.1-rc3.orig/extensions/.IMQ-test        1970-01-01 10:00:00.000000000 +1000 
    2 +++ iptables-1.4.1-rc3/extensions/.IMQ-test     2008-06-08 22:41:49.000000000 +1000 
     1--- /dev/null 
     2+++ b/extensions/.IMQ-test 
    33@@ -0,0 +1,3 @@ 
    44+#!/bin/sh 
    55+# True if IMQ target patch is applied. 
    66+[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_IMQ.h ] && echo IMQ 
    7 diff -pruN iptables-1.4.1-rc3.orig/extensions/.IMQ-test6 iptables-1.4.1-rc3/extensions/.IMQ-test6 
    8 --- iptables-1.4.1-rc3.orig/extensions/.IMQ-test6       1970-01-01 10:00:00.000000000 +1000 
    9 +++ iptables-1.4.1-rc3/extensions/.IMQ-test6    2008-06-08 22:41:49.000000000 +1000 
     7--- /dev/null 
     8+++ b/extensions/.IMQ-test6 
    109@@ -0,0 +1,3 @@ 
    1110+#!/bin/sh 
    1211+# True if IMQ target patch is applied. 
    1312+[ -f $KERNEL_DIR/include/linux/netfilter_ipv6/ip6t_IMQ.h ] && echo IMQ 
    14 diff -pruN iptables-1.4.1-rc3.orig/extensions/libip6t_IMQ.c iptables-1.4.1-rc3/extensions/libip6t_IMQ.c 
    15 --- iptables-1.4.1-rc3.orig/extensions/libip6t_IMQ.c    1970-01-01 10:00:00.000000000 +1000 
    16 +++ iptables-1.4.1-rc3/extensions/libip6t_IMQ.c 2008-06-08 22:46:57.000000000 +1000 
    17 @@ -0,0 +1,89 @@ 
     13--- /dev/null 
     14+++ b/extensions/libip6t_IMQ.c 
     15@@ -0,0 +1,90 @@ 
    1816+/* Shared library add-on to iptables to add IMQ target support. */ 
    1917+#include <stdio.h> 
     
    2220+#include <getopt.h> 
    2321+ 
     22+#include <xtables.h> 
    2423+#include <ip6tables.h> 
    2524+#include <linux/netfilter_ipv6/ip6_tables.h> 
     
    5857+       switch(c) { 
    5958+       case '1': 
    60 +               if (check_inverse(optarg, &invert, NULL, 0)) 
    61 +                       exit_error(PARAMETER_PROBLEM, 
     59+               if (xtables_check_inverse(optarg, &invert, NULL, 0)) 
     60+                       xtables_error(PARAMETER_PROBLEM, 
    6261+                                  "Unexpected `!' after --todev"); 
    6362+               mr->todev=atoi(optarg); 
     
    105104+       xtables_register_target(&imq); 
    106105+} 
    107 diff -pruN iptables-1.4.1-rc3.orig/extensions/libipt_IMQ.c iptables-1.4.1-rc3/extensions/libipt_IMQ.c 
    108 --- iptables-1.4.1-rc3.orig/extensions/libipt_IMQ.c     1970-01-01 10:00:00.000000000 +1000 
    109 +++ iptables-1.4.1-rc3/extensions/libipt_IMQ.c  2008-06-08 22:46:25.000000000 +1000 
    110 @@ -0,0 +1,88 @@ 
     106--- /dev/null 
     107+++ b/extensions/libipt_IMQ.c 
     108@@ -0,0 +1,89 @@ 
    111109+/* Shared library add-on to iptables to add IMQ target support. */ 
    112110+#include <stdio.h> 
     
    115113+#include <getopt.h> 
    116114+ 
     115+#include <xtables.h> 
    117116+#include <iptables.h> 
    118117+#include <linux/netfilter_ipv4/ip_tables.h> 
     
    150149+       switch(c) { 
    151150+       case '1': 
    152 +               if (check_inverse(optarg, &invert, NULL, 0)) 
    153 +                       exit_error(PARAMETER_PROBLEM, 
     151+               if (xtables_check_inverse(optarg, &invert, NULL, 0)) 
     152+                       xtables_error(PARAMETER_PROBLEM, 
    154153+                                  "Unexpected `!' after --todev"); 
    155154+               mr->todev=atoi(optarg); 
Note: See TracChangeset for help on using the changeset viewer.