* [gentoo-commits] gentoo-x86 commit in net-libs/libbtbb/files: wireshark-1.8-btbb.patch
@ 2012-07-09 19:02 Richard Farina (zerochaos)
0 siblings, 0 replies; 2+ messages in thread
From: Richard Farina (zerochaos) @ 2012-07-09 19:02 UTC (permalink / raw
To: gentoo-commits
zerochaos 12/07/09 19:02:02
Added: wireshark-1.8-btbb.patch
Log:
add wireshark patches for bluetooth baseband support
(Portage version: 2.1.11.5/cvs/Linux x86_64)
Revision Changes Path
1.1 net-libs/libbtbb/files/wireshark-1.8-btbb.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libbtbb/files/wireshark-1.8-btbb.patch?rev=1.1&view=markup
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
Index: wireshark-1.8-btbb.patch
===================================================================
diff -urN wireshark-1.8.0.orig//CMakeLists.txt wireshark-1.8.0/CMakeLists.txt
--- wireshark-1.8.0.orig//CMakeLists.txt 2012-06-06 00:33:43.000000000 +0800
+++ wireshark-1.8.0/CMakeLists.txt 2012-06-25 21:48:57.997186003 +0800
@@ -409,6 +409,7 @@
set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}")
set(PLUGIN_SRC_DIRS
plugins/asn1
+ plugins/btbb
plugins/docsis
plugins/ethercat
plugins/gryphon
diff -urN wireshark-1.8.0.orig//Makefile.am wireshark-1.8.0/Makefile.am
--- wireshark-1.8.0.orig//Makefile.am 2012-06-20 01:47:22.000000000 +0800
+++ wireshark-1.8.0/Makefile.am 2012-06-25 21:50:00.721186002 +0800
@@ -273,6 +273,7 @@
-include plugins/Custom.make
plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
-dlopen plugins/asn1/asn1.la \
+ -dlopen plugins/btbb/btbb.la \
-dlopen plugins/docsis/docsis.la \
-dlopen plugins/ethercat/ethercat.la \
-dlopen plugins/gryphon/gryphon.la \
diff -urN wireshark-1.8.0.orig//configure.in wireshark-1.8.0/configure.in
--- wireshark-1.8.0.orig//configure.in 2012-06-22 02:21:10.000000000 +0800
+++ wireshark-1.8.0/configure.in 2012-06-25 21:51:10.925186002 +0800
@@ -2096,6 +2096,7 @@
packaging/svr4/pkginfo
plugins/Makefile
plugins/asn1/Makefile
+ plugins/btbb/Makefile
plugins/docsis/Makefile
plugins/ethercat/Makefile
plugins/gryphon/Makefile
diff -urN wireshark-1.8.0.orig//epan/Makefile.am wireshark-1.8.0/epan/Makefile.am
--- wireshark-1.8.0.orig//epan/Makefile.am 2012-06-09 08:46:54.000000000 +0800
+++ wireshark-1.8.0/epan/Makefile.am 2012-06-25 21:51:55.394186002 +0800
@@ -209,6 +209,8 @@
-include ../plugins/Custom.make
plugin_src = \
../plugins/asn1/packet-asn1.c \
+ ../plugins/btbb/packet-btbb.c \
+ ../plugins/btbb/packet-btlmp.c \
../plugins/docsis/packet-bintrngreq.c \
../plugins/docsis/packet-bpkmattr.c \
../plugins/docsis/packet-bpkmreq.c \
diff -urN wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake wireshark-1.8.0/packaging/nsis/Makefile.nmake
--- wireshark-1.8.0.orig//packaging/nsis/Makefile.nmake 2012-06-20 01:47:22.000000000 +0800
+++ wireshark-1.8.0/packaging/nsis/Makefile.nmake 2012-06-25 21:52:34.248186002 +0800
@@ -46,6 +46,7 @@
PLUGINS= \
../../plugins/asn1/asn1.dll \
+ ../../plugins/btbb/btbb.dll \
../../plugins/docsis/docsis.dll \
../../plugins/ethercat/ethercat.dll \
../../plugins/gryphon/gryphon.dll \
diff -urN wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi wireshark-1.8.0/packaging/nsis/wireshark.nsi
--- wireshark-1.8.0.orig//packaging/nsis/wireshark.nsi 2012-06-20 01:47:22.000000000 +0800
+++ wireshark-1.8.0/packaging/nsis/wireshark.nsi 2012-06-25 21:54:50.288185993 +0800
@@ -806,6 +806,7 @@
;-------------------------------------------
SetOutPath '$INSTDIR\plugins\${VERSION}'
File "${STAGING_DIR}\plugins\${VERSION}\asn1.dll"
+File "${STAGING_DIR}\plugins\${VERSION}\btbb.dll"
File "${STAGING_DIR}\plugins\${VERSION}\docsis.dll"
File "${STAGING_DIR}\plugins\${VERSION}\ethercat.dll"
File "${STAGING_DIR}\plugins\${VERSION}\gryphon.dll"
diff -urN wireshark-1.8.0.orig//plugins/Makefile.am wireshark-1.8.0/plugins/Makefile.am
--- wireshark-1.8.0.orig//plugins/Makefile.am 2012-06-06 00:33:17.000000000 +0800
+++ wireshark-1.8.0/plugins/Makefile.am 2012-06-25 21:55:15.766186001 +0800
@@ -24,6 +24,7 @@
-include Custom.make
SUBDIRS = $(_CUSTOM_SUBDIRS_) \
asn1 \
+ btbb \
docsis \
ethercat \
gryphon \
diff -urN wireshark-1.8.0.orig//plugins/Makefile.nmake wireshark-1.8.0/plugins/Makefile.nmake
--- wireshark-1.8.0.orig//plugins/Makefile.nmake 2012-06-06 00:33:17.000000000 +0800
+++ wireshark-1.8.0/plugins/Makefile.nmake 2012-06-25 21:55:32.469186000 +0800
@@ -8,6 +8,7 @@
PLUGIN_LIST = \
asn1 \
+ btbb \
docsis \
ethercat \
gryphon \
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-libs/libbtbb/files: wireshark-1.8-btbb.patch
@ 2012-07-11 21:42 Richard Farina (zerochaos)
0 siblings, 0 replies; 2+ messages in thread
From: Richard Farina (zerochaos) @ 2012-07-11 21:42 UTC (permalink / raw
To: gentoo-commits
zerochaos 12/07/11 21:42:14
Removed: wireshark-1.8-btbb.patch
Log:
rolling back major no no of third-party patches for wireshark
(Portage version: 2.1.11.5/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-11 21:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-11 21:42 [gentoo-commits] gentoo-x86 commit in net-libs/libbtbb/files: wireshark-1.8-btbb.patch Richard Farina (zerochaos)
-- strict thread matches above, loose matches on Subject: below --
2012-07-09 19:02 Richard Farina (zerochaos)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox