update to BlueZ hcidump 2.4

  This release adds support for A2MP, L2CAP create/move channel,
  SAP and additional AVRCP decoding.

8 files changed, 43 insertions, 29 deletions

diff --git a/sysutils/netbt-hcidump/Makefile b/sysutils/netbt-hcidump/Makefile
index 49b08936f54..a2db581d9f6 100644
--- a/sysutils/netbt-hcidump/Makefile
+++ b/sysutils/netbt-hcidump/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2012/03/09 18:12:55 plunky Exp $
+# $NetBSD: Makefile,v 1.7 2012/05/21 07:01:32 plunky Exp $
 
-DISTNAME=		bluez-hcidump-2.3
+DISTNAME=		bluez-hcidump-2.4
 PKGNAME=		${DISTNAME:S/bluez/netbt/}
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.kernel.org/pub/linux/bluetooth/
diff --git a/sysutils/netbt-hcidump/distinfo b/sysutils/netbt-hcidump/distinfo
index a4be55dec2a..8d1c5a81cf3 100644
--- a/sysutils/netbt-hcidump/distinfo
+++ b/sysutils/netbt-hcidump/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.9 2012/03/20 15:31:14 plunky Exp $
+$NetBSD: distinfo,v 1.10 2012/05/21 07:01:32 plunky Exp $
 
-SHA1 (bluez-hcidump-2.3.tar.gz) = d60e3546c27d68615fe908899ba0d6af5f4d4171
-RMD160 (bluez-hcidump-2.3.tar.gz) = 95ac3961c0ae5c15902d72733579d1dfb3bde04b
-Size (bluez-hcidump-2.3.tar.gz) = 190848 bytes
-SHA1 (patch-aa) = a56fc03afd98e020c0d46a46804450c538108454
+SHA1 (bluez-hcidump-2.4.tar.gz) = 0306b26f56f80abc8bcd520bb9ec949b44fae9f3
+RMD160 (bluez-hcidump-2.4.tar.gz) = eca3a9e9afd9a06f3f150217063c5e3a25b5be2f
+Size (bluez-hcidump-2.4.tar.gz) = 198657 bytes
+SHA1 (patch-aa) = ace424c4b8b88eabc46c7bfe8d7498cd55d88981
 SHA1 (patch-ab) = e70df2bd673a6442bc3d3312ad04260c9cde7394
-SHA1 (patch-ac) = c107f92140baff9939bc3d70d5da4ef42aff6817
+SHA1 (patch-ac) = 8bb167974e0dc883b0ffc2e5a66465d6e215fe9b
 SHA1 (patch-ad) = 65f5e76b20489907838d2eff47c6fdaea251a7e0
 SHA1 (patch-ae) = 29bd10d4149db9ed9f5970da66f855e3e8e2d5ec
 SHA1 (patch-af) = d32b7ac6add15c95fce071d1f64ad7e1f655c99f
-SHA1 (patch-ah) = 911e4c7d76b18681413a021df6cbf264cb13555e
+SHA1 (patch-ah) = e8902e5114c592f6f53706f804bdb1b90a5de07e
 SHA1 (patch-ai) = 44800df5e4b4b729cd73478eda0c330024235e81
 SHA1 (patch-aj) = 27b2298a968ca4306072950f5d49bb5c5204777a
-SHA1 (patch-ak) = d52a279487b5d3d423136f0dd1242516f3cc0596
+SHA1 (patch-ak) = e04b3abd80b038655792705c873a0d37e979435b
 SHA1 (patch-al) = 2d62a0a4203c1ecce7b71fd16fe909f0f4356d2c
 SHA1 (patch-am) = 7a0796c3cd89f21e4210592e28b667bc6afe6c5d
 SHA1 (patch-an) = f9889b24e5ec399ef6fb40055c5df5a560d20f92
