diff options
| author | Alexander Aring <aar@pengutronix.de> | 2016-04-27 17:54:23 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-17 08:28:47 +0200 |
| commit | 6dc79422db37e82982f3f3a6bbbfd7888a896238 (patch) | |
| tree | fa0eacb4e2859305035ae83ac489636b9545ff37 /rules | |
| parent | 3bb02472422390ea508ddf5b7a05b3ed9173361f (diff) | |
| download | ptxdist-6dc79422db37e82982f3f3a6bbbfd7888a896238.tar.gz ptxdist-6dc79422db37e82982f3f3a6bbbfd7888a896238.tar.xz | |
wireshark: version bump 1.10.6 -> 2.0.3
Signed-off-by: Alexander Aring <aar@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/wireshark.make | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/rules/wireshark.make b/rules/wireshark.make index b3fcb93cd..f572f9e1e 100644 --- a/rules/wireshark.make +++ b/rules/wireshark.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_WIRESHARK) += wireshark # # Paths and names # -WIRESHARK_VERSION := 1.10.6 -WIRESHARK_MD5 := c67435039d67ef1757bfff0ab88824ab +WIRESHARK_VERSION := 2.0.3 +WIRESHARK_MD5 := 62dc20f5a77542feed2e38f18db8ae3b WIRESHARK := wireshark-$(WIRESHARK_VERSION) WIRESHARK_SUFFIX := tar.bz2 WIRESHARK_URL := http://www.wireshark.org/download/src/all-versions/$(WIRESHARK).$(WIRESHARK_SUFFIX) @@ -46,6 +46,7 @@ WIRESHARK_CONF_OPT = \ --enable-tshark \ --enable-editcap \ --enable-capinfos \ + --enable-captype \ --enable-mergecap \ --enable-reordercap \ --disable-text2pcap \ @@ -54,14 +55,22 @@ WIRESHARK_CONF_OPT = \ --disable-airpcap \ --enable-dumpcap \ --disable-rawshark \ + --disable-androiddump \ + --disable-androiddump-use-libpcap \ + --disable-echld \ + --disable-tfshark \ --disable-pcap-ng-default \ $(GLOBAL_IPV6_OPTION) \ --disable-setcap-install \ --disable-setuid-install \ + --without-qt \ + --without-gtk2 \ + --without-gtk3 \ --without-gnutls \ --without-gcrypt \ --with-libnl=3 \ --without-libsmi \ + --without-osx-integration \ --with-pcap=$(SYSROOT)/usr \ --with-zlib \ --without-lua \ @@ -72,7 +81,9 @@ WIRESHARK_CONF_OPT = \ --without-c-ares \ --without-adns \ --without-geoip \ - --without-plugins + --without-sbc \ + --without-plugins \ + --without-extcap # ---------------------------------------------------------------------------- # Target-Install @@ -89,11 +100,13 @@ $(STATEDIR)/wireshark.targetinstall: # # executables # - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/editcap) @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/capinfos) + @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/captype) + @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/dumpcap) + @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/editcap) + @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/idl2wrs) @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/mergecap) @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/reordercap) - @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/dumpcap) @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/tshark) # # libraries used by some of the executables |