[Re: [oe] [meta-networking][PATCH] wireshark: update to latest stable version] On 14.08.06 (Wed 06:52) akuster wrote:
> thanks.
Happy to help.
-J.
>
> - Armin
>
> On 08/06/2014 06:37 AM, Joe MacDonald wrote:
> >Version 1.12.0 is out, update the SRC_URI and associated variables.
> >
> >Signed-off-by: Joe MacDonald <joe_macdon...@mentor.com>
> >---
> > .../wireshark/va_list-can-t-be-NULL-on-ARM.patch | 99
> > ----------------------
> > ...wireshark_1.12.0-rc2.bb => wireshark_1.12.0.bb} | 10 +--
> > 2 files changed, 5 insertions(+), 104 deletions(-)
> > delete mode 100644
> > meta-networking/recipes-support/wireshark/wireshark/va_list-can-t-be-NULL-on-ARM.patch
> > rename meta-networking/recipes-support/wireshark/{wireshark_1.12.0-rc2.bb
> > => wireshark_1.12.0.bb} (81%)
> >
> >diff --git
> >a/meta-networking/recipes-support/wireshark/wireshark/va_list-can-t-be-NULL-on-ARM.patch
> >
> >b/meta-networking/recipes-support/wireshark/wireshark/va_list-can-t-be-NULL-on-ARM.patch
> >deleted file mode 100644
> >index 26a004c..0000000
> >---
> >a/meta-networking/recipes-support/wireshark/wireshark/va_list-can-t-be-NULL-on-ARM.patch
> >+++ /dev/null
> >@@ -1,99 +0,0 @@
> >-From 320c4f0d705a3ed94f710fb4b7b3eef897ff7bc4 Mon Sep 17 00:00:00 2001
> >-From: Steev Klimaszewski <three...@gmail.com>
> >-Date: Thu, 19 Jun 2014 16:54:57 -0500
> >-Subject: [PATCH] va_list can't be NULL on ARM.
> >-
> >-Bug: 10209
> >-Change-Id: Ibd63a530450b7d2d4ec244e91c77caa731ba63aa
> >-Signed-off-by: Steev Klimaszewski <three...@gmail.com>
> >-Signed-off-by: Balint Reczey <bal...@balintreczey.hu>
> >-Reviewed-on: https://code.wireshark.org/review/2464
> >-Reviewed-by: Evan Huus <eapa...@gmail.com>
> >-Reviewed-by: Michael Mann <mman...@netscape.net>
> >-
> >-Upstream-Status: Backport
> >-The patch was imported from the wireshark git server
> >- (https://code.wireshark.org/review/p/wireshark.git) as of commit id
> >- 320c4f0d705a3ed94f710fb4b7b3eef897ff7bc4.
> >-
> >-Signed-off-by: Armin Kuster <akus...@mvista.com>
> >-
> >----
> >- epan/expert.c | 36 +++++++++++++++++++++++++++++-------
> >- 1 file changed, 29 insertions(+), 7 deletions(-)
> >-
> >-diff --git a/epan/expert.c b/epan/expert.c
> >-index 46be838..a69566d 100644
> >---- a/epan/expert.c
> >-+++ b/epan/expert.c
> >-@@ -381,15 +381,26 @@ expert_set_info_vformat(packet_info *pinfo,
> >proto_item *pi, int group, int sever
> >- tap_queue_packet(expert_tap, pinfo, ei);
> >- }
> >-
> >--void
> >--expert_add_info(packet_info *pinfo, proto_item *pi, expert_field *expindex)
> >-+/* Helper function for expert_add_info() to work around compiler's special
> >needs on ARM*/
> >-+static inline void
> >-+expert_add_info_internal(packet_info *pinfo, proto_item *pi, expert_field
> >*expindex, ...)
> >- {
> >-+ /* the va_list is ignored */
> >-+ va_list unused;
> >- expert_field_info* eiinfo;
> >-
> >- /* Look up the item */
> >- EXPERT_REGISTRAR_GET_NTH(expindex->ei, eiinfo);
> >-
> >-- expert_set_info_vformat(pinfo, pi, eiinfo->group, eiinfo->severity,
> >*eiinfo->hf_info.p_id, FALSE, eiinfo->summary, NULL);
> >-+ va_start(unused, expindex);
> >-+ expert_set_info_vformat(pinfo, pi, eiinfo->group, eiinfo->severity,
> >*eiinfo->hf_info.p_id, FALSE, eiinfo->summary, unused);
> >-+ va_end(unused);
> >-+}
> >-+
> >-+void
> >-+expert_add_info(packet_info *pinfo, proto_item *pi, expert_field *expindex)
> >-+{
> >-+ expert_add_info_internal(pinfo, pi, expindex);
> >- }
> >-
> >- void
> >-@@ -406,22 +417,33 @@ expert_add_info_format(packet_info *pinfo, proto_item
> >*pi, expert_field *expinde
> >- va_end(ap);
> >- }
> >-
> >--proto_item *
> >--proto_tree_add_expert(proto_tree *tree, packet_info *pinfo, expert_field*
> >expindex,
> >-- tvbuff_t *tvb, gint start, gint length)
> >-+/* Helper function for expert_add_expert() to work around compiler's
> >special needs on ARM*/
> >-+static inline proto_item *
> >-+proto_tree_add_expert_internal(proto_tree *tree, packet_info *pinfo,
> >expert_field* expindex,
> >-+ tvbuff_t *tvb, gint start, gint length, ...)
> >- {
> >- expert_field_info* eiinfo;
> >- proto_item *ti;
> >-+ va_list unused;
> >-
> >- /* Look up the item */
> >- EXPERT_REGISTRAR_GET_NTH(expindex->ei, eiinfo);
> >-
> >- ti = proto_tree_add_text(tree, tvb, start, length, "%s",
> >eiinfo->summary);
> >-- expert_set_info_vformat(pinfo, ti, eiinfo->group, eiinfo->severity,
> >*eiinfo->hf_info.p_id, FALSE, eiinfo->summary, NULL);
> >-+ va_start(unused, length);
> >-+ expert_set_info_vformat(pinfo, ti, eiinfo->group, eiinfo->severity,
> >*eiinfo->hf_info.p_id, FALSE, eiinfo->summary, unused);
> >-+ va_end(unused);
> >- return ti;
> >- }
> >-
> >- proto_item *
> >-+proto_tree_add_expert(proto_tree *tree, packet_info *pinfo, expert_field*
> >expindex,
> >-+ tvbuff_t *tvb, gint start, gint length)
> >-+{
> >-+ return proto_tree_add_expert_internal(tree, pinfo, expindex, tvb,
> >start, length);
> >-+}
> >-+
> >-+proto_item *
> >- proto_tree_add_expert_format(proto_tree *tree, packet_info *pinfo,
> >expert_field* expindex,
> >- tvbuff_t *tvb, gint start, gint length, const char *format, ...)
> >- {
> >---
> >-1.9.1
> >-
> >diff --git
> >a/meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb
> >b/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
> >similarity index 81%
> >rename from meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb
> >rename to meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
> >index b965fdf..449ac47 100644
> >--- a/meta-networking/recipes-support/wireshark/wireshark_1.12.0-rc2.bb
> >+++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
> >@@ -26,12 +26,12 @@ PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes,
> >--with-gcrypt=no, libgcrypt"
> > EXTRA_OECONF = "--with-qt=no --enable-usr-local=no -enable-tshark"
> >
> > LIC_FILES_CHKSUM =
> > "file://README.linux;md5=631e077455b7972172eb149195e065b0"
> >-SRC_URI =
> >"http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0-rc2.tar.bz2
> > \
> >- file://va_list-can-t-be-NULL-on-ARM.patch \
> >+SRC_URI = " \
> >+
> >http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0.tar.bz2
> > \
> > "
> >-
> >-SRC_URI[md5sum] = "dc1149073066a29f91116c168558262e"
> >-SRC_URI[sha256sum]=
> >"31009bb450126e9b12808267419f31016d14e6fde7b5e39c85ad37459908cffb"
> >+
> >+SRC_URI[md5sum] = "8dcfe451d8769901129809d2e19c1fb7"
> >+SRC_URI[sha256sum]=
> >"0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7"
> >
> > do_configure_prepend() {
> > # force to use fallback
> >
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
