[gentoo-commits] gentoo-x86 commit in net-firewall/iptables/files: iptables-1.4.2-hashlimit.patch iptables-1.4.2-libxt_iprange.c-build.patch iptables-1.4.2-owner-restore.patch iptables-1.4.2-libxt_TOS-compilation.patch

[Peter Volkov (pva)]

pva         09/01/21 18:36:10

  Added:                iptables-1.4.2-hashlimit.patch
                        iptables-1.4.2-libxt_iprange.c-build.patch
                        iptables-1.4.2-owner-restore.patch
                        iptables-1.4.2-libxt_TOS-compilation.patch
  Log:
  Some patches from upstream for misc build issues. Fixed hashlimit-htable-gcinterval save/restore issue, bug #254496, thank Михаил for report. Fixed save/restore issue for -m owner, bug #255113, thank Andrew Savchenko for report.
  (Portage version: 2.2_rc23/cvs/Linux i686)

Revision  Changes    Path
1.1                  net-firewall/iptables/files/iptables-1.4.2-hashlimit.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.2-hashlimit.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.2-hashlimit.patch?rev=1.1&content-type=text/plain

Index: iptables-1.4.2-hashlimit.patch
===================================================================
Author: pva@g.o
Fixes bug http://bugs.gentoo.org/show_bug.cgi?id=254496

=== modified file 'extensions/libxt_hashlimit.c'
--- extensions/libxt_hashlimit.c	2009-01-21 18:23:22 +0000
+++ extensions/libxt_hashlimit.c	2009-01-21 18:23:32 +0000
@@ -636,7 +636,7 @@
 	if (info->cfg.max != 0)
 		printf("--hashlimit-htable-max %u ", info->cfg.max);
 	if (info->cfg.gc_interval != XT_HASHLIMIT_GCINTERVAL)
-		printf("--hashlimit-htable-gcinterval %u", info->cfg.gc_interval);
+		printf("--hashlimit-htable-gcinterval %u ", info->cfg.gc_interval);
 	if (info->cfg.expire != XT_HASHLIMIT_EXPIRE)
 		printf("--hashlimit-htable-expire %u ", info->cfg.expire);
 




1.1                  net-firewall/iptables/files/iptables-1.4.2-libxt_iprange.c-build.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.2-libxt_iprange.c-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.2-libxt_iprange.c-build.patch?rev=1.1&content-type=text/plain

Index: iptables-1.4.2-libxt_iprange.c-build.patch
===================================================================
From: Thomas Jarosch <thomas.jarosch@×××××××××.com>
Date: Thu, 23 Oct 2008 13:40:52 +0000 (+0200)
Subject: Fix compile error in libxt_iprange.c using gcc 4.3.2
X-Git-Tag: v1.4.3-rc1~12
X-Git-Url: https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=240eee607ab7e5bb9f671b7ceba40e2940182f61

Fix compile error in libxt_iprange.c using gcc 4.3.2

In file included from libxt_iprange.c:9:
../include/linux/netfilter.h:43: error: field 'in' has incomplete type
../include/linux/netfilter.h:44: error: field 'in6' has incomplete type
libxt_iprange.c: In function 'parse_iprange':
libxt_iprange.c:46: error: dereferencing pointer to incomplete type
libxt_iprange.c:53: error: dereferencing pointer to incomplete type
libxt_iprange.c: In function 'iprange_mt4_parse':
libxt_iprange.c:117: error: dereferencing pointer to incomplete type
libxt_iprange.c:121: error: dereferencing pointer to incomplete type
libxt_iprange.c:136: error: dereferencing pointer to incomplete type
libxt_iprange.c:140: error: dereferencing pointer to incomplete type
libxt_iprange.c: In function 'iprange_mt6_parse':
libxt_iprange.c:167: error: dereferencing pointer to incomplete type
libxt_iprange.c:171: error: dereferencing pointer to incomplete type
libxt_iprange.c:186: error: dereferencing pointer to incomplete type
libxt_iprange.c:190: error: dereferencing pointer to incomplete type

