wireshark: new package
PATCH v6 1/1 wireshark: new package
This is only the bare minimum needed to build the textual tshark utility. Support for more options, including the wireshark GUI, can be added later.
---
Changes v5 -> v6:
* add --with-gnutls=no to fix build when OpenSSL and GnuTLS are both installed (Stefan Fr?berg)
Changes v4 -> v5:
* update to version 1.8.5 as suggested by Gustavo Zacarias
* added fixup for pcap-config (Gustavo Zacarias)
Changes v3 -> v4:
* Update to version 1.8.4
Changes v2 -> v3:
* Use an upstreamable patch as suggested by Thomas Petazzoni
* Add license info
Changes v1 -> v2:
* Patch configure.in and enable autoreconf, instead of overriding $prefix
* Remove --with-sysroot as suggested by Arnout Vandecappelle
package/Config.in | 1 + package/wireshark/Config.in | 14 +++++++ .../wireshark/wireshark-dont-include-prefix.patch | 41 ++++++++++++++++++++ package/wireshark/wireshark.mk | 19 +++++++++ 4 files changed, 75 insertions(+) create mode 100644 package/wireshark/Config.in create mode 100644 package/wireshark/wireshark-dont-include-prefix.patch create mode 100644 package/wireshark/wireshark.mk
package/Config.in +1 -0
@@ -728,6 +728,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/wget/Config.in" endif source "package/wireless_tools/Config.in" +source "package/wireshark/Config.in" source "package/wpa_supplicant/Config.in" source "package/xinetd/Config.in" source "package/xl2tp/Config.in"
package/wireshark/Config.in new file +14 -0
@@ -0,0 +1,14 @@ +config BR2_PACKAGE_WIRESHARK + bool "wireshark" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_LIBGLIB2 + depends on BR2_USE_WCHAR # glib2 + help + Network traffic sniffer and protocol decoder. Currently only tshark, + the console interface, is enabled. + + http://www.wireshark.org + +comment "wireshark requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR
package/wireshark/wireshark-dont-include-prefix.patch new file +41 -0
41 lines not on this page · raw message
package/wireshark/wireshark.mk new file +19 -0
@@ -0,0 +1,19 @@ +############################################################# +# +# wireshark +# +############################################################# + +WIRESHARK_VERSION = 1.8.5 +WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 +WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions +WIRESHARK_LICENSE = wireshark license +WIRESHARK_LICENSE_FILES = COPYING +WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2 +WIRESHARK_AUTORECONF = YES +WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ + ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config +WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \ + --enable-static=no --with-gnutls=no + +$(eval $(call autotools-package))
Signature · 1 line
1.7.10.4
PATCH v6 1/1 wireshark: new package
Quoted 5 lines · Baruch Siach
This is only the bare minimum needed to build the textual tshark utility. Support for more options, including the wireshark GUI, can be added later.
Cc Stefan Fr?berg <[email protected]>Signed-off-by Baruch Siach <[email protected]>
PATCH v6 1/1 wireshark: new package
In reply to Baruch SiachQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
Baruch> This is only the bare minimum needed to build the textual Baruch> tshark utility. Support for more options, including the Baruch> wireshark GUI, can be added later.
I was going to commit this to next, but a small test build fails as it ends up using system includes:
libtool: compile: /home/peko/source/buildroot/outf2fs/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -DHAVE_CONFIG_H -I. -I../.. -I../.. -I/usr/include -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -D_FORTIFY_SOURCE=2 "-D_U_=__attribute__((unused))" -I/home/peko/source/buildroot/outf2fs/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include -DPLUGIN_DIR=\"/usr/lib/wireshark/plugins/1.8.5\" -pipe -Os -Wall -W -Wextra -Wdeclaration-after-statement -Wendif-labels -Wpointer-arith -Wno-pointer-sign -Warray-bounds -Wcast-align -Wformat-security -Wold-style-definition -Wno-error=unused-but-set-variable -fexcess-precision=fast -pthread -I/home/peko/source/buildroot/outf2fs/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/peko/source/buildroot/outf2fs/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -MT packet-asn1.lo -MD -MP -MF .deps/packet-asn1.Tpo -c packet-asn1.c -fPIC -DPIC -o .libs/packet-asn1.o In file included from /usr/include/errno.h:29:0,
from packet-asn1.c:66:
/usr/include/features.h:323:26: fatal error: bits/predefs.h: No such file or directory compilation terminated.
make[5]: *** [packet-asn1.lo] Error 1
This is with a basic internal ARM toolchain:
cat defconfig
BR2_arm=y
BR2_arm926t=y
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_PACKAGE_WIRESHARK=y
Looking closer at it, I see it is caused by a bunch of Makefile.am files having:
INCLUDES = -I$(top_srcdir) -I$(includedir)
E.G. look in srcdir + /usr/include. A quick workaround is to pass --includedir=$(STAGING_DIR)/usr/include to configure. If wireshark itself would install any headers, this would cause problems, but in this case it seems ok, so I think it's the best approach.
Alternatively we could patch all the Makefile.am files to drop -I$(includedir) and autoreconf the package.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v6 1/1 wireshark: new package
In reply to Baruch SiachQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
Baruch> This is only the bare minimum needed to build the textual Baruch> tshark utility. Support for more options, including the Baruch> wireshark GUI, can be added later.
Committed to next with the --includedir workaround.
Signature · 1 line
Bye, Peter Korsgaard