diff options
| -rw-r--r-- | patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch | 25 | ||||
| -rw-r--r-- | patches/wireshark-2.0.3/series | 4 | ||||
| -rw-r--r-- | rules/wireshark.make | 23 |
3 files changed, 47 insertions, 5 deletions
diff --git a/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch b/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch new file mode 100644 index 000000000..01f0714dd --- /dev/null +++ b/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch @@ -0,0 +1,25 @@ +From: Alexander Aring <aar@pengutronix.de> +Date: Wed, 27 Apr 2016 16:51:08 +0200 +Subject: [PATCH] help_url: add forgotten HAVE_EXTCAP + +Signed-off-by: Alexander Aring <aar@pengutronix.de> +--- + ui/help_url.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ui/help_url.c b/ui/help_url.c +index 7a2b9a026e1c..144eb9855f4c 100644 +--- a/ui/help_url.c ++++ b/ui/help_url.c +@@ -265,9 +265,11 @@ topic_action_url(topic_action_e action) + case(HELP_EXPERT_INFO_DIALOG): + url = user_guide_url("ChAdvExpert.html"); + break; ++#if HAVE_EXTCAP + case(HELP_EXTCAP_OPTIONS_DIALOG): + url = user_guide_url("ChExtcapOptions.html"); + break; ++#endif + case(HELP_STATS_SUMMARY_DIALOG): + url = user_guide_url("ChStatSummary.html"); + break; diff --git a/patches/wireshark-2.0.3/series b/patches/wireshark-2.0.3/series new file mode 100644 index 000000000..5c72479f6 --- /dev/null +++ b/patches/wireshark-2.0.3/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-help_url-add-forgotten-HAVE_EXTCAP.patch +# 71fce02a9deb431a1f0a2c4d041df890 - git-ptx-patches magic 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 |