iptables fixes 20110705

iptables fixes 20110705

[Jan Engelhardt]

The following changes since commit 411b390f3ffcd4708a0dfc0f2824a637de511cea:

  Merge branch 'master' of git://dev.medozas.de/iptables (2011-06-30 13:35:56 +0200)

are available in the git repository at:

  git://dev.medozas.de/iptables master

Jan Engelhardt (4):
      build: install modules in arch-dependent location
      doc: fix version string in ip6tables.8
      doc: the -m option cannot be inverted
      iptables: restore negation for -f

 INSTALL                 |    2 +-
 configure.ac            |    2 +-
 iptables/ip6tables.8.in |    5 +----
 iptables/iptables.8.in  |    3 ---
 iptables/iptables.c     |    2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

[PATCH 1/4] build: install modules in arch-dependent location

[Jan Engelhardt]

Make it possible to have multiple types of ELF classes for the
extension modules by putting them in an arch-dependent path.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 INSTALL      |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index acb56cd..e17e844 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,7 +31,7 @@ Configuring and compiling
 --with-xtlibdir=
 
 	The path to where Xtables extensions should be installed to. It
-	defaults to ${prefix}/libexec/xtables.
+	defaults to ${libdir}/xtables.
 
 --enable-devel (or --disable-devel)
 
diff --git a/configure.ac b/configure.ac
index 6c90caa..5cb1b1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_ARG_WITH([xtlibdir],
 	AS_HELP_STRING([--with-xtlibdir=PATH],
 	[Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]),
 	[xtlibdir="$withval"],
-	[xtlibdir="${libexecdir}/xtables"])
+	[xtlibdir="${libdir}/xtables"])
 AC_ARG_ENABLE([ipv4],
 	AS_HELP_STRING([--disable-ipv4], [Do not build iptables]),
 	[enable_ipv4="$enableval"], [enable_ipv4="yes"])
-- 
1.7.3.4

[PATCH 2/4] doc: fix version string in ip6tables.8

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 iptables/ip6tables.8.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/iptables/ip6tables.8.in b/iptables/ip6tables.8.in
index 20e271d..0f7e3cc 100644
--- a/iptables/ip6tables.8.in
+++ b/iptables/ip6tables.8.in
@@ -1,4 +1,4 @@
-.TH IP6TABLES 8 "" "iptables 1.4.4" "iptables 1.4.4"
+.TH IP6TABLES 8 "" "@PACKAGE_AND_VERSION@" "@PACKAGE_AND_VERSION@"
 .\"
 .\" Man page written by Andras Kis-Szabo <kisza@sch.bme.hu>
 .\" It is based on iptables man page.
-- 
1.7.3.4

[PATCH 3/4] doc: the -m option cannot be inverted

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 iptables/ip6tables.8.in |    3 ---
 iptables/iptables.8.in  |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/iptables/ip6tables.8.in b/iptables/ip6tables.8.in
index 0f7e3cc..748cebb 100644
--- a/iptables/ip6tables.8.in
+++ b/iptables/ip6tables.8.in
@@ -366,9 +366,6 @@ module.  You can specify multiple extended match modules in one line,
 and you can use the \fB\-h\fP or \fB\-\-help\fP
 options after the module has been specified to receive help specific
 to that module.
-.PP
-The following are included in the base package, and most of these can
-be preceded by a "\fB!\fP" to invert the sense of the match.
 .\" @MATCH@
 .SH TARGET EXTENSIONS
 ip6tables can use extended target modules: the following are included
diff --git a/iptables/iptables.8.in b/iptables/iptables.8.in
index 3b717a1..24618b7 100644
--- a/iptables/iptables.8.in
+++ b/iptables/iptables.8.in
@@ -365,9 +365,6 @@ module.  You can specify multiple extended match modules in one line,
 and you can use the \fB\-h\fP or \fB\-\-help\fP
 options after the module has been specified to receive help specific
 to that module.
-.PP
-The following are included in the base package, and most of these can
-be preceded by a "\fB!\fP" to invert the sense of the match.
 .\" @MATCH@
 .SH TARGET EXTENSIONS
 iptables can use extended target modules: the following are included
-- 
1.7.3.4

[PATCH 4/4] iptables: restore negation for -f

[Jan Engelhardt]

This move was missed in commit v1.4.11~77^2~6.

References: http://bugs.debian.org/632695
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 iptables/iptables.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/iptables/iptables.c b/iptables/iptables.c
index 477e8f1..6ceaf6b 100644
--- a/iptables/iptables.c
+++ b/iptables/iptables.c
@@ -178,9 +178,9 @@ static const int inverse_for_options[NUMBER_OF_OPT] =
 /* -x */ 0,
 /* -i */ IPT_INV_VIA_IN,
 /* -o */ IPT_INV_VIA_OUT,
-/* -f */ IPT_INV_FRAG,
 /*--line*/ 0,
 /* -c */ 0,
+/* -f */ IPT_INV_FRAG,
 };
 
 #define opts iptables_globals.opts
-- 
1.7.3.4

Re: iptables fixes 20110705

[Patrick McHardy]

On 05.07.2011 15:14, Jan Engelhardt wrote:
> The following changes since commit 411b390f3ffcd4708a0dfc0f2824a637de511cea:
> 
>   Merge branch 'master' of git://dev.medozas.de/iptables (2011-06-30 13:35:56 +0200)
> 
> are available in the git repository at:
> 
>   git://dev.medozas.de/iptables master
> 
> Jan Engelhardt (4):
>       build: install modules in arch-dependent location
>       doc: fix version string in ip6tables.8
>       doc: the -m option cannot be inverted
>       iptables: restore negation for -f
> 

Pulled, thanks Jan.