- IMQ uptated to iptables-1.4.12-IMQ-test4.diff

Changed files:
    iptables-imq.patch -> 1.6
    iptables.spec -> 1.310

diff --git a/iptables-imq.patch b/iptables-imq.patch
index f850991d8cb296a4c019f1c810ab5ce39f48d61c..5ce17e1b4569ef564444e9b9c89559abdc6bb611 100644 (file)
--- a/iptables-imq.patch
+++ b/iptables-imq.patch
@@ -1,7 +1,7 @@
-diff -Naurw /dev/null extensions/libxt_IMQ.c
---- /dev/null                  1969-12-31 21:00:00.000000000 -0300
-+++ extensions/libxt_IMQ.c     2008-06-24 22:31:02.000000000 -0300
-@@ -0,0 +1,103 @@
+diff -Naur iptables-1.4.12.1/extensions/libxt_IMQ.c iptables-1.4.12.1-imq/extensions/libxt_IMQ.c
+--- iptables-1.4.12.1/extensions/libxt_IMQ.c   1970-01-01 02:00:00.000000000 +0200
++++ iptables-1.4.12.1-imq/extensions/libxt_IMQ.c       2011-09-30 13:53:21.000000000 +0300
+@@ -0,0 +1,105 @@
 +/* Shared library add-on to iptables to add IMQ target support. */
 +#include <stdio.h>
 +#include <string.h>
@@ -43,11 +43,13 @@ diff -Naurw /dev/null extensions/libxt_IMQ.c
 +      
 +      switch(c) {
 +      case '1':
-+              if (xtables_check_inverse(optarg, &invert, NULL, 0, argv))
++/*            if (xtables_check_inverse(optarg, &invert, NULL, 0, argv))
 +                      xtables_error(PARAMETER_PROBLEM,
 +                                 "Unexpected `!' after --todev");
++*/
 +              mr->todev=atoi(optarg);
 +              break;
++
 +      default:
 +              return 0;
 +      }
@@ -69,7 +71,7 @@ diff -Naurw /dev/null extensions/libxt_IMQ.c
 +{
 +      struct xt_imq_info *mr = (struct xt_imq_info*)target->data;
 +
-+      printf("--todev %u", mr->todev);
++      printf(" --todev %u", mr->todev);
 +}
 +
 +static struct xtables_target imq_target = {
@@ -105,9 +107,28 @@ diff -Naurw /dev/null extensions/libxt_IMQ.c
 +      xtables_register_target(&imq_target);
 +      xtables_register_target(&imq_target6);
 +}
-diff -Naurw /dev/null extensions/libxt_IMQ.c
---- /dev/null                          1970-01-01 02:00:00.000000000 +0200
-+++ include/linux/netfilter/xt_IMQ.h   2008-08-05 00:41:28.000000000 +0300
+diff -Naur iptables-1.4.12.1/extensions/libxt_IMQ.man iptables-1.4.12.1-imq/extensions/libxt_IMQ.man
+--- iptables-1.4.12.1/extensions/libxt_IMQ.man 1970-01-01 02:00:00.000000000 +0200
++++ iptables-1.4.12.1-imq/extensions/libxt_IMQ.man     2011-09-30 13:53:21.000000000 +0300
+@@ -0,0 +1,15 @@
++This target is used to redirect the traffic to the IMQ driver and you can apply
++QoS rules like HTB or CBQ.
++For example you can select only traffic comming from a specific interface or
++is going out on a specific interface.
++Also it permits to capture the traffic BEFORE NAT in the case of outgoing traffic
++or AFTER NAT in the case of incomming traffic.
++.TP
++\fB\-\-to\-dev\fP \fIvalue\fP
++Set the IMQ interface where to send this traffic
++.TP
++Example:
++.TP
++Redirect incomming traffic from interface eth0 to imq0 and outgoing traffic to imq1:
++iptables \-t mangle \-A FORWARD \-i eth0 \-j IMQ \-\-to\-dev 0
++iptables \-t mangle \-A FORWARD \-o eth0 \-j IMQ \-\-to\-dev 1
+diff -Naur iptables-1.4.12.1/include/linux/netfilter/xt_IMQ.h iptables-1.4.12.1-imq/include/linux/netfilter/xt_IMQ.h
+--- iptables-1.4.12.1/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ iptables-1.4.12.1-imq/include/linux/netfilter/xt_IMQ.h     2011-09-30 13:53:21.000000000 +0300
 @@ -0,0 +1,9 @@
 +#ifndef _XT_IMQ_H
 +#define _XT_IMQ_H

diff --git a/iptables.spec b/iptables.spec
index e19f09defbb1a238872455f6759bacc41e51cfd4..5f563d0bbca3f49908d084704dc46618bc526d02 100644 (file)
--- a/iptables.spec
+++ b/iptables.spec
@@ -33,7 +33,7 @@ Summary(uk.UTF-8):    Утиліти для керування пакетними 
 Summary(zh_CN.UTF-8):  Linux内核包过滤管理工具
 Name:          iptables
 Version:       1.4.12.2
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
@@ -57,7 +57,7 @@ Patch10:      %{name}-20070806.patch
 Patch11:       %{name}-layer7.patch
 # ipt_rpc
 Patch12:       %{name}-old-1.3.7.patch
-# xt_IMQ; based on http://www.linuximq.net/patchs/iptables-1.4.6-imq.diff
+# xt_IMQ; http://linuximq.net/patchs/iptables-1.4.12-IMQ-test4.diff
 Patch13:       %{name}-imq.patch
 # enhances ipt_owner/ip6t_owner; http://people.linux-vserver.org/~dhozac/p/m/iptables-1.3.5-owner-xid.patch (currently disabled, needs update for xt_owner)
 Patch14:       %{name}-1.3.5-owner-xid.patch
@@ -189,7 +189,7 @@ iptables(8).
 %{?with_ipt_IPV4OPTSSTRIP:%patch10 -p1}
 %{?with_xt_layer7:%patch11 -p1}
 %{?with_ipt_rpc:%patch12 -p1}
-%patch13 -p0
+%patch13 -p1
 %if %{with vserver}
 #patch14 -p1
 %patch15 -p1