-SHA1 (patch-ao) = 5971acdd513c85336d77827729fa410948101e8d
-SHA1 (patch-lib_Makefile) = 4a680d0692e6bd5974f23d826ce18d1d3ce04217
+SHA1 (patch-ao) = 61a9e2eb6ccc5f9777d5697866b28fbb81873eb6
+SHA1 (patch-lib_Makefile) = 0638edf87cbec814427a986505033d0a5e2acf2f
diff --git a/sysutils/netbt-hcidump/patches/patch-aa b/sysutils/netbt-hcidump/patches/patch-aa
index 719499d3dfb..3fde6e2f908 100644
--- a/sysutils/netbt-hcidump/patches/patch-aa
+++ b/sysutils/netbt-hcidump/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2012/03/19 12:09:00 plunky Exp $
+$NetBSD: patch-aa,v 1.4 2012/05/21 07:01:32 plunky Exp $
 
---- Makefile.orig	2012-03-19 12:00:46.000000000 +0000
+--- Makefile.orig	2012-05-21 06:50:14.000000000 +0000
 +++ Makefile
 @@ -0,0 +1,4 @@
 +
diff --git a/sysutils/netbt-hcidump/patches/patch-ac b/sysutils/netbt-hcidump/patches/patch-ac
index 217fa3f8c35..39694c60435 100644
--- a/sysutils/netbt-hcidump/patches/patch-ac
+++ b/sysutils/netbt-hcidump/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2012/03/19 12:09:00 plunky Exp $
+$NetBSD: patch-ac,v 1.4 2012/05/21 07:01:32 plunky Exp $
 
 --- lib/hci.h.orig	2012-02-29 18:23:20.000000000 +0000
 +++ lib/hci.h
@@ -10,7 +10,21 @@ $NetBSD: patch-ac,v 1.3 2012/03/19 12:09:00 plunky Exp $
  /* HCI dev events */
  #define HCI_DEV_REG	1
  #define HCI_DEV_UNREG	2
