From 58ed5de7dc036b76f61515e7d13798a953d61359 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell+pkgsrc-wip@mumble.net>
Date: Sat, 2 Apr 2016 18:38:12 +0000
Subject: [PATCH] Patch some little bugs in android adb.

---
 android-tools-adb/distinfo                    |  7 +++++--
 android-tools-adb/patches/patch-commandline.c | 15 +++++++++++++++
 android-tools-adb/patches/patch-sockets.c     | 18 ++++++++++++++++++
 android-tools-adb/patches/patch-usb__libusb.c | 15 ++++++++++++++-
 4 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 android-tools-adb/patches/patch-commandline.c
 create mode 100644 android-tools-adb/patches/patch-sockets.c

diff --git a/android-tools-adb/distinfo b/android-tools-adb/distinfo
index b759513..25d4f0b 100644
--- a/android-tools-adb/distinfo
+++ b/android-tools-adb/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.2 2015/03/07 16:28:33 tnn2 Exp $
+$NetBSD$
 
 SHA1 (platform_system_core-android-5.0.2_r1.tar.gz) = fc5626cf84cc18175be498ea3e664d7c7b188c27
 RMD160 (platform_system_core-android-5.0.2_r1.tar.gz) = e1e73c0f6ac99cd0641b8ff575fe56f3a79decfb
+SHA512 (platform_system_core-android-5.0.2_r1.tar.gz) = 5fe1935117864d501cb9b543cfcc5ce090f3278f95c691f8da2623c85a0f6f6fcbefbc4886d69f1a940313ce524295be286f41e4601e0427705c0c7d1ace1014
 Size (platform_system_core-android-5.0.2_r1.tar.gz) = 1202992 bytes
+SHA1 (patch-commandline.c) = 40aead985c61a734c532e417cf1302acb2a338bf
 SHA1 (patch-get__my__path__freebsd.c) = 608d3d51d46519487e1494918647dfa6540bccb0
-SHA1 (patch-usb__libusb.c) = d41f8a5d7639682c6d186121cd56f0a5ba87dcd7
+SHA1 (patch-sockets.c) = 7daef0b3914b05507ff3ac41a5a8cb733070457b
+SHA1 (patch-usb__libusb.c) = 0ecf797101081626a7c141b76985bfcdd804f198
diff --git a/android-tools-adb/patches/patch-commandline.c b/android-tools-adb/patches/patch-commandline.c
new file mode 100644
index 0000000..025db67
--- /dev/null
+++ b/android-tools-adb/patches/patch-commandline.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix ctype(3) signedness mistakes.
+
+--- commandline.c.orig	2014-10-22 00:46:49.000000000 +0000
++++ commandline.c
+@@ -1185,7 +1185,7 @@ int adb_commandline(int argc, char **arg
+                 return usage();
+             }
+         } else if (argv[0][0]=='-' && argv[0][1]=='s') {
+-            if (isdigit(argv[0][2])) {
++            if (isdigit((unsigned char)argv[0][2])) {
+                 serial = argv[0] + 2;
+             } else {
+                 if(argc < 2 || argv[0][2] != '\0') return usage();
diff --git a/android-tools-adb/patches/patch-sockets.c b/android-tools-adb/patches/patch-sockets.c
new file mode 100644
index 0000000..f633373
--- /dev/null
+++ b/android-tools-adb/patches/patch-sockets.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Fix ctype(3) signedness mistakes.
+
+--- sockets.c.orig	2014-10-22 00:46:49.000000000 +0000
++++ sockets.c
+@@ -686,9 +686,9 @@ char *skip_host_serial(char *service) {
+         return NULL;
+     }
+     serial_end = first_colon;
+-    if (isdigit(serial_end[1])) {
++    if (isdigit((unsigned char)serial_end[1])) {
+         serial_end++;
+-        while ((*serial_end) && isdigit(*serial_end)) {
++        while ((*serial_end) && isdigit((unsigned char)*serial_end)) {
+             serial_end++;
+         }
+         if ((*serial_end) != ':') {
diff --git a/android-tools-adb/patches/patch-usb__libusb.c b/android-tools-adb/patches/patch-usb__libusb.c
index 6d24334..204d45f 100644
--- a/android-tools-adb/patches/patch-usb__libusb.c
+++ b/android-tools-adb/patches/patch-usb__libusb.c
@@ -1,5 +1,9 @@
 $NetBSD: patch-usb__libusb.c,v 1.1 2015/02/28 18:09:32 tnn2 Exp $
 
+- Use ADB_MUTEX_DEFINE.
+- Constify and structify.
+- %zd, not %d, for ssize_t.
+
 --- usb_libusb.c.orig	2014-10-22 00:46:49.000000000 +0000
 +++ usb_libusb.c
 @@ -37,7 +37,7 @@
@@ -17,7 +21,7 @@ $NetBSD: patch-usb__libusb.c,v 1.1 2015/02/28 18:09:32 tnn2 Exp $
  int
 -check_usb_interface(libusb_interface *interface,
 -                    libusb_device_descriptor *desc,
-+check_usb_interface(struct libusb_interface *interface,
++check_usb_interface(const struct libusb_interface *interface,
 +                    struct libusb_device_descriptor *desc,
                      struct usb_handle *uh)
  {    
@@ -62,3 +66,12 @@ $NetBSD: patch-usb__libusb.c,v 1.1 2015/02/28 18:09:32 tnn2 Exp $
      
      int r = libusb_get_device_descriptor(dev, &desc);
  
+@@ -586,7 +586,7 @@ scan_usb_devices()
+     ssize_t cnt = libusb_get_device_list(ctx, &devs);
+ 
+     if (cnt < 0) {
+-        D("scan_usb_devices(): Failed to get device list (error: %d)\n",
++        D("scan_usb_devices(): Failed to get device list (error: %zd)\n",
+             cnt);
+ 
+         return;
-- 
2.7.3