Author: zbyniu Date: Thu Feb 23 08:30:46 2012 GMT Module: packages Tag: HEAD ---- Log message: - IMQ uptated to iptables-1.4.12-IMQ-test4.diff
---- Files affected: packages/iptables: iptables.spec (1.309 -> 1.310) , iptables-imq.patch (1.5 -> 1.6) ---- Diffs: ================================================================ Index: packages/iptables/iptables.spec diff -u packages/iptables/iptables.spec:1.309 packages/iptables/iptables.spec:1.310 --- packages/iptables/iptables.spec:1.309 Tue Jan 3 18:48:03 2012 +++ packages/iptables/iptables.spec Thu Feb 23 09:30:41 2012 @@ -34,7 +34,7 @@ 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 @@ -58,7 +58,7 @@ 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 @@ -190,7 +190,7 @@ %{?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 @@ -433,6 +433,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.310 2012/02/23 08:30:41 zbyniu +- IMQ uptated to iptables-1.4.12-IMQ-test4.diff + Revision 1.309 2012/01/03 17:48:03 arekm - up to 1.4.12.2 ================================================================ Index: packages/iptables/iptables-imq.patch diff -u packages/iptables/iptables-imq.patch:1.5 packages/iptables/iptables-imq.patch:1.6 --- packages/iptables/iptables-imq.patch:1.5 Mon Jun 7 22:41:25 2010 +++ packages/iptables/iptables-imq.patch Thu Feb 23 09:30:41 2012 @@ -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 @@ + + 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 @@ +{ + 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 @@ + 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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.spec?r1=1.309&r2=1.310&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables-imq.patch?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