Signed-off-by: Thomas Jarosch <thomas.jarosch@×××××××××.com>
---

diff --git a/extensions/libxt_iprange.c b/extensions/libxt_iprange.c
index 503372f..ee87a6f 100644
--- a/extensions/libxt_iprange.c
+++ b/extensions/libxt_iprange.c
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 
+#include <netinet/in.h>
 #include <xtables.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter/xt_iprange.h>



1.1                  net-firewall/iptables/files/iptables-1.4.2-owner-restore.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.2-owner-restore.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.2-owner-restore.patch?rev=1.1&content-type=text/plain

Index: iptables-1.4.2-owner-restore.patch
===================================================================
From: Daniel Drake <dsd@g.o>
Date: Mon, 19 Jan 2009 14:36:41 +0000 (+0100)
Subject: libxt_owner: add more spaces to output
X-Git-Url: https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=cfb9cf0509ad8100cd8d6ab52d60a8ffbb318578

libxt_owner: add more spaces to output

Commit bb9284d1 ("libxt_owner: add spaces to output") moved the printing
of spaces away from the owner_mt_print() function family, but forgot to
add spaces in all of the print_item() functions that are called.

This is likely to be at least the partial cause of
https://bugs.gentoo.org/show_bug.cgi?id=254435

Signed-off-by: Daniel Drake <dsd@g.o>
Approves-of-this-patch: Jan Engelhardt <jengelh@×××××××.de>
Signed-off-by: Patrick McHardy <kaber@×××××.net>
---

diff --git a/extensions/libxt_owner.c b/extensions/libxt_owner.c
index 298075e..4cd173e 100644
--- a/extensions/libxt_owner.c
+++ b/extensions/libxt_owner.c
@@ -324,7 +324,7 @@ owner_mt_print_item_v0(const struct ipt_owner_info *info, const char *label,
 		return;
 	if (info->invert & flag)
 		printf("! ");
-	printf(label);
+	printf("%s ", label);
 
 	switch (info->match & flag) {
 	case IPT_OWNER_UID:
@@ -375,7 +375,7 @@ owner_mt6_print_item_v0(const struct ip6t_owner_info *info, const char *label,
 		return;
 	if (info->invert & flag)
 		printf("! ");
-	printf(label);
+	printf("%s ", label);
 
 	switch (info->match & flag) {
 	case IP6T_OWNER_UID:



1.1                  net-firewall/iptables/files/iptables-1.4.2-libxt_TOS-compilation.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.2-libxt_TOS-compilation.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/iptables/files/iptables-1.4.2-libxt_TOS-compilation.patch?rev=1.1&content-type=text/plain

Index: iptables-1.4.2-libxt_TOS-compilation.patch
===================================================================
From: Jirí Moravec <jim.lkml@×××××.com>
Date: Wed, 22 Oct 2008 06:57:38 +0000 (+0200)
Subject: libxt_TOS: fix compilation error
X-Git-Tag: v1.4.3-rc1~15
X-Git-Url: https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commitdiff_plain;h=56156cda196154aa015b7df030a2a9bbf34f4fcc

libxt_TOS: fix compilation error

Fix compilation error caused by double definition of IPPROTO_SCTP:

In file included from /usr/include/netinet/ip.h:25,
                 from /usr/include/linux/ip.h:19,
                 from tos_values.c:4,
                 from libxt_TOS.c:15:
/usr/include/netinet/in.h:84: error: expected identifier before numeric constant
make[2]: *** [libxt_TOS.oo] Error 1

Signed-off-by: Patrick McHardy <kaber@×××××.net>
---

diff --git a/extensions/libxt_TOS.c b/extensions/libxt_TOS.c
index 9ce8473..55a7172 100644
--- a/extensions/libxt_TOS.c
+++ b/extensions/libxt_TOS.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <netinet/in.h>
 
 #include <xtables.h>
 #include <linux/netfilter/xt_DSCP.h>