Irgendwie war da der falsche Patch noch drinne...

Sowas von peinlich aber auch...


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@674 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-07-11 18:48:22 +00:00
parent c284c7522c
commit 83cace344d
2 changed files with 221 additions and 222 deletions

View File

@@ -86,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.9.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.9/iptables-layer7-2.9.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.3.6-imq.diff
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.3.0-imq1.diff
chmod +x $(DIR_APP)/extensions/.IMQ-test* $(DIR_APP)/extensions/.layer7-test*
# hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present

View File

@@ -1,11 +1,11 @@
--- iptables-1.3.6.orig/extensions.orig/.IMQ-test6 Thu Jan 1 01:00:00 1970
+++ iptables-1.3.6/extensions/.IMQ-test6 Mon Jun 16 10:12:47 2003
--- userspace/extensions.orig/.IMQ-test6 Thu Jan 1 01:00:00 1970
+++ userspace/extensions/.IMQ-test6 Mon Jun 16 10:12:47 2003
@@ -0,0 +1,3 @@
+#!/bin/sh
+# True if IMQ target patch is applied.
+[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_IMQ.c ] && echo IMQ
--- iptables-1.3.6.orig/extensions.orig/libip6t_IMQ.c Thu Jan 1 01:00:00 1970
+++ iptables-1.3.6/extensions/libip6t_IMQ.c Mon Jun 16 10:12:47 2003
--- userspace/extensions.orig/libip6t_IMQ.c Thu Jan 1 01:00:00 1970
+++ userspace/extensions/libip6t_IMQ.c Mon Jun 16 10:12:47 2003
@@ -0,0 +1,101 @@
+/* Shared library add-on to iptables to add IMQ target support. */
+#include <stdio.h>
@@ -104,18 +104,18 @@
+ .extra_opts = opts
+};
+
+static __attribute__((constructor)) void _init(void)
+void _init(void)
+{
+ register_target6(&imq);
+}
--- iptables-1.3.6.orig/extensions.orig/.IMQ-test Thu Jan 1 01:00:00 1970
+++ iptables-1.3.6/extensions/.IMQ-test Mon Jun 16 10:12:47 2003
--- userspace/extensions.orig/.IMQ-test Thu Jan 1 01:00:00 1970
+++ userspace/extensions/.IMQ-test Mon Jun 16 10:12:47 2003
@@ -0,0 +1,3 @@
+#!/bin/sh
+# True if IMQ target patch is applied.
+[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ
--- iptables-1.3.6.orig/extensions.orig/libipt_IMQ.c Thu Jan 1 01:00:00 1970
+++ iptables-1.3.6/extensions/libipt_IMQ.c Mon Jun 16 10:12:47 2003
--- userspace/extensions.orig/libipt_IMQ.c Thu Jan 1 01:00:00 1970
+++ userspace/extensions/libipt_IMQ.c Mon Jun 16 10:12:47 2003
@@ -0,0 +1,101 @@
+/* Shared library add-on to iptables to add IMQ target support. */
+#include <stdio.h>
@@ -214,8 +214,7 @@
+ .extra_opts = opts
+};
+
+static __attribute__((constructor)) void _init(void)
+void _init(void)
+{
+ register_target(&imq);
+}