Update to 1.10.3. See

http://www.wireshark.org/docs/relnotes/wireshark-1.10.3.html for a list
of changes in this release.

2 files changed, 0 insertions, 57 deletions

diff --git a/net/wireshark/files/patch-epan_dissectors_packet-gluster.h b/net/wireshark/files/patch-epan_dissectors_packet-gluster.h
deleted file mode 100644
index 6a4359fd1ecb..000000000000
--- a/net/wireshark/files/patch-epan_dissectors_packet-gluster.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- epan/dissectors/packet-gluster.h.orig	2013-04-22 14:05:17.000000000 -0400
-+++ epan/dissectors/packet-gluster.h	2013-10-12 13:14:25.000000000 -0400
-@@ -356,18 +356,17 @@ enum gf_fop_procnum {
- 
- /* dir-entry types from libglusterfs/src/compat.h */
- enum gluster_entry_types {
--	DT_UNKNOWN = 0,
--	DT_FIFO = 1,
--	DT_CHR = 2,
--	DT_DIR = 4,
--	DT_BLK = 6,
--	DT_REG = 8,
--	DT_LNK = 10,
--	DT_SOCK = 12,
--	DT_WHT = 14
-+	GLFS_DT_UNKNOWN = 0,
-+	GLFS_DT_FIFO = 1,
-+	GLFS_DT_CHR = 2,
-+	GLFS_DT_DIR = 4,
-+	GLFS_DT_BLK = 6,
-+	GLFS_DT_REG = 8,
-+	GLFS_DT_LNK = 10,
-+	GLFS_DT_SOCK = 12,
-+	GLFS_DT_WHT = 14
- };
- 
--
- /* LOCKING operators come from libglusterfs/src/glusterfs.h */
- 
- /* based on original enum glusterfs_lk_cmds_t */
diff --git a/net/wireshark/files/patch-epan_dissectors_packet-glusterfs.c b/net/wireshark/files/patch-epan_dissectors_packet-glusterfs.c
deleted file mode 100644
index f142c771d2b7..000000000000
--- a/net/wireshark/files/patch-epan_dissectors_packet-glusterfs.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- epan/dissectors/packet-glusterfs.c.orig	2013-04-22 14:05:16.000000000 -0400
-+++ epan/dissectors/packet-glusterfs.c	2013-10-12 13:18:58.000000000 -0400
-@@ -2002,15 +2002,15 @@ static value_string_ext glusterfs3_1_fop
- 
- /* dir-entry types */
- static const value_string glusterfs_entry_type_names[] = {
--	{ DT_UNKNOWN, "DT_UNKNOWN" },
--	{ DT_FIFO,    "DT_FIFO" },
--	{ DT_CHR,     "DT_CHR" },
--	{ DT_DIR,     "DT_DIR" },
--	{ DT_BLK,     "DT_BLK" },
--	{ DT_REG,     "DT_REG" },
--	{ DT_LNK,     "DT_LNK" },
--	{ DT_SOCK,    "DT_SOCK" },
--	{ DT_WHT,     "DT_WHT" },
-+	{ GLFS_DT_UNKNOWN, "DT_UNKNOWN" },
-+	{ GLFS_DT_FIFO,    "DT_FIFO" },
-+	{ GLFS_DT_CHR,     "DT_CHR" },
-+	{ GLFS_DT_DIR,     "DT_DIR" },
-+	{ GLFS_DT_BLK,     "DT_BLK" },
-+	{ GLFS_DT_REG,     "DT_REG" },
-+	{ GLFS_DT_LNK,     "DT_LNK" },
-+	{ GLFS_DT_SOCK,    "DT_SOCK" },
-+	{ GLFS_DT_WHT,     "DT_WHT" },
- 	{ 0, NULL }
- };
- static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names);