From: Alexander Aring <aar@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Aring <aar@pengutronix.de>
Subject: [ptxdist] [PATCH 4/4] wireshark: version bump 1.10.6 -> 2.0.3
Date: Wed, 27 Apr 2016 17:54:23 +0200 [thread overview]
Message-ID: <1461772463-1825-4-git-send-email-aar@pengutronix.de> (raw)
In-Reply-To: <1461772463-1825-1-git-send-email-aar@pengutronix.de>
Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
.../0001-help_url-add-forgotten-HAVE_EXTCAP.patch | 25 ++++++++++++++++++++++
patches/wireshark-2.0.3/series | 4 ++++
rules/wireshark.make | 23 +++++++++++++++-----
3 files changed, 47 insertions(+), 5 deletions(-)
create mode 100644 patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch
create mode 100644 patches/wireshark-2.0.3/series
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 0000000..01f0714
--- /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 0000000..5c72479
--- /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 b3fcb93..f572f9e 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
--
2.8.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2016-04-27 15:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-27 15:54 [ptxdist] [PATCHv2 1/4] unstrung: initial commit Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 2/4] wpan-tools: version bump 0.5 -> 0.6 Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 3/4] libpcap: version bump 1.5.3 -> 1.7.4 Alexander Aring
2016-04-27 15:54 ` Alexander Aring [this message]
2016-05-17 6:31 ` [ptxdist] [PATCHv2 1/4] unstrung: initial commit Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461772463-1825-4-git-send-email-aar@pengutronix.de \
--to=aar@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox