summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevie <stevie@65a5c917-d112-43f1-993d-58c26a4786be>2012-01-26 20:41:34 +0000
committerstevie <stevie@65a5c917-d112-43f1-993d-58c26a4786be>2012-01-26 20:41:34 +0000
commitec1c1cd252f6dcf445db33851af9ed87a167c1f9 (patch)
tree21b053b37c4b25f15085131a0dd1482ba7083e8f
parent92a60012cef59e2ea8ac80b5863c97bf60a4e624 (diff)
Add patch for WireShark 1.6.5.
git-svn-id: http://op25.osmocom.org/svn/trunk@296 65a5c917-d112-43f1-993d-58c26a4786be
-rw-r--r--wireshark/patches/wireshark-1.6.5.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/wireshark/patches/wireshark-1.6.5.patch b/wireshark/patches/wireshark-1.6.5.patch
new file mode 100644
index 0000000..0b8db90
--- /dev/null
+++ b/wireshark/patches/wireshark-1.6.5.patch
@@ -0,0 +1,66 @@
+diff -Naur a/configure.in b/configure.in
+--- a/configure.in 2012-01-11 05:09:07.000000000 +1000
++++ b/configure.in 2012-01-26 13:39:43.000000000 +1000
+@@ -2010,6 +2010,7 @@
+ plugins/m2m/Makefile
+ plugins/mate/Makefile
+ plugins/opcua/Makefile
++ plugins/p25/Makefile
+ plugins/profinet/Makefile
+ plugins/sercosiii/Makefile
+ plugins/stats_tree/Makefile
+diff -Naur a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2012-01-11 05:09:07.000000000 +1000
++++ b/Makefile.am 2012-01-26 13:39:43.000000000 +1000
+@@ -289,6 +289,7 @@
+ -dlopen plugins/m2m/m2m.la \
+ -dlopen plugins/mate/mate.la \
+ -dlopen plugins/opcua/opcua.la \
++ -dlopen plugins/p25/p25cai.la \
+ -dlopen plugins/profinet/profinet.la \
+ -dlopen plugins/sercosiii/sercosiii.la \
+ -dlopen plugins/stats_tree/stats_tree.la \
+diff -Naur a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
+--- a/packaging/nsis/Makefile.nmake 2012-01-11 05:09:01.000000000 +1000
++++ b/packaging/nsis/Makefile.nmake 2012-01-26 13:39:43.000000000 +1000
+@@ -57,6 +57,7 @@
+ ../../plugins/m2m/m2m.dll \
+ ../../plugins/mate/mate.dll \
+ ../../plugins/opcua/opcua.dll \
++ ../../plugins/p25/p25.dll \
+ ../../plugins/profinet/profinet.dll \
+ ../../plugins/sercosiii/sercosiii.dll \
+ ../../plugins/stats_tree/stats_tree.dll \
+diff -Naur a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
+--- a/packaging/nsis/wireshark.nsi 2012-01-11 05:09:01.000000000 +1000
++++ b/packaging/nsis/wireshark.nsi 2012-01-26 13:39:43.000000000 +1000
+@@ -910,6 +910,7 @@
+ File "..\..\plugins\irda\irda.dll"
+ File "..\..\plugins\m2m\m2m.dll"
+ File "..\..\plugins\opcua\opcua.dll"
++File "..\..\plugins\p25\p25.dll"
+ File "..\..\plugins\profinet\profinet.dll"
+ File "..\..\plugins\sercosiii\sercosiii.dll"
+ File "..\..\plugins\unistim\unistim.dll"
+diff -Naur a/plugins/Makefile.am b/plugins/Makefile.am
+--- a/plugins/Makefile.am 2012-01-11 05:08:21.000000000 +1000
++++ b/plugins/Makefile.am 2012-01-26 13:39:43.000000000 +1000
+@@ -33,6 +33,7 @@
+ m2m \
+ mate \
+ opcua \
++ p25 \
+ profinet \
+ sercosiii \
+ stats_tree \
+diff -Naur a/plugins/Makefile.nmake b/plugins/Makefile.nmake
+--- a/plugins/Makefile.nmake 2012-01-11 05:08:21.000000000 +1000
++++ b/plugins/Makefile.nmake 2012-01-26 13:39:43.000000000 +1000
+@@ -17,6 +17,7 @@
+ m2m \
+ mate \
+ opcua \
++ p25 \
+ profinet \
+ sercosiii \
+ stats_tree \