From 411a4e50ec1030f2dc51c5b0156e0c7255c81905 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 4 Jul 2011 12:44:43 +0200 Subject: build: install modules in arch-dependent location 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 --- INSTALL | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index acb56cd5..e17e8441 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 6c90caaf..5cb1b1bb 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"]) -- cgit v1.2.3 From 9cf0c00c226db02f8f3d129225844920704b97c1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 4 Jul 2011 13:02:51 +0200 Subject: doc: fix version string in ip6tables.8 Signed-off-by: Jan Engelhardt --- iptables/ip6tables.8.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptables/ip6tables.8.in b/iptables/ip6tables.8.in index 20e271de..0f7e3cce 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 .\" It is based on iptables man page. -- cgit v1.2.3 From d532d7663fd82984023a871aa953419ad1e905cb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 4 Jul 2011 13:04:16 +0200 Subject: doc: the -m option cannot be inverted Signed-off-by: Jan Engelhardt --- iptables/ip6tables.8.in | 3 --- iptables/iptables.8.in | 3 --- 2 files changed, 6 deletions(-) diff --git a/iptables/ip6tables.8.in b/iptables/ip6tables.8.in index 0f7e3cce..748cebba 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 3b717a11..24618b7b 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 -- cgit v1.2.3 From 32cea83f26a2c342b9410e6dfb0530b33f8af928 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 5 Jul 2011 15:08:37 +0200 Subject: iptables: restore negation for -f This move was missed in commit v1.4.11~77^2~6. References: http://bugs.debian.org/632695 Signed-off-by: Jan Engelhardt --- iptables/iptables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iptables/iptables.c b/iptables/iptables.c index 477e8f1d..6ceaf6b8 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 -- cgit v1.2.3