summaryrefslogtreecommitdiff
path: root/package/iptables
diff options
context:
space:
mode:
authorTim Yardley <lst@openwrt.org>2007-07-31 20:28:55 +0000
committerTim Yardley <lst@openwrt.org>2007-07-31 20:28:55 +0000
commit782d02ed1b2362ebe110ec5b991c8adddf5850e6 (patch)
tree96d7570c05bcd0ac4f42cc234531bf239431e5aa /package/iptables
parent6b960df54ff42b9607f717bd1011de5a33aba80f (diff)
downloadmtk-20170518-782d02ed1b2362ebe110ec5b991c8adddf5850e6.zip
mtk-20170518-782d02ed1b2362ebe110ec5b991c8adddf5850e6.tar.gz
mtk-20170518-782d02ed1b2362ebe110ec5b991c8adddf5850e6.tar.bz2
iptables: refresh patches to 1.3.8
SVN-Revision: 8286
Diffstat (limited to 'package/iptables')
-rw-r--r--package/iptables/patches/001-ipp2p-0.8.1rc1.patch14
-rw-r--r--package/iptables/patches/002-layer7-1.5nbd.patch16
-rw-r--r--package/iptables/patches/004-multiport_v1.patch18
-rw-r--r--package/iptables/patches/005-imq1.patch16
-rw-r--r--package/iptables/patches/006-iprange-typesh.patch6
-rw-r--r--package/iptables/patches/008-chaostables.patch24
6 files changed, 47 insertions, 47 deletions
diff --git a/package/iptables/patches/001-ipp2p-0.8.1rc1.patch b/package/iptables/patches/001-ipp2p-0.8.1rc1.patch
index 0639741..7ca62d2 100644
--- a/package/iptables/patches/001-ipp2p-0.8.1rc1.patch
+++ b/package/iptables/patches/001-ipp2p-0.8.1rc1.patch
@@ -1,7 +1,7 @@
-Index: iptables-1.3.7/extensions/Makefile
+Index: iptables-1.3.8/extensions/Makefile
===================================================================
---- iptables-1.3.7.orig/extensions/Makefile 2007-06-04 13:21:43.398379112 +0200
-+++ iptables-1.3.7/extensions/Makefile 2007-06-04 13:21:43.484366040 +0200
+--- iptables-1.3.8.orig/extensions/Makefile 2007-07-31 15:27:55.000000000 -0500
++++ iptables-1.3.8/extensions/Makefile 2007-07-31 15:27:55.000000000 -0500
@@ -13,6 +13,10 @@
PF6_EXT_SE_SLIB:=SECMARK CONNSECMARK
endif
@@ -13,10 +13,10 @@ Index: iptables-1.3.7/extensions/Makefile
# Optionals
PF_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
PF6_EXT_SLIB_OPTS:=$(foreach T,$(wildcard extensions/.*-test6),$(shell KERNEL_DIR=$(KERNEL_DIR) $(T)))
-Index: iptables-1.3.7/extensions/libipt_ipp2p.c
+Index: iptables-1.3.8/extensions/libipt_ipp2p.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/libipt_ipp2p.c 2007-06-04 13:21:43.485365888 +0200
++++ iptables-1.3.8/extensions/libipt_ipp2p.c 2007-07-31 15:27:55.000000000 -0500
@@ -0,0 +1,401 @@
+
+#include <stdio.h>
@@ -419,10 +419,10 @@ Index: iptables-1.3.7/extensions/libipt_ipp2p.c
+ register_match(&ipp2p);
+}
+
-Index: iptables-1.3.7/include/linux/netfilter_ipv4/ipt_ipp2p.h
+Index: iptables-1.3.8/include/linux/netfilter_ipv4/ipt_ipp2p.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/include/linux/netfilter_ipv4/ipt_ipp2p.h 2007-06-04 13:21:43.485365888 +0200
++++ iptables-1.3.8/include/linux/netfilter_ipv4/ipt_ipp2p.h 2007-07-31 15:27:55.000000000 -0500
@@ -0,0 +1,31 @@
+#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H
diff --git a/package/iptables/patches/002-layer7-1.5nbd.patch b/package/iptables/patches/002-layer7-1.5nbd.patch
index 1fc4fde..0de73a2 100644
--- a/package/iptables/patches/002-layer7-1.5nbd.patch
+++ b/package/iptables/patches/002-layer7-1.5nbd.patch
@@ -1,14 +1,14 @@
-Index: iptables-1.3.7/extensions/.layer7-test
+Index: iptables-1.3.8/extensions/.layer7-test
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/.layer7-test 2007-06-04 13:21:43.708331992 +0200
++++ iptables-1.3.8/extensions/.layer7-test 2007-07-31 15:27:56.000000000 -0500
@@ -0,0 +1,2 @@
+#! /bin/sh
+[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_layer7.h ] && echo layer7
-Index: iptables-1.3.7/extensions/ipt_layer7.h
+Index: iptables-1.3.8/extensions/ipt_layer7.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/ipt_layer7.h 2007-06-04 13:21:43.708331992 +0200
++++ iptables-1.3.8/extensions/ipt_layer7.h 2007-07-31 15:27:56.000000000 -0500
@@ -0,0 +1,27 @@
+/*
+ By Matthew Strait <quadong@users.sf.net>, Dec 2003.
@@ -37,10 +37,10 @@ Index: iptables-1.3.7/extensions/ipt_layer7.h
+};
+
+#endif /* _IPT_LAYER7_H */
-Index: iptables-1.3.7/extensions/libipt_layer7.c
+Index: iptables-1.3.8/extensions/libipt_layer7.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/libipt_layer7.c 2007-06-04 13:21:43.709331840 +0200
++++ iptables-1.3.8/extensions/libipt_layer7.c 2007-07-31 15:27:56.000000000 -0500
@@ -0,0 +1,358 @@
+/*
+ Shared library add-on to iptables to add layer 7 matching support.
@@ -400,10 +400,10 @@ Index: iptables-1.3.7/extensions/libipt_layer7.c
+{
+ register_match(&layer7);
+}
-Index: iptables-1.3.7/extensions/libipt_layer7.man
+Index: iptables-1.3.8/extensions/libipt_layer7.man
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/libipt_layer7.man 2007-06-04 13:21:43.709331840 +0200
++++ iptables-1.3.8/extensions/libipt_layer7.man 2007-07-31 15:27:56.000000000 -0500
@@ -0,0 +1,13 @@
+This module matches packets based on the application layer data of
+their connections. It uses regular expression matching to compare
diff --git a/package/iptables/patches/004-multiport_v1.patch b/package/iptables/patches/004-multiport_v1.patch
index 4682138..1acfe24 100644
--- a/package/iptables/patches/004-multiport_v1.patch
+++ b/package/iptables/patches/004-multiport_v1.patch
@@ -1,7 +1,7 @@
-Index: iptables-1.3.7/extensions/libipt_multiport.c
+Index: iptables-1.3.8/extensions/libipt_multiport.c
===================================================================
---- iptables-1.3.7.orig/extensions/libipt_multiport.c 2007-06-04 13:21:43.344387320 +0200
-+++ iptables-1.3.7/extensions/libipt_multiport.c 2007-06-04 13:21:43.932297944 +0200
+--- iptables-1.3.8.orig/extensions/libipt_multiport.c 2007-07-31 15:27:55.000000000 -0500
++++ iptables-1.3.8/extensions/libipt_multiport.c 2007-07-31 15:27:56.000000000 -0500
@@ -8,24 +8,6 @@
/* To ensure that iptables compiles with an old kernel */
#include "../include/linux/netfilter_ipv4/ipt_multiport.h"
@@ -27,7 +27,7 @@ Index: iptables-1.3.7/extensions/libipt_multiport.c
static void
help_v1(void)
{
-@@ -68,26 +50,6 @@
+@@ -70,26 +52,6 @@
}
}
@@ -54,8 +54,8 @@ Index: iptables-1.3.7/extensions/libipt_multiport.c
static void
parse_multi_ports_v1(const char *portstring,
struct ipt_multiport_v1 *multiinfo,
-@@ -153,58 +115,6 @@
- "multiport only works with TCP, UDP, SCTP and DCCP");
+@@ -156,58 +118,6 @@
+ "multiport only works with TCP, UDP, UDPLITE, SCTP and DCCP");
}
-/* Function which parses command options; returns true if it
@@ -113,7 +113,7 @@ Index: iptables-1.3.7/extensions/libipt_multiport.c
static int
parse_v1(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
-@@ -281,43 +191,6 @@
+@@ -284,43 +194,6 @@
printf("%s", service);
}
@@ -157,7 +157,7 @@ Index: iptables-1.3.7/extensions/libipt_multiport.c
static void
print_v1(const struct ipt_ip *ip,
const struct ipt_entry_match *match,
-@@ -361,34 +234,6 @@
+@@ -364,34 +237,6 @@
printf(" ");
}
@@ -192,7 +192,7 @@ Index: iptables-1.3.7/extensions/libipt_multiport.c
static void save_v1(const struct ipt_ip *ip,
const struct ipt_entry_match *match)
{
-@@ -424,19 +269,20 @@
+@@ -427,19 +272,20 @@
printf(" ");
}
diff --git a/package/iptables/patches/005-imq1.patch b/package/iptables/patches/005-imq1.patch
index 49ce9df..a374195 100644
--- a/package/iptables/patches/005-imq1.patch
+++ b/package/iptables/patches/005-imq1.patch
@@ -1,15 +1,15 @@
-Index: iptables-1.3.7/extensions/.IMQ-test6
+Index: iptables-1.3.8/extensions/.IMQ-test6
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/.IMQ-test6 2007-06-04 13:21:44.124268760 +0200
++++ iptables-1.3.8/extensions/.IMQ-test6 2007-07-31 15:27:56.000000000 -0500
@@ -0,0 +1,3 @@
+#!/bin/sh
+# True if IMQ target patch is applied.
+[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_IMQ.c ] && echo IMQ
-Index: iptables-1.3.7/extensions/libip6t_IMQ.c
+Index: iptables-1.3.8/extensions/libip6t_IMQ.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/libip6t_IMQ.c 2007-06-04 13:21:44.125268608 +0200
++++ iptables-1.3.8/extensions/libip6t_IMQ.c 2007-07-31 15:27:56.000000000 -0500
@@ -0,0 +1,101 @@
+/* Shared library add-on to iptables to add IMQ target support. */
+#include <stdio.h>
@@ -112,18 +112,18 @@ Index: iptables-1.3.7/extensions/libip6t_IMQ.c
+{
+ register_target6(&imq);
+}
-Index: iptables-1.3.7/extensions/.IMQ-test
+Index: iptables-1.3.8/extensions/.IMQ-test
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/.IMQ-test 2007-06-04 13:21:44.125268608 +0200
++++ iptables-1.3.8/extensions/.IMQ-test 2007-07-31 15:27:56.000000000 -0500
@@ -0,0 +1,3 @@
+#!/bin/sh
+# True if IMQ target patch is applied.
+[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ
-Index: iptables-1.3.7/extensions/libipt_IMQ.c
+Index: iptables-1.3.8/extensions/libipt_IMQ.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/libipt_IMQ.c 2007-06-04 13:21:44.125268608 +0200
++++ iptables-1.3.8/extensions/libipt_IMQ.c 2007-07-31 15:27:56.000000000 -0500
@@ -0,0 +1,101 @@
+/* Shared library add-on to iptables to add IMQ target support. */
+#include <stdio.h>
diff --git a/package/iptables/patches/006-iprange-typesh.patch b/package/iptables/patches/006-iprange-typesh.patch
index 4b4e16f..0ae544e 100644
--- a/package/iptables/patches/006-iprange-typesh.patch
+++ b/package/iptables/patches/006-iprange-typesh.patch
@@ -1,7 +1,7 @@
-Index: iptables-1.3.7/extensions/libipt_iprange.c
+Index: iptables-1.3.8/extensions/libipt_iprange.c
===================================================================
---- iptables-1.3.7.orig/extensions/libipt_iprange.c 2007-06-04 13:21:43.288395832 +0200
-+++ iptables-1.3.7/extensions/libipt_iprange.c 2007-06-04 13:21:44.343235472 +0200
+--- iptables-1.3.8.orig/extensions/libipt_iprange.c 2007-07-31 15:27:55.000000000 -0500
++++ iptables-1.3.8/extensions/libipt_iprange.c 2007-07-31 15:27:56.000000000 -0500
@@ -6,6 +6,7 @@
#include <getopt.h>
diff --git a/package/iptables/patches/008-chaostables.patch b/package/iptables/patches/008-chaostables.patch
index 25e686a..60b0779 100644
--- a/package/iptables/patches/008-chaostables.patch
+++ b/package/iptables/patches/008-chaostables.patch
@@ -1,21 +1,21 @@
-Index: iptables-1.3.7/extensions/.CHAOS-test
+Index: iptables-1.3.8/extensions/.CHAOS-test
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/.CHAOS-test 2007-06-04 13:21:44.537205984 +0200
++++ iptables-1.3.8/extensions/.CHAOS-test 2007-07-31 15:27:57.000000000 -0500
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -f "$KERNEL_DIR/include/linux/netfilter/xt_CHAOS.h" ] && echo "CHAOS";
-Index: iptables-1.3.7/extensions/.DELUDE-test
+Index: iptables-1.3.8/extensions/.DELUDE-test
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/.DELUDE-test 2007-06-04 13:21:44.537205984 +0200
++++ iptables-1.3.8/extensions/.DELUDE-test 2007-07-31 15:27:57.000000000 -0500
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "DELUDE";
-Index: iptables-1.3.7/extensions/libipt_CHAOS.c
+Index: iptables-1.3.8/extensions/libipt_CHAOS.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/libipt_CHAOS.c 2007-06-04 13:21:44.537205984 +0200
++++ iptables-1.3.8/extensions/libipt_CHAOS.c 2007-07-31 15:27:57.000000000 -0500
@@ -0,0 +1,111 @@
+/*
+ CHAOS target for iptables
@@ -128,10 +128,10 @@ Index: iptables-1.3.7/extensions/libipt_CHAOS.c
+ register_target(&libipt_chaos_info);
+ return;
+}
-Index: iptables-1.3.7/extensions/libipt_DELUDE.c
+Index: iptables-1.3.8/extensions/libipt_DELUDE.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/libipt_DELUDE.c 2007-06-04 13:21:44.537205984 +0200
++++ iptables-1.3.8/extensions/libipt_DELUDE.c 2007-07-31 15:27:57.000000000 -0500
@@ -0,0 +1,66 @@
+/*
+ DELUDE target for iptables
@@ -199,10 +199,10 @@ Index: iptables-1.3.7/extensions/libipt_DELUDE.c
+ register_target(&libipt_delude_info);
+ return;
+}
-Index: iptables-1.3.7/extensions/libipt_portscan.c
+Index: iptables-1.3.8/extensions/libipt_portscan.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/libipt_portscan.c 2007-06-04 13:21:44.538205832 +0200
++++ iptables-1.3.8/extensions/libipt_portscan.c 2007-07-31 15:27:57.000000000 -0500
@@ -0,0 +1,129 @@
+/*
+ portscan match for iptables
@@ -333,10 +333,10 @@ Index: iptables-1.3.7/extensions/libipt_portscan.c
+ register_match(&libipt_portscan_info);
+ return;
+}
-Index: iptables-1.3.7/extensions/.portscan-test
+Index: iptables-1.3.8/extensions/.portscan-test
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ iptables-1.3.7/extensions/.portscan-test 2007-06-04 13:21:44.538205832 +0200
++++ iptables-1.3.8/extensions/.portscan-test 2007-07-31 15:27:57.000000000 -0500
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -f "$KERNEL_DIR/include/linux/netfilter/xt_portscan.h" ] && echo "portscan";