Patchwork [meta-networking] wireshark: update to latest stable version

login
register
mail settings
Submitter Joe MacDonald
Date Aug. 6, 2014, 1:37 p.m.
Message ID <1407332271-32696-1-git-send-email-joe_macdonald@mentor.com>
Download mbox | patch
Permalink /patch/77385/
State Accepted, archived
Headers show

Comments

Joe MacDonald - Aug. 6, 2014, 1:37 p.m.
Version 1.12.0 is out, update the SRC_URI and associated variables.

Signed-off-by: Joe MacDonald <joe_macdonald@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%)
Armin Kuster - Aug. 6, 2014, 1:52 p.m.
thanks.

- 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_macdonald@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 <threeway@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 <threeway@gmail.com>
> -Signed-off-by: Balint Reczey <balint@balintreczey.hu>
> -Reviewed-on: https://code.wireshark.org/review/2464
> -Reviewed-by: Evan Huus <eapache@gmail.com>
> -Reviewed-by: Michael Mann <mmann78@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 <akuster@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 - Aug. 6, 2014, 2:43 p.m.
[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_macdonald@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 <threeway@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 <threeway@gmail.com>
> >-Signed-off-by: Balint Reczey <balint@balintreczey.hu>
> >-Reviewed-on: https://code.wireshark.org/review/2464
> >-Reviewed-by: Evan Huus <eapache@gmail.com>
> >-Reviewed-by: Michael Mann <mmann78@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 <akuster@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
> >
Martin Jansa - Aug. 6, 2014, 6:37 p.m.
On Wed, Aug 06, 2014 at 09:37:51AM -0400, Joe MacDonald wrote:
> Version 1.12.0 is out, update the SRC_URI and associated variables.

BTW: this causes:
ERROR: QA Issue: Package version for package wireshark went backwards
which would break package feeds from (0:1.12.0-rc2-r0.3 to
0:1.12.0-r0.0) [version-going-backwards]

Which is caused by incorrect PV in rc2 (which I haven't noticed before),
but as rc2 was in master only for couple of days, I can live without PE
bump in it.

> Signed-off-by: Joe MacDonald <joe_macdonald@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%)
Martin Jansa - Aug. 6, 2014, 6:39 p.m.
On Wed, Aug 06, 2014 at 09:37:51AM -0400, Joe MacDonald wrote:
> Version 1.12.0 is out, update the SRC_URI and associated variables.

One more issue:

WARNING: QA Issue: wireshark rdepends on c-ares but its not a build
dependency? [build-deps]

it's strange, but it's new with 1.12.0 final.

> Signed-off-by: Joe MacDonald <joe_macdonald@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%)
Joe MacDonald - Aug. 6, 2014, 6:44 p.m.
[Re: [oe] [meta-networking][PATCH] wireshark: update to latest stable version] On 14.08.06 (Wed 20:37) Martin Jansa wrote:

> On Wed, Aug 06, 2014 at 09:37:51AM -0400, Joe MacDonald wrote:
> > Version 1.12.0 is out, update the SRC_URI and associated variables.
> 
> BTW: this causes:
> ERROR: QA Issue: Package version for package wireshark went backwards
> which would break package feeds from (0:1.12.0-rc2-r0.3 to
> 0:1.12.0-r0.0) [version-going-backwards]
> 
> Which is caused by incorrect PV in rc2 (which I haven't noticed before),
> but as rc2 was in master only for couple of days, I can live without PE
> bump in it.

Boo.  And I didn't run into it since I'd never got around to building
the -rc2 before we had the final version.  A PE bump is probably best if
you want to go that route, it is a pretty narrow window but it broke
your stuff, I imagine you're not alone.  :-/

-J.

> 
> > Signed-off-by: Joe MacDonald <joe_macdonald@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%)
Joe MacDonald - Aug. 6, 2014, 6:51 p.m.
[Re: [oe] [meta-networking][PATCH] wireshark: update to latest stable version] On 14.08.06 (Wed 20:39) Martin Jansa wrote:

> On Wed, Aug 06, 2014 at 09:37:51AM -0400, Joe MacDonald wrote:
> > Version 1.12.0 is out, update the SRC_URI and associated variables.
> 
> One more issue:
> 
> WARNING: QA Issue: wireshark rdepends on c-ares but its not a build
> dependency? [build-deps]
> 
> it's strange, but it's new with 1.12.0 final.

This is likely auto-detected and the behaviour is different depending on
the presence or absence of c-ares.  I'm inclined to disable the
dependency in wireshark, but calling it out explicitly is fine with me
too.

-J.

> 
> > Signed-off-by: Joe MacDonald <joe_macdonald@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%)
Martin Jansa - Aug. 6, 2014, 7:37 p.m.
On Wed, Aug 06, 2014 at 02:51:45PM -0400, Joe MacDonald wrote:
> [Re: [oe] [meta-networking][PATCH] wireshark: update to latest stable version] On 14.08.06 (Wed 20:39) Martin Jansa wrote:
> 
> > On Wed, Aug 06, 2014 at 09:37:51AM -0400, Joe MacDonald wrote:
> > > Version 1.12.0 is out, update the SRC_URI and associated variables.
> > 
> > One more issue:
> > 
> > WARNING: QA Issue: wireshark rdepends on c-ares but its not a build
> > dependency? [build-deps]
> > 
> > it's strange, but it's new with 1.12.0 final.
> 
> This is likely auto-detected and the behaviour is different depending on
> the presence or absence of c-ares.  I'm inclined to disable the
> dependency in wireshark, but calling it out explicitly is fine with me
> too.

