From c4edfa63eda06f02cc5bc1a65d366c55bd2eda30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 30 Mar 2009 00:44:46 +0200 Subject: libxtables: reorder .version member When the structure's layout changes, as it did between v1.4.1 and v1.4.2, trying to compare the version string makes iptables segfault while it tries to determine whether the module is compatible in the first place. By moving the member to a known offset in the struct and keeping it there, objects (both iptables and 3rd party) compiled from this commit onwards will avoid the segfault. Signed-off-by: Jan Engelhardt --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 87f693f8..656bd372 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_INIT([iptables], [1.4.3.1]) # See libtool.info "Libtool's versioning system" -libxtables_vcurrent=1 +libxtables_vcurrent=2 libxtables_vage=0 AC_CONFIG_HEADERS([config.h]) -- cgit v1.2.3 From 8e58613df53f5f83e8ab92dec61d8065c68d967d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 3 Apr 2009 22:28:34 +0200 Subject: build: add configure option to disable ip6tables This also skips building the IPv6 extensions. It does not #ifdef out all code however, I think that would make it too ugly. Inspired-by: http://bugzilla.netfilter.org/show_bug.cgi?id=560 Signed-off-by: Jan Engelhardt --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 656bd372..eefcdac9 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,9 @@ AC_ARG_WITH([xtlibdir], [Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]), [xtlibdir="$withval"], [xtlibdir="${libexecdir}/xtables"]) +AC_ARG_ENABLE([ipv6], + AS_HELP_STRING([--disable-ipv6], [Do not build ip6tables]), + [enable_ipv6="$enableval"], [enable_ipv6="yes"]) AC_ARG_ENABLE([devel], AS_HELP_STRING([--enable-devel], [Install Xtables development headers]), @@ -51,6 +54,7 @@ AC_SUBST([blacklist_modules]) AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = "yes"]) AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = "yes"]) +AM_CONDITIONAL([ENABLE_IPV6], [test "$enable_ipv6" = "yes"]) AM_CONDITIONAL([ENABLE_DEVEL], [test "$enable_devel" = "yes"]) AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"]) -- cgit v1.2.3 From a094eb0f2a57592b6f3cf42fdbb9d49fead2d57c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 3 Apr 2009 22:37:49 +0200 Subject: build: add configure option to disable ipv4 iptables This patch complements the previous one. Signed-off-by: Jan Engelhardt --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index eefcdac9..152ad592 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,9 @@ AC_ARG_WITH([xtlibdir], [Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]), [xtlibdir="$withval"], [xtlibdir="${libexecdir}/xtables"]) +AC_ARG_ENABLE([ipv4], + AS_HELP_STRING([--disable-ipv4], [Do not build iptables]), + [enable_ipv4="$enableval"], [enable_ipv4="yes"]) AC_ARG_ENABLE([ipv6], AS_HELP_STRING([--disable-ipv6], [Do not build ip6tables]), [enable_ipv6="$enableval"], [enable_ipv6="yes"]) @@ -54,6 +57,7 @@ AC_SUBST([blacklist_modules]) AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = "yes"]) AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = "yes"]) +AM_CONDITIONAL([ENABLE_IPV4], [test "$enable_ipv4" = "yes"]) AM_CONDITIONAL([ENABLE_IPV6], [test "$enable_ipv6" = "yes"]) AM_CONDITIONAL([ENABLE_DEVEL], [test "$enable_devel" = "yes"]) AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"]) -- cgit v1.2.3