-@@ -107,6 +108,7 @@ enum {
+@@ -55,11 +56,13 @@ extern "C" {
+ #define HCI_RS232	4
+ #define HCI_PCI		5
+ #define HCI_SDIO	6
++#endif
+ 
+ /* HCI controller types */
+ #define HCI_BREDR	0x00
+ #define HCI_AMP		0x01
+ 
++#if 0
+ /* HCI device flags */
+ enum {
+ 	HCI_UP,
+@@ -107,6 +110,7 @@ enum {
  #define HCIUNBLOCKADDR	_IOW('H', 231, int)
  
  #define HCIINQUIRY	_IOR('H', 240, int)
@@ -18,7 +32,7 @@ $NetBSD: patch-ac,v 1.3 2012/03/19 12:09:00 plunky Exp $
  
  #ifndef __NO_HCI_DEFS
  
-@@ -2262,6 +2264,7 @@ typedef struct {
+@@ -2262,6 +2266,7 @@ typedef struct {
  
  #endif /* _NO_HCI_DEFS */
  
@@ -26,7 +40,7 @@ $NetBSD: patch-ac,v 1.3 2012/03/19 12:09:00 plunky Exp $
  /* HCI Socket options */
  #define HCI_DATA_DIR	1
  #define HCI_FILTER	2
-@@ -2374,6 +2377,12 @@ struct hci_inquiry_req {
+@@ -2374,6 +2379,12 @@ struct hci_inquiry_req {
  	uint8_t  num_rsp;
  };
  #define IREQ_CACHE_FLUSH 0x0001
diff --git a/sysutils/netbt-hcidump/patches/patch-ah b/sysutils/netbt-hcidump/patches/patch-ah
index ac536c32fc3..6f19b61d564 100644
--- a/sysutils/netbt-hcidump/patches/patch-ah
+++ b/sysutils/netbt-hcidump/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2012/02/15 09:30:23 plunky Exp $
+$NetBSD: patch-ah,v 1.3 2012/05/21 07:01:32 plunky Exp $
 
---- parser/parser.h.orig	2011-12-22 00:18:58.000000000 +0000
+--- parser/parser.h.orig	2012-04-20 19:28:19.000000000 +0000
 +++ parser/parser.h
 @@ -36,7 +36,7 @@ struct frame {
  	uint32_t	data_len;
diff --git a/sysutils/netbt-hcidump/patches/patch-ak b/sysutils/netbt-hcidump/patches/patch-ak
index 9c386f4f303..c4f558bedcf 100644
--- a/sysutils/netbt-hcidump/patches/patch-ak
+++ b/sysutils/netbt-hcidump/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.4 2012/03/19 12:09:00 plunky Exp $
+$NetBSD: patch-ak,v 1.5 2012/05/21 07:01:32 plunky Exp $
 
---- src/Makefile.orig	2012-03-19 12:00:46.000000000 +0000
+--- src/Makefile.orig	2012-05-21 06:50:14.000000000 +0000
 +++ src/Makefile
 @@ -0,0 +1,17 @@
 +.PATH: ../parser ../lib
@@ -14,7 +14,7 @@ $NetBSD: patch-ak,v 1.4 2012/03/19 12:09:00 plunky Exp $
 +	bluetooth.c hci_lib.c						\
 +	att.c avctp.c avdtp.c avrcp.c bnep.c bpa.c capi.c cmtp.c	\
 +	csr.c ericsson.c hci.c hcrp.c hidp.c l2cap.c lmp.c obex.c	\
-+	parser.c ppp.c rfcomm.c sdp.c smp.c tcpip.c
++	parser.c ppp.c rfcomm.c sap.c sdp.c smp.c tcpip.c
 +
 +CPPFLAGS+=	-I..
 +LDADD+=		-lbluetooth
diff --git a/sysutils/netbt-hcidump/patches/patch-ao b/sysutils/netbt-hcidump/patches/patch-ao
index ac71d9457fb..0f5479d75f9 100644
--- a/sysutils/netbt-hcidump/patches/patch-ao
+++ b/sysutils/netbt-hcidump/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.6 2012/03/19 12:09:00 plunky Exp $
+$NetBSD: patch-ao,v 1.7 2012/05/21 07:01:32 plunky Exp $
 
---- src/hcidump.c.orig	2012-02-29 18:23:20.000000000 +0000
+--- src/hcidump.c.orig	2012-04-20 19:28:19.000000000 +0000
 +++ src/hcidump.c
 @@ -48,6 +48,10 @@
  #include "lib/hci.h"
@@ -115,7 +115,7 @@ $NetBSD: patch-ao,v 1.6 2012/03/19 12:09:00 plunky Exp $
  {
  	while (1) {
  		int dd, sk;
-@@ -900,7 +930,7 @@ int main(int argc, char *argv[])
+@@ -904,7 +934,7 @@ int main(int argc, char *argv[])
  {
  	unsigned long flags = 0;
  	unsigned long filter = 0;
@@ -124,7 +124,7 @@ $NetBSD: patch-ao,v 1.6 2012/03/19 12:09:00 plunky Exp $
  	int defpsm = 0;
  	int defcompid = DEFAULT_COMPID;
  	int opt, pppdump_fd = -1, audio_fd = -1;
-@@ -910,7 +940,7 @@ int main(int argc, char *argv[])
+@@ -916,7 +946,7 @@ int main(int argc, char *argv[])
  		switch(opt) {
  		case 'i':
  			if (strcasecmp(optarg, "none") && strcasecmp(optarg, "system"))
diff --git a/sysutils/netbt-hcidump/patches/patch-lib_Makefile b/sysutils/netbt-hcidump/patches/patch-lib_Makefile
index 2f2fa057bea..da624758471 100644
--- a/sysutils/netbt-hcidump/patches/patch-lib_Makefile
+++ b/sysutils/netbt-hcidump/patches/patch-lib_Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-lib_Makefile,v 1.4 2012/03/20 15:31:14 plunky Exp $
+$NetBSD: patch-lib_Makefile,v 1.5 2012/05/21 07:01:32 plunky Exp $
 
---- lib/Makefile.orig	2012-03-20 15:14:03.000000000 +0000
+--- lib/Makefile.orig	2012-05-21 06:50:14.000000000 +0000
 +++ lib/Makefile
 @@ -0,0 +1,10 @@
 +# this file conflicts with parser/hci.c so just rename it