That's what my test-dependencies.sh script is testing and it was
returning clean result for rc2, that's why it's surprising, but
wireshark isn't alone with this issue, so follow-up patch is completely
fine (it can also include that PE bump).

http://lists.openembedded.org/pipermail/openembedded-devel/2014-July/097223.html
libcap libnl libnl-genl libnl-nf libnl-route portaudio-v19 sbc were
floating with rc2, all of them fixed (according to test-dependencies.sh)
by
http://lists.openembedded.org/pipermail/openembedded-devel/2014-July/097255.html

Regards,

> > > Signed-off-by: Joe MacDonald <joe_macdonald@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%)
> 
> 
> 
> -- 
> -Joe MacDonald.
> :wq



> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Joe MacDonald - Aug. 6, 2014, 7:42 p.m.
[Re: [oe] [meta-networking][PATCH] wireshark: update to latest stable version] On 14.08.06 (Wed 21:37) Martin Jansa wrote:

> On Wed, Aug 06, 2014 at 02:51:45PM -0400, Joe MacDonald wrote:
> > [Re: [oe] [meta-networking][PATCH] wireshark: update to latest stable version] On 14.08.06 (Wed 20:39) Martin Jansa wrote:
> > 
> > > On Wed, Aug 06, 2014 at 09:37:51AM -0400, Joe MacDonald wrote:
> > > > Version 1.12.0 is out, update the SRC_URI and associated variables.
> > > 
> > > One more issue:
> > > 
> > > WARNING: QA Issue: wireshark rdepends on c-ares but its not a build
> > > dependency? [build-deps]
> > > 
> > > it's strange, but it's new with 1.12.0 final.
> > 
> > This is likely auto-detected and the behaviour is different depending on
> > the presence or absence of c-ares.  I'm inclined to disable the
> > dependency in wireshark, but calling it out explicitly is fine with me
> > too.
> 
> That's what my test-dependencies.sh script is testing and it was
> returning clean result for rc2, that's why it's surprising, but
> wireshark isn't alone with this issue, so follow-up patch is completely
> fine (it can also include that PE bump).

Yeah, makes sense.  That's what I've done in the patch I just sent out.
I went ahead and disabled c-ares since that looked like the path of
least resistance, and it can be re-introduced later if required.
(Unless, of course, Armin already has an update for that part.)

-J.

> 
> http://lists.openembedded.org/pipermail/openembedded-devel/2014-July/097223.html
> libcap libnl libnl-genl libnl-nf libnl-route portaudio-v19 sbc were
> floating with rc2, all of them fixed (according to test-dependencies.sh)
> by
> http://lists.openembedded.org/pipermail/openembedded-devel/2014-July/097255.html
> 
> Regards,
> 
> > > > Signed-off-by: Joe MacDonald <joe_macdonald@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%)
> > 
> > 
> > 
> > -- 
> > -Joe MacDonald.
> > :wq
> 
> 
> 
> > -- 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
>
Armin Kuster - Aug. 6, 2014, 7:57 p.m.
On 08/06/2014 12:42 PM, Joe MacDonald wrote:
> [Re: [oe] [meta-networking][PATCH] wireshark: update to latest stable version] On 14.08.06 (Wed 21:37) Martin Jansa wrote:
>
>> On Wed, Aug 06, 2014 at 02:51:45PM -0400, Joe MacDonald wrote:
>>> [Re: [oe] [meta-networking][PATCH] wireshark: update to latest stable version] On 14.08.06 (Wed 20:39) Martin Jansa wrote:
>>>
>>>> On Wed, Aug 06, 2014 at 09:37:51AM -0400, Joe MacDonald wrote:
>>>>> Version 1.12.0 is out, update the SRC_URI and associated variables.
>>>>
>>>> One more issue:
>>>>
>>>> WARNING: QA Issue: wireshark rdepends on c-ares but its not a build
>>>> dependency? [build-deps]
>>>>
>>>> it's strange, but it's new with 1.12.0 final.
>>>
>>> This is likely auto-detected and the behaviour is different depending on
>>> the presence or absence of c-ares.  I'm inclined to disable the
>>> dependency in wireshark, but calling it out explicitly is fine with me
>>> too.
>>
>> That's what my test-dependencies.sh script is testing and it was
>> returning clean result for rc2, that's why it's surprising, but
>> wireshark isn't alone with this issue, so follow-up patch is completely
>> fine (it can also include that PE bump).
>
> Yeah, makes sense.  That's what I've done in the patch I just sent out.
> I went ahead and disabled c-ares since that looked like the path of
> least resistance, and it can be re-introduced later if required.
> (Unless, of course, Armin already has an update for that part.)

nope.  I am in slow-mo today.

thanks.
- Armin
>
> -J.
>
>>
>> http://lists.openembedded.org/pipermail/openembedded-devel/2014-July/097223.html
>> libcap libnl libnl-genl libnl-nf libnl-route portaudio-v19 sbc were
>> floating with rc2, all of them fixed (according to test-dependencies.sh)
>> by
>> http://lists.openembedded.org/pipermail/openembedded-devel/2014-July/097255.html
>>
>> Regards,
>>
>>>>> Signed-off-by: Joe MacDonald <joe_macdonald@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%)
>>>
>>>
>>>
>>> --
>>> -Joe MacDonald.
>>> :wq
>>
>>
>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>>
>>
>>

Patch

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 <threeway@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 <threeway@gmail.com>
-Signed-off-by: Balint Reczey <balint@balintreczey.hu>
-Reviewed-on: https://code.wireshark.org/review/2464
-Reviewed-by: Evan Huus <eapache@gmail.com>
-Reviewed-by: Michael Mann <mmann78@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 <akuster@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