revert iproute2 to the old version until the new one is fixed (#3026)

[openwrt.git] / package / iptables / patches / 005-imq1.patch

diff --git a/package/iptables/patches/005-imq1.patch b/package/iptables/patches/005-imq1.patch
index 4591890..a374195 100644 (file)
--- a/package/iptables/patches/005-imq1.patch
+++ b/package/iptables/patches/005-imq1.patch
@@ -1,20 +1,15 @@
-diff -urN iptables.old/extensions/.IMQ-test iptables.dev/extensions/.IMQ-test
---- iptables.old/extensions/.IMQ-test  1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/.IMQ-test  2005-10-09 01:00:36.358959750 +0200
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+# True if IMQ target patch is applied.
-+[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ
-diff -urN iptables.old/extensions/.IMQ-test6 iptables.dev/extensions/.IMQ-test6
---- iptables.old/extensions/.IMQ-test6 1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/.IMQ-test6 2005-10-09 01:00:36.358959750 +0200
+Index: iptables-1.3.8/extensions/.IMQ-test6
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ 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
 @@ -0,0 +1,3 @@
 +#!/bin/sh
 +# True if IMQ target patch is applied.
 +[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_IMQ.c ] && echo IMQ

-diff -urN iptables.old/extensions/libip6t_IMQ.c iptables.dev/extensions/libip6t_IMQ.c
---- iptables.old/extensions/libip6t_IMQ.c      1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/libip6t_IMQ.c      2005-10-09 01:00:36.358959750 +0200
+Index: iptables-1.3.8/extensions/libip6t_IMQ.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ 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>
 @@ -0,0 +1,101 @@
 +/* Shared library add-on to iptables to add IMQ target support. */
 +#include <stdio.h>


@@ -113,13 +108,22 @@ diff -urN iptables.old/extensions/libip6t_IMQ.c iptables.dev/extensions/libip6t_
 +      .extra_opts     = opts
 +};
 +
 +      .extra_opts     = opts
 +};
 +

-+void _init(void)
++static __attribute__((constructor)) void _init(void)

 +{
 +      register_target6(&imq);
 +}
 +{
 +      register_target6(&imq);
 +}

-diff -urN iptables.old/extensions/libipt_IMQ.c iptables.dev/extensions/libipt_IMQ.c
---- iptables.old/extensions/libipt_IMQ.c       1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/libipt_IMQ.c       2005-10-09 01:00:36.358959750 +0200
+Index: iptables-1.3.8/extensions/.IMQ-test
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ 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.8/extensions/libipt_IMQ.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ 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>
 @@ -0,0 +1,101 @@
 +/* Shared library add-on to iptables to add IMQ target support. */
 +#include <stdio.h>


@@ -218,7 +222,7 @@ diff -urN iptables.old/extensions/libipt_IMQ.c iptables.dev/extensions/libipt_IM
 +      .extra_opts     = opts
 +};
 +
 +      .extra_opts     = opts
 +};
 +

-+void _init(void)
++static __attribute__((constructor)) void _init(void)

 +{
 +      register_target(&imq);
 +}
 +{
 +      register_target(&imq);
 +}