summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/iptables
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/iptables')
-rw-r--r--meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch47
-rw-r--r--meta/recipes-extended/iptables/iptables_1.4.17.bb15
2 files changed, 59 insertions, 3 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
new file mode 100644
index 0000000000..ab609e27e3
--- /dev/null
+++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
@@ -0,0 +1,47 @@
1From 5c47cf5061b852c02178f01e23690bfe38a99d93 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 17 Mar 2013 11:21:35 -0700
4Subject: [PATCH] configure: Add option to enable/disable libnfnetlink
5
6This changes the configure behaviour from autodetecting
7for libnfnetlink to having an option to disable it explicitly
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Upstream-Status: Pending
12---
13 configure.ac | 11 ++++++++---
14 1 file changed, 8 insertions(+), 3 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index ba616ab..ce2d315 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -53,6 +53,9 @@ AC_ARG_ENABLE([libipq],
21 AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
22 [Path to the pkgconfig directory [[LIBDIR/pkgconfig]]]),
23 [pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig'])
24+AC_ARG_ENABLE([libnfnetlink],
25+ AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
26+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"])
27
28 libiptc_LDFLAGS2="";
29 AX_CHECK_LINKER_FLAGS([-Wl,--no-as-needed],
30@@ -89,9 +92,11 @@ AM_CONDITIONAL([ENABLE_LARGEFILE], [test "$enable_largefile" = "yes"])
31 AM_CONDITIONAL([ENABLE_DEVEL], [test "$enable_devel" = "yes"])
32 AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"])
33
34-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
35- [nfnetlink=1], [nfnetlink=0])
36-AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
37+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
38+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0])
39+ ])
40+
41+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"])
42
43 regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
44 -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
45--
461.7.9.5
47
diff --git a/meta/recipes-extended/iptables/iptables_1.4.17.bb b/meta/recipes-extended/iptables/iptables_1.4.17.bb
index f8ef7b6552..aa932ce67a 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.17.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.17.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\ 7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\
8 file://iptables/iptables.c;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc" 8 file://iptables/iptables.c;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc"
9 9
10PR = "r0" 10PR = "r1"
11 11
12RRECOMMENDS_${PN} = "kernel-module-x-tables \ 12RRECOMMENDS_${PN} = "kernel-module-x-tables \
13 kernel-module-ip-tables \ 13 kernel-module-ip-tables \
@@ -24,14 +24,23 @@ FILES_${PN}-dbg =+ "${libdir}/xtables/.debug"
24SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ 24SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
25 file://types.h-add-defines-that-are-required-for-if_packet.patch \ 25 file://types.h-add-defines-that-are-required-for-if_packet.patch \
26 file://fix-link-failure-ip6t-NETMAP.patch \ 26 file://fix-link-failure-ip6t-NETMAP.patch \
27 file://fix-iptables-extensions-build-error.patch" 27 file://fix-iptables-extensions-build-error.patch \
28 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
29 "
28SRC_URI[md5sum] = "c3fb2ffd5b39d0d54b06ccc4c8660116" 30SRC_URI[md5sum] = "c3fb2ffd5b39d0d54b06ccc4c8660116"
29SRC_URI[sha256sum] = "51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925" 31SRC_URI[sha256sum] = "51e7a769469383b6ad308a6a19cdd2bd813cf4593e21a156a543a1cd70554925"
30 32
31inherit autotools 33inherit autotools
32 34
33EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ 35EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
34 ${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}" 36 "
37PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
38 "
39
40PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
41
42# libnfnetlink recipe is in meta-networking layer
43PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink"
35 44
36do_configure_prepend() { 45do_configure_prepend() {
37 # Remove some libtool m4 files 46 # Remove some libtool m4 files