· 6 years ago · Feb 20, 2019, 04:46 AM
1diff -Naur a/configure.in b/configure.in
2--- a/configure.in 2013-01-30 04:26:30.000000000 +1000
3+++ b/configure.in 2013-01-31 21:49:06.000000000 +1000
4@@ -2103,6 +2103,7 @@
5 plugins/m2m/Makefile
6 plugins/mate/Makefile
7 plugins/opcua/Makefile
8+ plugins/p25/Makefile
9 plugins/profinet/Makefile
10 plugins/stats_tree/Makefile
11 plugins/unistim/Makefile
12diff -Naur a/Makefile.am b/Makefile.am
13--- a/Makefile.am 2012-11-29 09:16:34.000000000 +1000
14+++ b/Makefile.am 2013-01-31 21:49:06.000000000 +1000
15@@ -281,6 +281,7 @@
16 -dlopen plugins/m2m/m2m.la \
17 -dlopen plugins/mate/mate.la \
18 -dlopen plugins/opcua/opcua.la \
19+ -dlopen plugins/p25/p25cai.la \
20 -dlopen plugins/profinet/profinet.la \
21 -dlopen plugins/stats_tree/stats_tree.la \
22 -dlopen plugins/unistim/unistim.la \
23diff -Naur a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
24--- a/packaging/nsis/Makefile.nmake 2012-07-28 09:36:21.000000000 +1000
25+++ b/packaging/nsis/Makefile.nmake 2013-01-31 21:49:06.000000000 +1000
26@@ -53,6 +53,7 @@
27 ../../plugins/m2m/m2m.dll \
28 ../../plugins/mate/mate.dll \
29 ../../plugins/opcua/opcua.dll \
30+ ../../plugins/p25/p25.dll \
31 ../../plugins/profinet/profinet.dll \
32 ../../plugins/stats_tree/stats_tree.dll \
33 ../../plugins/unistim/unistim.dll \
34diff -Naur a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
35--- a/packaging/nsis/wireshark.nsi 2012-09-24 06:28:33.000000000 +1000
36+++ b/packaging/nsis/wireshark.nsi 2013-01-31 21:49:52.000000000 +1000
37@@ -825,6 +825,7 @@
38 File "${STAGING_DIR}\plugins\${VERSION}\irda.dll"
39 File "${STAGING_DIR}\plugins\${VERSION}\m2m.dll"
40 File "${STAGING_DIR}\plugins\${VERSION}\opcua.dll"
41+File "${STAGING_DIR}\plugins\${VERSION}\p25.dll"
42 File "${STAGING_DIR}\plugins\${VERSION}\profinet.dll"
43 File "${STAGING_DIR}\plugins\${VERSION}\unistim.dll"
44 File "${STAGING_DIR}\plugins\${VERSION}\wimax.dll"
45diff -Naur a/plugins/Makefile.am b/plugins/Makefile.am
46--- a/plugins/Makefile.am 2012-09-27 21:45:19.000000000 +1000
47+++ b/plugins/Makefile.am 2013-01-31 21:49:06.000000000 +1000
48@@ -31,6 +31,7 @@
49 m2m \
50 mate \
51 opcua \
52+ p25 \
53 profinet \
54 stats_tree \
55 unistim \
56diff -Naur a/plugins/Makefile.nmake b/plugins/Makefile.nmake
57--- a/plugins/Makefile.nmake 2012-06-06 02:33:17.000000000 +1000
58+++ b/plugins/Makefile.nmake 2013-01-31 21:49:06.000000000 +1000
59@@ -15,6 +15,7 @@
60 m2m \
61 mate \
62 opcua \
63+ p25 \
64 profinet \
65 stats_tree \
66 unistim \
67diff -Naur a/AUTHORS b/AUTHORS
68--- a/AUTHORS 2012-06-16 18:38:51.000000000 +0000
69+++ b/AUTHORS 2019-02-18 01:20:35.518739426 +0000
70@@ -3550,7 +3550,7 @@
71 Vasanth Manickam <vasanth.manickam [AT] bt.com>
72 Julian Onions <julian.onions [AT] gmail.com>
73 Samuel Thibault <samuel.thibault [AT] ens-lyon.org>
74-Peter Kovář <peter.kovar [AT] gmail.com>
75+Peter Kovar <peter.kovar [AT] gmail.com>
76 Paul Ollis <paul.ollis [AT] roke.co.uk>
77 Dominik Kuhlen <dkuhlen [AT] gmx.net>
78 Karl Knoebl <karl.knoebl [AT] siemens.com>
79@@ -3641,7 +3641,7 @@
80 DeCount <aatrade [AT] libero.it>
81 Andras Veres-Szentkiralyi <vsza [AT] vsza.hu>
82 Jakob Hirsch <jh.wireshark-bugzilla [AT] plonk.de>
83-Роман Донченко <DXDragon [AT] yandex.ru>
84+Roman Donchenko <DXDragon [AT] yandex.ru>
85 <billyjeans [AT] gmail.com>
86 Evan Huus <eapache [AT] gmail.com>
87 Tom Cook <tcook [AT] ixiacom.com>
88diff -Naur a/epan/dissectors/packet-gluster.h b/epan/dissectors/packet-gluster.h
89--- a/epan/dissectors/packet-gluster.h 2012-06-05 16:33:36.000000000 +0000
90+++ b/epan/dissectors/packet-gluster.h 2019-02-18 01:15:45.515938575 +0000
91@@ -354,18 +354,6 @@
92 GFS3_OP_MAXVALUE
93 };
94
95-/* dir-entry types from libglusterfs/src/compat.h */
96-enum gluster_entry_types {
97- DT_UNKNOWN = 0,
98- DT_FIFO = 1,
99- DT_CHR = 2,
100- DT_DIR = 4,
101- DT_BLK = 6,
102- DT_REG = 8,
103- DT_LNK = 10,
104- DT_SOCK = 12,
105- DT_WHT = 14
106-};
107
108
109 /* LOCKING operators come from libglusterfs/src/glusterfs.h */
110diff -Naur a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
111--- a/epan/dissectors/packet-ssl-utils.c 2012-11-05 14:38:58.000000000 +0000
112+++ b/epan/dissectors/packet-ssl-utils.c 2019-02-18 01:19:39.543021444 +0000
113@@ -23,6 +23,8 @@
114 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
115 */
116
117+#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
118+
119 #ifdef HAVE_CONFIG_H
120 # include "config.h"
121 #endif
122diff -Naur a/ui/gtk/export_object_smb.c b/ui/gtk/export_object_smb.c
123--- a/ui/gtk/export_object_smb.c 2012-06-05 16:33:15.000000000 +0000
124+++ b/ui/gtk/export_object_smb.c 2019-02-18 01:19:08.715181390 +0000
125@@ -28,6 +28,8 @@
126 * USA.
127 */
128
129+#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
130+
131 #ifdef HAVE_CONFIG_H
132 # include "config.h"
133 #endif