| 1 |
zerochaos 12/07/09 19:02:02 |
| 2 |
|
| 3 |
Added: wireshark-1.8-btbb.patch |
| 4 |
Log: |
| 5 |
add wireshark patches for bluetooth baseband support |
| 6 |
|
| 7 |
(Portage version: 2.1.11.5/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-libs/libbtbb/files/wireshark-1.8-btbb.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/files/wireshark-1.8-btbb.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/files/wireshark-1.8-btbb.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wireshark-1.8-btbb.patch |
| 16 |
=================================================================== |
| 17 |
diff -urN wireshark-1.8.0.orig//CMakeLists.txt wireshark-1.8.0/CMakeLists.txt |
| 18 |
--- wireshark-1.8.0.orig//CMakeLists.txt 2012-06-06 00:33:43.000000000 +0800 |
| 19 |
+++ wireshark-1.8.0/CMakeLists.txt 2012-06-25 21:48:57.997186003 +0800 |
| 20 |
@@ -409,6 +409,7 @@ |
| 21 |
set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}") |
| 22 |
set(PLUGIN_SRC_DIRS |
| 23 |
plugins/asn1 |
| 24 |
+ plugins/btbb |
| 25 |
plugins/docsis |
| 26 |
plugins/ethercat |
| 27 |
plugins/gryphon |
| 28 |
diff -urN wireshark-1.8.0.orig//Makefile.am wireshark-1.8.0/Makefile.am |
| 29 |
--- wireshark-1.8.0.orig//Makefile.am 2012-06-20 01:47:22.000000000 +0800 |
| 30 |
+++ wireshark-1.8.0/Makefile.am 2012-06-25 21:50:00.721186002 +0800 |
| 31 |
@@ -273,6 +273,7 @@ |
| 32 |
-include plugins/Custom.make |
| 33 |
plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \ |
| 34 |
-dlopen plugins/asn1/asn1.la \ |
| 35 |
+ -dlopen plugins/btbb/btbb.la \ |
| 36 |
-dlopen plugins/docsis/docsis.la \ |
| 37 |
-dlopen plugins/ethercat/ethercat.la \ |
| 38 |
-dlopen plugins/gryphon/gryphon.la \ |
| 39 |
diff -urN wireshark-1.8.0.orig//configure.in wireshark-1.8.0/configure.in |
| 40 |
--- wireshark-1.8.0.orig//configure.in 2012-06-22 02:21:10.000000000 +0800 |
| 41 |
+++ wireshark-1.8.0/configure.in 2012-06-25 21:51:10.925186002 +0800 |
| 42 |
@@ -2096,6 +2096,7 @@ |
| 43 |
packaging/svr4/pkginfo |
| 44 |
plugins/Makefile |
| 45 |
plugins/asn1/Makefile |
| 46 |
+ plugins/btbb/Makefile |
| 47 |
plugins/docsis/Makefile |
| 48 |
plugins/ethercat/Makefile |
| 49 |
plugins/gryphon/Makefile |
| 50 |
diff -urN wireshark-1.8.0.orig//epan/Makefile.am wireshark-1.8.0/epan/Makefile.am |
| 51 |
--- wireshark-1.8.0.orig//epan/Makefile.am 2012-06-09 08:46:54.000000000 +0800 |
| 52 |
+++ wireshark-1.8.0/epan/Makefile.am 2012-06-25 21:51:55.394186002 +0800 |
| 53 |
@@ -209,6 +209,8 @@ |
| 54 |
-include ../plugins/Custom.make |
| 55 |
plugin_src = \ |
| 56 |
../plugins/asn1/packet-asn1.c \ |
| 57 |
+ ../plugins/btbb/packet-btbb.c \ |
| 58 |
+ ../plugins/btbb/packet-btlmp.c \ |
| 59 |
../plugins/docsis/packet-bintrngreq.c \ |
| 60 |
../plugins/docsis/packet-bpkmattr.c \ |
| 61 |
../plugins/docsis/packet-bpkmreq.c \ |
| 62 |
diff -urN wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake wireshark-1.8.0/packaging/nsis/Makefile.nmake |
| 63 |
--- wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake 2012-06-20 01:47:22.000000000 +0800 |
| 64 |
+++ wireshark-1.8.0/packaging/nsis/Makefile.nmake 2012-06-25 21:52:34.248186002 +0800 |
| 65 |
@@ -46,6 +46,7 @@ |
| 66 |
|
| 67 |
PLUGINS= \ |
| 68 |
../../plugins/asn1/asn1.dll \ |
| 69 |
+ ../../plugins/btbb/btbb.dll \ |
| 70 |
../../plugins/docsis/docsis.dll \ |
| 71 |
../../plugins/ethercat/ethercat.dll \ |
| 72 |
../../plugins/gryphon/gryphon.dll \ |
| 73 |
diff -urN wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi wireshark-1.8.0/packaging/nsis/wireshark.nsi |
| 74 |
--- wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi 2012-06-20 01:47:22.000000000 +0800 |
| 75 |
+++ wireshark-1.8.0/packaging/nsis/wireshark.nsi 2012-06-25 21:54:50.288185993 +0800 |
| 76 |
@@ -806,6 +806,7 @@ |
| 77 |
;------------------------------------------- |
| 78 |
SetOutPath '$INSTDIR\plugins\${VERSION}' |
| 79 |
File "${STAGING_DIR}\plugins\${VERSION}\asn1.dll" |
| 80 |
+File "${STAGING_DIR}\plugins\${VERSION}\btbb.dll" |
| 81 |
File "${STAGING_DIR}\plugins\${VERSION}\docsis.dll" |
| 82 |
File "${STAGING_DIR}\plugins\${VERSION}\ethercat.dll" |
| 83 |
File "${STAGING_DIR}\plugins\${VERSION}\gryphon.dll" |
| 84 |
diff -urN wireshark-1.8.0.orig//plugins/Makefile.am wireshark-1.8.0/plugins/Makefile.am |
| 85 |
--- wireshark-1.8.0.orig//plugins/Makefile.am 2012-06-06 00:33:17.000000000 +0800 |
| 86 |
+++ wireshark-1.8.0/plugins/Makefile.am 2012-06-25 21:55:15.766186001 +0800 |
| 87 |
@@ -24,6 +24,7 @@ |
| 88 |
-include Custom.make |
| 89 |
SUBDIRS = $(_CUSTOM_SUBDIRS_) \ |
| 90 |
asn1 \ |
| 91 |
+ btbb \ |
| 92 |
docsis \ |
| 93 |
ethercat \ |
| 94 |
gryphon \ |
| 95 |
diff -urN wireshark-1.8.0.orig//plugins/Makefile.nmake wireshark-1.8.0/plugins/Makefile.nmake |
| 96 |
--- wireshark-1.8.0.orig//plugins/Makefile.nmake 2012-06-06 00:33:17.000000000 +0800 |
| 97 |
+++ wireshark-1.8.0/plugins/Makefile.nmake 2012-06-25 21:55:32.469186000 +0800 |
| 98 |
@@ -8,6 +8,7 @@ |
| 99 |
|
| 100 |
PLUGIN_LIST = \ |
| 101 |
asn1 \ |
| 102 |
+ btbb \ |
| 103 |
docsis \ |
| 104 |
ethercat \ |
| 105 |
gryphon \ |
Archives