diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-08-01 16:43:53 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-08-01 16:43:53 +0200 |
| commit | 6aa7532505d6db002a2d2fc33ebc881d3c4e1bb7 (patch) | |
| tree | 44d425c21d9e8b12004f58431532f47cf6273d99 /package/tcpdump | |
| parent | 3da99af93a2f24288aba5d8aa2879ce1b6e95dbb (diff) | |
disable global ipv6 configuration symbol, use flavours instead
Diffstat (limited to 'package/tcpdump')
| -rw-r--r-- | package/tcpdump/Makefile | 21 | ||||
| -rw-r--r-- | package/tcpdump/patches/patch-print-enc_c | 19 |
2 files changed, 13 insertions, 27 deletions
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 2f8b3b7c2..f728e2b25 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -4,18 +4,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcpdump -PKG_VERSION:= 4.0.0 +PKG_VERSION:= 4.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= b22ca72890df2301d922c9f2d17867f9 -PKG_DESCR:= A tool for network monitoring and data acquisition. +PKG_MD5SUM:= d0dd58bbd6cd36795e05c6f1f74420b0 +PKG_DESCR:= A tool for network monitoring and data acquisition PKG_SECTION:= net PKG_DEPENDS:= libpcap PKG_BUILDDEP+= libpcap -PKG_URL:= http://www.tcpdump.org -PKG_SITES:= http://www.tcpdump.org/release/ \ - http://www.sfr-fresh.com/unix/misc/ \ - http://www.at.tcpdump.org/ \ - http://www.br.tcpdump.org/ +PKG_URL:= http://www.tcpdump.org/ +PKG_SITES:= http://www.tcpdump.org/release/ + +PKG_FLAVOURS:= WITH_IPV6 +PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -25,6 +25,11 @@ CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${HOSTCC} \ ac_cv_linux_vers=2 \ td_cv_buggygetaddrinfo="no" CONFIGURE_ARGS+= --without-crypto +ifneq (${ADK_PACKAGE_TCPDUMP_WITH_IPV6},) +CONFIGURE_ARGS+= --enable-ipv6 +else +CONFIGURE_ARGS+= --disable-ipv6 +endif XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ INCLS="-I. -I${STAGING_DIR}/usr/include" diff --git a/package/tcpdump/patches/patch-print-enc_c b/package/tcpdump/patches/patch-print-enc_c deleted file mode 100644 index d1e6f3460..000000000 --- a/package/tcpdump/patches/patch-print-enc_c +++ /dev/null @@ -1,19 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - -* already fixed in git head - http://sourceforge.net/tracker/?func=detail&aid=2679354&group_id=53066&atid=469575 - ---- tcpdump-4.0.0.orig/print-enc.c 2008-09-01 04:44:22.000000000 +0200 -+++ tcpdump-4.0.0/print-enc.c 2009-04-17 19:52:13.071285657 +0200 -@@ -77,9 +77,11 @@ enc_if_print(const struct pcap_pkthdr *h - case AF_INET: - ip_print(gndo, p, length); - break; -+#ifdef INET6 - case AF_INET6: - ip6_print(p, length); - break; -+#endif - } - - out: |