iptables -stable patches

iptables -stable patches

[Jan Engelhardt]

The following changes since commit c1a150c98fc94858a440550f0cb347a6060ebb30:

  bump version to 1.4.16.2 (2012-10-08 10:09:04 +0200)

are available in the git repository at:

  git://git.inai.de/iptables master

for you to fetch changes up to f525886fc628341809e9139f87eab92f3f6f31da:

  build: resolve compile abort in libxt_limit on RHEL5 (2012-10-09 02:01:09 +0200)

----------------------------------------------------------------
Jan Engelhardt (2):
      build: remove symlink-only extensions from static object list
      build: resolve compile abort in libxt_limit on RHEL5

 extensions/GNUmakefile.in    |    8 ++++----
 extensions/libxt_hashlimit.c |    2 ++
 extensions/libxt_limit.c     |    2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

[PATCH 1/2] build: remove symlink-only extensions from static object list

[Jan Engelhardt]

$ ./configure --enable-static --disable-shared --enable-ipv4
  --enable-ipv6 && make
[...]
make[3]: *** No rule to make target "libxt_NOTRACK.o", needed by
"libext.a". Stop.

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 extensions/GNUmakefile.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 8b38df9..1cef239 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -39,7 +39,7 @@ endif
 #	Wildcard module list
 #
 pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(sort $(wildcard ${srcdir}/libxt_*.c)))
-pfx_build_mod += NOTRACK state
+pfx_symlinks  := NOTRACK state
 @ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(sort $(wildcard ${srcdir}/libipt_*.c)))
 @ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(sort $(wildcard ${srcdir}/libip6t_*.c)))
 pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
@@ -48,7 +48,7 @@ pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})
 pfx_objs      := $(patsubst %,libxt_%.o,${pfx_build_mod})
 pf4_objs      := $(patsubst %,libipt_%.o,${pf4_build_mod})
 pf6_objs      := $(patsubst %,libip6t_%.o,${pf6_build_mod})
-pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod})
+pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
 pf4_solibs    := $(patsubst %,libipt_%.so,${pf4_build_mod})
 pf6_solibs    := $(patsubst %,libip6t_%.so,${pf6_build_mod})
 
@@ -220,7 +220,7 @@ man_run    = \
 	done >$@;
 
 matches.man: .initext.dd .initext4.dd .initext6.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod}))
+	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks}))
 
 targets.man: .initext.dd .initext4.dd .initext6.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod}))
+	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks}))
-- 
1.7.10.4

[PATCH 2/2] build: resolve compile abort in libxt_limit on RHEL5

[Jan Engelhardt]

	libxt_limit.c: In function 'print_rate':
	libxt_limit.c:124: error: 'INFINITY' undeclared (first use in
	this function)

The default mode of glibc-2.15's <features.h> sets
"-D_POSIX_C_SOURCE=200809L", and therefore "-D_ISOC99_SOURCE". However,
on þe olde RHEL 5's glibc-2.5, it only has "-D_POSIX_C_SOURCE=200112L".

Explicitly draw in the definition of INFINITY by always defining
_ISOC99_SOURCE. By doing this, we are moving off of the default set, so
_BSD_SOURCE also needs to be explicitly set to get at IFNAMSIZ that is
used in xt_hashlimit.h.

Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
 extensions/libxt_hashlimit.c |    2 ++
 extensions/libxt_limit.c     |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c
index 831345b..c5b8d77 100644
--- a/extensions/libxt_hashlimit.c
+++ b/extensions/libxt_hashlimit.c
@@ -10,6 +10,8 @@
  * 
  * Error corections by nmalykh@bilim.com (22.01.2005)
  */
+#define _BSD_SOURCE 1
+#define _ISOC99_SOURCE 1
 #include <math.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
index 023500c..f75ef2f 100644
--- a/extensions/libxt_limit.c
+++ b/extensions/libxt_limit.c
@@ -3,6 +3,8 @@
  * Jérôme de Vivie   <devivie@info.enserb.u-bordeaux.fr>
  * Hervé Eychenne    <rv@wallfire.org>
  */
+#define _BSD_SOURCE 1
+#define _ISOC99_SOURCE 1
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] build: resolve compile abort in libxt_limit on RHEL5

[Pablo Neira Ayuso]

On Wed, Oct 10, 2012 at 12:35:14PM +0200, Jan Engelhardt wrote:
> 	libxt_limit.c: In function 'print_rate':
> 	libxt_limit.c:124: error: 'INFINITY' undeclared (first use in
> 	this function)
> 
> The default mode of glibc-2.15's <features.h> sets
> "-D_POSIX_C_SOURCE=200809L", and therefore "-D_ISOC99_SOURCE". However,
> on þe olde RHEL 5's glibc-2.5, it only has "-D_POSIX_C_SOURCE=200112L".
> 
> Explicitly draw in the definition of INFINITY by always defining
> _ISOC99_SOURCE. By doing this, we are moving off of the default set, so
> _BSD_SOURCE also needs to be explicitly set to get at IFNAMSIZ that is
> used in xt_hashlimit.h.

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] build: remove symlink-only extensions from static object list

[Pablo Neira Ayuso]

On Wed, Oct 10, 2012 at 12:35:13PM +0200, Jan Engelhardt wrote:
> $ ./configure --enable-static --disable-shared --enable-ipv4
>   --enable-ipv6 && make
> [...]
> make[3]: *** No rule to make target "libxt_NOTRACK.o", needed by
> "libext.a". Stop.

Already applied this yesterday.