diff options
author | Averell Kinouani <averell.kinouani@embtoolkit.org> | 2015-07-28 20:04:41 +0200 |
---|---|---|
committer | Averell Kinouani <averell.kinouani@embtoolkit.org> | 2015-07-28 20:04:41 +0200 |
commit | 094c076b3bb63560ca4e02a51949cfdd1208e4e0 (patch) | |
tree | 4b7d414ac33496b2f3dfb1f0b49fe87c932c795d /packages | |
parent | d3626b4cd94b637238baa2ada233d748b45f43d1 (diff) | |
parent | 1633c7283ae46151eb89437ef5dd6c4f3727712a (diff) | |
download | embtoolkit-094c076b3bb63560ca4e02a51949cfdd1208e4e0.tar.gz embtoolkit-094c076b3bb63560ca4e02a51949cfdd1208e4e0.tar.bz2 embtoolkit-094c076b3bb63560ca4e02a51949cfdd1208e4e0.tar.xz |
Merge branch 'update_iptables'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/net/iptables/iptables.kconfig | 7 | ||||
-rw-r--r-- | packages/net/libpcap/libpcap.kconfig | 6 | ||||
-rw-r--r-- | packages/net/tcpdump/tcpdump.kconfig | 6 | ||||
-rw-r--r-- | packages/net/tcpdump/tcpdump.mk | 5 |
4 files changed, 13 insertions, 11 deletions
diff --git a/packages/net/iptables/iptables.kconfig b/packages/net/iptables/iptables.kconfig index 0568a7d..4ff8f75 100644 --- a/packages/net/iptables/iptables.kconfig +++ b/packages/net/iptables/iptables.kconfig @@ -39,8 +39,9 @@ choice depends on EMBTK_HAVE_IPTABLES help Here you can choose which version of iptables you want to use. - config EMBTK_IPTABLES_VERSION_1_4_19_1 - bool "iptables-1.4.19.1" + + config EMBTK_IPTABLES_VERSION_1_4_21 + bool "iptables-1.4.21" endchoice @@ -53,7 +54,7 @@ config EMBTK_IPTABLES_HAVE_LIBIPQ config EMBTK_IPTABLES_VERSION_STRING string - default "1.4.19.1" if EMBTK_IPTABLES_VERSION_1_4_19_1 + default "1.4.21" if EMBTK_IPTABLES_VERSION_1_4_21 config EMBTK_IPTABLES_NEED_PATCH bool diff --git a/packages/net/libpcap/libpcap.kconfig b/packages/net/libpcap/libpcap.kconfig index a279c74..96bf55e 100644 --- a/packages/net/libpcap/libpcap.kconfig +++ b/packages/net/libpcap/libpcap.kconfig @@ -37,13 +37,13 @@ choice help Here you can choose which version of libpcap you want to use. - config EMBTK_LIBPCAP_VERSION_1_3_0 - bool "libpcap-1.3.0" + config EMBTK_LIBPCAP_VERSION_1_7_4 + bool "libpcap-1.7.4" endchoice config EMBTK_LIBPCAP_VERSION_STRING string - default "1.3.0" if EMBTK_LIBPCAP_VERSION_1_3_0 + default "1.7.4" if EMBTK_LIBPCAP_VERSION_1_7_4 config EMBTK_LIBPCAP_NEED_PATCH bool diff --git a/packages/net/tcpdump/tcpdump.kconfig b/packages/net/tcpdump/tcpdump.kconfig index 2dc7c4e..4ee5795 100644 --- a/packages/net/tcpdump/tcpdump.kconfig +++ b/packages/net/tcpdump/tcpdump.kconfig @@ -36,13 +36,13 @@ choice help Here you can choose which version of tcpdump you want to use. - config EMBTK_TCPDUMP_VERSION_4_3_0 - bool "tcpdump-4.3.0" + config EMBTK_TCPDUMP_VERSION_4_7_4 + bool "tcpdump-4.7.4" endchoice config EMBTK_TCPDUMP_VERSION_STRING string - default "4.3.0" if EMBTK_TCPDUMP_VERSION_4_3_0 + default "4.7.4" if EMBTK_TCPDUMP_VERSION_4_7_4 config EMBTK_TCPDUMP_NEED_PATCH bool diff --git a/packages/net/tcpdump/tcpdump.mk b/packages/net/tcpdump/tcpdump.mk index fd90630..e7915e9 100644 --- a/packages/net/tcpdump/tcpdump.mk +++ b/packages/net/tcpdump/tcpdump.mk @@ -30,9 +30,10 @@ TCPDUMP_PACKAGE := tcpdump-$(TCPDUMP_VERSION).tar.gz TCPDUMP_SRC_DIR := $(embtk_pkgb)/tcpdump-$(TCPDUMP_VERSION) TCPDUMP_BUILD_DIR := $(embtk_pkgb)/tcpdump-$(TCPDUMP_VERSION) -TCPDUMP_SBINS := tcpdump* +TCPDUMP_SBINS := tcpdump TCPDUMP_CONFIGURE_ENV := ac_cv_linux_vers=2 -TCPDUMP_CONFIGURE_OPTS := --with-pcap=linux --without-smi --without-crypto +TCPDUMP_CONFIGURE_ENV += td_cv_buggygetaddrinfo=no +TCPDUMP_CONFIGURE_OPTS := --without-smi --without-crypto --enable-ipv6 TCPDUMP_DEPS := libpcap_install |