From 1fa62b9a7e34d5837bc329f9af56845131313cd5 Mon Sep 17 00:00:00 2001 From: mossmann Date: Mon, 5 Oct 2009 19:55:27 +0000 Subject: [PATCH] added patch for wireshark 1.2.2 stable source release git-svn-id: http://op25.osmocom.org/svn/trunk@180 65a5c917-d112-43f1-993d-58c26a4786be --- wireshark/patches/wireshark-1.2.2.patch | 76 +++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 wireshark/patches/wireshark-1.2.2.patch diff --git a/wireshark/patches/wireshark-1.2.2.patch b/wireshark/patches/wireshark-1.2.2.patch new file mode 100644 index 0000000..63d26ca --- /dev/null +++ b/wireshark/patches/wireshark-1.2.2.patch @@ -0,0 +1,76 @@ +diff -ur wireshark-1.2.2/Makefile.am wireshark-1.2.2-p25/Makefile.am +--- wireshark-1.2.2/Makefile.am 2009-09-14 19:50:46.000000000 -0600 ++++ wireshark-1.2.2-p25/Makefile.am 2009-10-05 13:12:03.000000000 -0600 +@@ -254,6 +254,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 -ur wireshark-1.2.2/configure.in wireshark-1.2.2-p25/configure.in +--- wireshark-1.2.2/configure.in 2009-09-14 19:50:45.000000000 -0600 ++++ wireshark-1.2.2-p25/configure.in 2009-10-05 13:14:06.000000000 -0600 +@@ -1711,6 +1711,7 @@ + plugins/m2m/Makefile + plugins/mate/Makefile + plugins/opcua/Makefile ++ plugins/p25/Makefile + plugins/profinet/Makefile + plugins/sercosiii/Makefile + plugins/stats_tree/Makefile +diff -ur wireshark-1.2.2/packaging/nsis/Makefile.nmake wireshark-1.2.2-p25/packaging/nsis/Makefile.nmake +--- wireshark-1.2.2/packaging/nsis/Makefile.nmake 2009-09-14 19:50:33.000000000 -0600 ++++ wireshark-1.2.2-p25/packaging/nsis/Makefile.nmake 2009-10-05 13:15:44.000000000 -0600 +@@ -55,6 +55,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 -ur wireshark-1.2.2/packaging/nsis/wireshark.nsi wireshark-1.2.2-p25/packaging/nsis/wireshark.nsi +--- wireshark-1.2.2/packaging/nsis/wireshark.nsi 2009-09-14 19:50:33.000000000 -0600 ++++ wireshark-1.2.2-p25/packaging/nsis/wireshark.nsi 2009-10-05 13:15:30.000000000 -0600 +@@ -820,6 +820,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 -ur wireshark-1.2.2/plugins/Makefile.am wireshark-1.2.2-p25/plugins/Makefile.am +--- wireshark-1.2.2/plugins/Makefile.am 2009-09-14 19:47:26.000000000 -0600 ++++ wireshark-1.2.2-p25/plugins/Makefile.am 2009-10-05 13:16:10.000000000 -0600 +@@ -32,6 +32,7 @@ + m2m \ + mate \ + opcua \ ++ p25 \ + profinet \ + sercosiii \ + stats_tree \ +diff -ur wireshark-1.2.2/plugins/Makefile.nmake wireshark-1.2.2-p25/plugins/Makefile.nmake +--- wireshark-1.2.2/plugins/Makefile.nmake 2009-09-14 19:47:26.000000000 -0600 ++++ wireshark-1.2.2-p25/plugins/Makefile.nmake 2009-10-05 13:18:35.000000000 -0600 +@@ -57,6 +57,9 @@ + cd opcua + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET) + cd .. ++ cd p25 ++ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET) ++ cd .. + cd profinet + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET) + cd .. +@@ -94,6 +97,7 @@ + xcopy plugins\m2m\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d + xcopy plugins\mate\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d + xcopy plugins\opcua\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d ++ xcopy plugins\p25\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d + xcopy plugins\profinet\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d + xcopy plugins\sercosiii\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d + xcopy plugins\stats_tree\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d