23195793 Upgrade Wireshark to version 2.0.3
authorPetr Sumbera <petr.sumbera@oracle.com>
Thu, 28 Apr 2016 01:48:52 -0700
changeset 5873 1b57430f3995
parent 5872 1cb591a3235b
child 5874 4078dc2a92c4
23195793 Upgrade Wireshark to version 2.0.3 23182108 problem in UTILITY/WIRESHARK 23182028 problem in UTILITY/WIRESHARK
components/wireshark/Makefile
components/wireshark/patches/Bug12236-1.patch
components/wireshark/patches/Bug12236-2.patch
components/wireshark/wireshark-common.p5m
--- a/components/wireshark/Makefile	Wed Apr 27 05:01:55 2016 -0700
+++ b/components/wireshark/Makefile	Thu Apr 28 01:48:52 2016 -0700
@@ -26,14 +26,14 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	2.0.2
+COMPONENT_VERSION=	2.0.3
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1
+    sha256:e196376e75fe21fdef41b4eaa27ce2e1b2b561e7f7b20328a8e96657cc4465fc
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 
-TPNO=			27086
+TPNO=			28025
 
 # Depends on S12-only changes in ON.
 ifeq ($(BUILD_TYPE), evaluation)
--- a/components/wireshark/patches/Bug12236-1.patch	Wed Apr 27 05:01:55 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-From 3570d264c1de081fe0d05309efab46ef569de07e Mon Sep 17 00:00:00 2001
-From: Guy Harris <[email protected]>
-Date: Tue, 15 Mar 2016 14:20:02 -0700
-Subject: [PATCH] FT_BOOLEAN is now stored as a 64-bit value; treat it as such.
-
-Always look and set the uinteger64 member of the union for FT_BOOLEAN
-values.
-
-Bug: 12236
-Change-Id: I7b0166e564b9d6cbb80051a81714a4b4c5f740a2
-Reviewed-on: https://code.wireshark.org/review/14481
-Reviewed-by: Guy Harris <[email protected]>
----
- epan/dfilter/semcheck.c     |  4 ++--
- epan/ftypes/ftype-integer.c | 14 +++++++-------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
-index de01413..b1fb17b 100644
---- epan/dfilter/semcheck.c
-+++ epan/dfilter/semcheck.c
[email protected]@ -260,10 +260,10 @@ mk_fvalue_from_val_string(dfwork_t *dfw, header_field_info *hfinfo, char *s)
- 		}
- 
- 		if (g_ascii_strcasecmp(s, tf->true_string) == 0) {
--			return mk_uint32_fvalue(TRUE);
-+			return mk_uint64_fvalue(TRUE);
- 		}
- 		else if (g_ascii_strcasecmp(s, tf->false_string) == 0) {
--			return mk_uint32_fvalue(FALSE);
-+			return mk_uint64_fvalue(FALSE);
- 		}
- 		else {
- 			/*
-diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
-index b3e6cde..b95d7b5 100644
---- epan/ftypes/ftype-integer.c
-+++ epan/ftypes/ftype-integer.c
[email protected]@ -675,7 +675,7 @@ cmp_bitwise_and64(const fvalue_t *a, const fvalue_t *b)
- static void
- boolean_fvalue_new(fvalue_t *fv)
- {
--	fv->value.uinteger = TRUE;
-+	fv->value.uinteger64 = TRUE;
- }
- 
- static int
[email protected]@ -687,7 +687,7 @@ boolean_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_, int field_display _U_)
- static void
- boolean_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf)
- {
--	*buf++ = (fv->value.uinteger) ? '1' : '0';
-+	*buf++ = (fv->value.uinteger64) ? '1' : '0';
- 	*buf   = '\0';
- }
- 
[email protected]@ -695,8 +695,8 @@ boolean_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *b
- static gboolean
- bool_eq(const fvalue_t *a, const fvalue_t *b)
- {
--	if (a->value.uinteger) {
--		if (b->value.uinteger) {
-+	if (a->value.uinteger64) {
-+		if (b->value.uinteger64) {
- 			return TRUE;
- 		}
- 		else {
[email protected]@ -704,7 +704,7 @@ bool_eq(const fvalue_t *a, const fvalue_t *b)
- 		}
- 	}
- 	else {
--		if (b->value.uinteger) {
-+		if (b->value.uinteger64) {
- 			return FALSE;
- 		}
- 		else {
[email protected]@ -1503,14 +1503,14 @@ ftype_register_integers(void)
- 		NULL,				/* set_value_time */
- 		NULL,				/* set_value_string */
- 		NULL,				/* set_value_tvbuff */
--		set_uinteger,			/* set_value_uinteger */
-+		NULL,				/* set_value_uinteger */
- 		NULL,				/* set_value_sinteger */
- 		set_uinteger64,			/* set_value_uinteger64 */
- 		NULL,				/* set_value_sinteger64 */
- 		NULL,				/* set_value_floating */
- 
- 		NULL,				/* get_value */
--		get_uinteger,			/* get_value_uinteger */
-+		NULL,				/* get_value_uinteger */
- 		NULL,				/* get_value_sinteger */
- 		get_uinteger64,			/* get_value_uinteger64 */
- 		NULL,				/* get_value_sinteger64 */
--- a/components/wireshark/patches/Bug12236-2.patch	Wed Apr 27 05:01:55 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-From af8de1a7c5dc944cb0f49dd4dd8004c400d87a00 Mon Sep 17 00:00:00 2001
-From: Guy Harris <[email protected]>
-Date: Tue, 15 Mar 2016 16:08:06 -0700
-Subject: [PATCH] More "FT_BOOLEAN is 64-bit" fixes.
-
-Change-Id: Iaacd492858ca2fb98c4947d587fbbd26fc102a7d
-Reviewed-on: https://code.wireshark.org/review/14486
-Reviewed-by: Guy Harris <[email protected]>
----
- epan/print.c             | 2 +-
- epan/proto.c             | 6 +++---
- epan/wslua/wslua_field.c | 2 +-
- rawshark.c               | 4 ++--
- ui/gtk/packet_win.c      | 2 +-
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/epan/print.c b/epan/print.c
-index 5e25ed5..ca4aa71 100644
---- epan/print.c
-+++ epan/print.c
[email protected]@ -434,13 +434,13 @@ proto_tree_write_node_pdml(proto_node *node, gpointer data)
-                         case FT_UINT16:
-                         case FT_UINT24:
-                         case FT_UINT32:
--                        case FT_BOOLEAN:
-                             fprintf(pdata->fh, "%X", fvalue_get_uinteger(&fi->value));
-                             break;
-                         case FT_INT40:
-                         case FT_INT48:
-                         case FT_INT56:
-                         case FT_INT64:
-+                        case FT_BOOLEAN:
-                             fprintf(pdata->fh, "%" G_GINT64_MODIFIER "X", fvalue_get_sinteger64(&fi->value));
-                             break;
-                         case FT_UINT40:
-diff --git a/epan/proto.c b/epan/proto.c
-index 416b036..87043c9 100644
---- epan/proto.c
-+++ epan/proto.c
[email protected]@ -5002,18 +5002,18 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence,
- 						break;
- 
- 					case FT_BOOLEAN:
--						number = fvalue_get_uinteger(&finfo->value);
-+						number64 = fvalue_get_uinteger64(&finfo->value);
- 						tfstring = (const true_false_string *)&tfs_true_false;
- 						if (hfinfo->strings) {
- 							tfstring = (const struct true_false_string*) hfinfo->strings;
- 						}
- 						offset_r += protoo_strlcpy(result+offset_r,
--								number ?
-+								number64 ?
- 								tfstring->true_string :
- 								tfstring->false_string, size-offset_r);
- 
- 						offset_e += protoo_strlcpy(expr+offset_e,
--								number ? "1" : "0", size-offset_e);
-+								number64 ? "1" : "0", size-offset_e);
- 						break;
- 
- 						/* XXX - make these just FT_NUMBER? */
-diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c
-index 0bb3e26..598931a 100644
---- epan/wslua/wslua_field.c
-+++ epan/wslua/wslua_field.c
[email protected]@ -95,7 +95,7 @@ WSLUA_METAMETHOD FieldInfo__call(lua_State* L) {
- 
-     switch(fi->ws_fi->hfinfo->type) {
-         case FT_BOOLEAN:
--                lua_pushboolean(L,(int)fvalue_get_uinteger(&(fi->ws_fi->value)));
-+                lua_pushboolean(L,(int)fvalue_get_uinteger64(&(fi->ws_fi->value)));
-                 return 1;
-         case FT_UINT8:
-         case FT_UINT16:
-diff --git a/rawshark.c b/rawshark.c
-index 523313c..8fe7713 100644
---- rawshark.c
-+++ rawshark.c
[email protected]@ -1313,9 +1313,9 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index)
-                     case SF_STRVAL:
-                         switch(hfinfo->type) {
-                             case FT_BOOLEAN:
--                                uvalue = fvalue_get_uinteger(&finfo->value);
-+                                uvalue64 = fvalue_get_uinteger64(&finfo->value);
-                                 tfstring = (const struct true_false_string*) hfinfo->strings;
--                                g_string_append(label_s, uvalue ? tfstring->true_string : tfstring->false_string);
-+                                g_string_append(label_s, uvalue64 ? tfstring->true_string : tfstring->false_string);
-                                 break;
-                             case FT_INT8:
-                             case FT_INT16:
-diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
-index 179988b..7459019 100644
---- ui/gtk/packet_win.c
-+++ ui/gtk/packet_win.c
[email protected]@ -611,7 +611,7 @@ new_finfo_window(GtkWidget *w, struct FieldinfoWinData *DataPtr)
- 
- 	} else if (finfo_type == FT_BOOLEAN) {
- 		fvalue_edit = gtk_check_button_new();
--		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fvalue_edit), (fvalue_get_uinteger(&finfo->value) != 0));
-+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fvalue_edit), (fvalue_get_uinteger64(&finfo->value) != 0));
- 		g_signal_connect(fvalue_edit, "toggled", G_CALLBACK(finfo_boolean_changed), DataPtr);
- 
- 	} else if (finfo_type == FT_IPv4) {
--- a/components/wireshark/wireshark-common.p5m	Wed Apr 27 05:01:55 2016 -0700
+++ b/components/wireshark/wireshark-common.p5m	Thu Apr 28 01:48:52 2016 -0700
@@ -37,11 +37,9 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file exec_attr.dumpcap \
     path=etc/security/exec_attr.d/diagnostic:wireshark:wireshark-common
-link path=usr/lib/$(MACH64)/libwireshark.so \
-    target=libwireshark.so.6.0.$(MICRO_VERSION)
-link path=usr/lib/$(MACH64)/libwireshark.so.6 \
-    target=libwireshark.so.6.0.$(MICRO_VERSION)
-file path=usr/lib/$(MACH64)/libwireshark.so.6.0.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.6.1.0
+link path=usr/lib/$(MACH64)/libwireshark.so.6 target=libwireshark.so.6.1.0
+file path=usr/lib/$(MACH64)/libwireshark.so.6.1.0
 link path=usr/lib/$(MACH64)/libwiretap.so \
     target=libwiretap.so.5.0.$(MICRO_VERSION)
 link path=usr/lib/$(MACH64)/libwiretap.so.5 \