Thu Mar 19 19:16:31 2015 UTC ()
Fix format string on ILP32 platforms with 64bit time_t.


(joerg)
diff -r1.10 -r1.11 pkgsrc/sysutils/netbt-hcidump/Makefile
diff -r1.13 -r1.14 pkgsrc/sysutils/netbt-hcidump/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_parser.h
cvs diff -r1.10 -r1.11 pkgsrc/sysutils/netbt-hcidump/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/netbt-hcidump/Makefile 2014/12/30 08:39:13 1.10
+++ pkgsrc/sysutils/netbt-hcidump/Makefile 2015/03/19 19:16:31 1.11
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.10 2014/12/30 08:39:13 plunky Exp $ 1# $NetBSD: Makefile,v 1.11 2015/03/19 19:16:31 joerg Exp $
2 2
3DISTNAME= bluez-5.27 3DISTNAME= bluez-5.27
4PKGNAME= netbt-hcidump-${BLUEZ_VERSION} 4PKGNAME= netbt-hcidump-${BLUEZ_VERSION}
 5PKGREVISION= 1
5CATEGORIES= sysutils 6CATEGORIES= sysutils
6MASTER_SITES= http://www.kernel.org/pub/linux/bluetooth/ 7MASTER_SITES= http://www.kernel.org/pub/linux/bluetooth/
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= plunky@NetBSD.org 10MAINTAINER= plunky@NetBSD.org
10HOMEPAGE= http://www.bluez.org/ 11HOMEPAGE= http://www.bluez.org/
11COMMENT= Bluetooth packet analyzer (netbt version) 12COMMENT= Bluetooth packet analyzer (netbt version)
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14BLUEZ_VERSION= ${DISTNAME:S/bluez-//} 15BLUEZ_VERSION= ${DISTNAME:S/bluez-//}
15 16
16EXTRACT_USING= bsdtar 17EXTRACT_USING= bsdtar
17 18
cvs diff -r1.13 -r1.14 pkgsrc/sysutils/netbt-hcidump/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/netbt-hcidump/distinfo 2014/12/30 08:39:13 1.13
+++ pkgsrc/sysutils/netbt-hcidump/distinfo 2015/03/19 19:16:31 1.14
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.13 2014/12/30 08:39:13 plunky Exp $ 1$NetBSD: distinfo,v 1.14 2015/03/19 19:16:31 joerg Exp $
2 2
3SHA1 (bluez-5.27.tar.xz) = c1707e8ae38b299c07e6c18ff3c26a4b928d03bf 3SHA1 (bluez-5.27.tar.xz) = c1707e8ae38b299c07e6c18ff3c26a4b928d03bf
4RMD160 (bluez-5.27.tar.xz) = 21cec0a67c70215cc6972a0bfd5679b1a5fa8fac 4RMD160 (bluez-5.27.tar.xz) = 21cec0a67c70215cc6972a0bfd5679b1a5fa8fac
5Size (bluez-5.27.tar.xz) = 1542348 bytes 5Size (bluez-5.27.tar.xz) = 1542348 bytes
6SHA1 (patch-Makefile) = 24c3f132b0c454c7f06915ca368b67e463c4e4f0 6SHA1 (patch-Makefile) = 24c3f132b0c454c7f06915ca368b67e463c4e4f0
7SHA1 (patch-lib_Makefile) = da5f72d18fe46ce3c13543976b38b3d010da4b86 7SHA1 (patch-lib_Makefile) = da5f72d18fe46ce3c13543976b38b3d010da4b86
8SHA1 (patch-lib_bluetooth.c) = 997da8b1f00bf0093ca45cdd5c416d6155c591ea 8SHA1 (patch-lib_bluetooth.c) = 997da8b1f00bf0093ca45cdd5c416d6155c591ea
9SHA1 (patch-lib_bluetooth.h) = cd200dfefdabe7a517928c62848faceb41fb302a 9SHA1 (patch-lib_bluetooth.h) = cd200dfefdabe7a517928c62848faceb41fb302a
10SHA1 (patch-lib_hci.c) = 825b01082e2be2336c429e27ec78348fe4c39985 10SHA1 (patch-lib_hci.c) = 825b01082e2be2336c429e27ec78348fe4c39985
11SHA1 (patch-lib_hci.h) = e032192fba2b96cf44888a7ae383685e11ae16b7 11SHA1 (patch-lib_hci.h) = e032192fba2b96cf44888a7ae383685e11ae16b7
12SHA1 (patch-lib_hci__lib.h) = aa2768c85c1a775cbc65d4274e1a9cb47f16a7da 12SHA1 (patch-lib_hci__lib.h) = aa2768c85c1a775cbc65d4274e1a9cb47f16a7da
13SHA1 (patch-lib_l2cap.h) = 744d600f5b25eaf8f7fca6646d5dbdd73f709753 13SHA1 (patch-lib_l2cap.h) = 744d600f5b25eaf8f7fca6646d5dbdd73f709753
14SHA1 (patch-src_shared_util.h) = 349f8869b54746d5799af5beadd390dffd5f260b 14SHA1 (patch-src_shared_util.h) = 349f8869b54746d5799af5beadd390dffd5f260b
15SHA1 (patch-tools_Makefile) = 4c63cb92ce4fc8446fcb6b16a60f17d68b25078f 15SHA1 (patch-tools_Makefile) = 4c63cb92ce4fc8446fcb6b16a60f17d68b25078f
16SHA1 (patch-tools_hcidump.1) = 3981ca329e9837ea9719fea59277357a435cc265 16SHA1 (patch-tools_hcidump.1) = 3981ca329e9837ea9719fea59277357a435cc265
17SHA1 (patch-tools_hcidump.c) = ca6871ca562bc218ce445edf8b364f528d260d4e 17SHA1 (patch-tools_hcidump.c) = ca6871ca562bc218ce445edf8b364f528d260d4e
18SHA1 (patch-tools_parser_Makefile) = 5f3e3c3b73a88756e485318d4b00e64d42366fa3 18SHA1 (patch-tools_parser_Makefile) = 5f3e3c3b73a88756e485318d4b00e64d42366fa3
19SHA1 (patch-tools_parser_bnep.c) = efbbe5f4cd47dcb0bf72c16bd67d9d93ba7cd43a 19SHA1 (patch-tools_parser_bnep.c) = efbbe5f4cd47dcb0bf72c16bd67d9d93ba7cd43a
20SHA1 (patch-tools_parser_lmp.c) = f410be55cf07f6d7f7d3b1466b7fbe708b1a6de5 20SHA1 (patch-tools_parser_lmp.c) = f410be55cf07f6d7f7d3b1466b7fbe708b1a6de5
21SHA1 (patch-tools_parser_parser.h) = f644764b717fa8d1ae7935cc83b4199e6cd69159 21SHA1 (patch-tools_parser_parser.h) = 19ff1cdd8d7af71d9ae86497d3e1f49ae9db9a2a
22SHA1 (patch-tools_parser_rfcomm.h) = 917dd10203c62de7679909fc014a69ccd2a5185d 22SHA1 (patch-tools_parser_rfcomm.h) = 917dd10203c62de7679909fc014a69ccd2a5185d
23SHA1 (patch-tools_parser_tcpip.c) = e06881372e8edf23f22c1a0a61c9bc346381a0e3 23SHA1 (patch-tools_parser_tcpip.c) = e06881372e8edf23f22c1a0a61c9bc346381a0e3
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_parser.h (expand / switch to unified diff)

--- pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_parser.h 2014/12/30 08:39:13 1.1
+++ pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_parser.h 2015/03/19 19:16:31 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-tools_parser_parser.h,v 1.1 2014/12/30 08:39:13 plunky Exp $ 1$NetBSD: patch-tools_parser_parser.h,v 1.2 2015/03/19 19:16:31 joerg Exp $
2 2
3the device ID is a string on netbt stack 3the device ID is a string on netbt stack
4 4
5--- tools/parser/parser.h.orig 2014-03-25 20:53:42.000000000 +0000 5--- tools/parser/parser.h.orig 2014-03-25 20:53:42.000000000 +0000
6+++ tools/parser/parser.h 6+++ tools/parser/parser.h
7@@ -37,7 +37,7 @@ struct frame { 7@@ -37,7 +37,7 @@ struct frame {
8 uint32_t data_len; 8 uint32_t data_len;
9 void *ptr; 9 void *ptr;
10 uint32_t len; 10 uint32_t len;
11- uint16_t dev_id; 11- uint16_t dev_id;
12+ char *dev_id; 12+ char *dev_id;
13 uint8_t in; 13 uint8_t in;
14 uint8_t master; 14 uint8_t master;
15 uint16_t handle; 15 uint16_t handle;
16@@ -135,9 +135,9 @@ static inline void p_indent(int level, s 16@@ -135,9 +135,9 @@ static inline void p_indent(int level, s
17 localtime_r(&t, &tm); 17 localtime_r(&t, &tm);
18 printf("%04d-%02d-%02d %02d:%02d:%02d.%06lu ", 18 printf("%04d-%02d-%02d %02d:%02d:%02d.%06lu ",
19 tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, 19 tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
20- tm.tm_hour, tm.tm_min, tm.tm_sec, f->ts.tv_usec); 20- tm.tm_hour, tm.tm_min, tm.tm_sec, f->ts.tv_usec);
21+ tm.tm_hour, tm.tm_min, tm.tm_sec, (unsigned long)f->ts.tv_usec); 21+ tm.tm_hour, tm.tm_min, tm.tm_sec, (unsigned long)f->ts.tv_usec);
22 } else 22 } else
23- printf("%8lu.%06lu ", f->ts.tv_sec, f->ts.tv_usec); 23- printf("%8lu.%06lu ", f->ts.tv_sec, f->ts.tv_usec);
24+ printf("%8lu.%06lu ", f->ts.tv_sec, (unsigned long)f->ts.tv_usec); 24+ printf("%8ju.%06lu ", (uintmax_t)f->ts.tv_sec, (unsigned long)f->ts.tv_usec);
25 } 25 }
26 printf("%c ", (f->in ? '>' : '<')); 26 printf("%c ", (f->in ? '>' : '<'));
27 parser.state = 1; 27 parser.state = 1;