devel/android-tools-{adb,fastboot}-devel: update to n.p.5.3582

Changes:	https://android.googlesource.com/platform/system/core/+log/2f21b7cecda2..dfd30c4a169e/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/2f21b7cecda2..dfd30c4a169e/fastboot

3 files changed, 53 insertions, 13 deletions

diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile
index bbb12f041fe6..1b2c1ba43ec9 100644
--- a/devel/android-tools-fastboot-devel/Makefile
+++ b/devel/android-tools-fastboot-devel/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-n-preview-5
-DISTVERSION=	n-preview-5-126
-DISTVERSIONSUFFIX=	-g2f21b7cecda2
+DISTVERSION=	n-preview-5-3582
+DISTVERSIONSUFFIX=	-gdfd30c4a169e
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
-GH_TAGNAME=	${GH_MYTAG}-64-g8cd939bd7af7:extras \
-		${GH_MYTAG}-1-g1fdb726:libselinux
+GH_TAGNAME=	${GH_MYTAG}-907-g1a35848b34d6:extras \
+		${GH_MYTAG}-43-ga63b41e:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
diff --git a/devel/android-tools-fastboot-devel/distinfo b/devel/android-tools-fastboot-devel/distinfo
index dcdd48c37b8e..d57fa1c069f9 100644
--- a/devel/android-tools-fastboot-devel/distinfo
+++ b/devel/android-tools-fastboot-devel/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1470755379
+TIMESTAMP = 1474960220
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-n-preview-5-126-g2f21b7cecda2_GH0.tar.gz) = 61256486af01cfefeee6779f9926ba32334b9fb1a5aacfa2cd4a682d66f01a2a
-SIZE (android-platform_system_core-android-n-preview-5-126-g2f21b7cecda2_GH0.tar.gz) = 1561372
-SHA256 (jbeich-platform_system_extras-android-n-preview-5-64-g8cd939bd7af7_GH0.tar.gz) = 8506118d4606458f098d2e7b089c3304fee935c8e50ae9bb1e1ae8caab654be7
-SIZE (jbeich-platform_system_extras-android-n-preview-5-64-g8cd939bd7af7_GH0.tar.gz) = 82049260
-SHA256 (jbeich-platform_external_libselinux-android-n-preview-5-1-g1fdb726_GH0.tar.gz) = a898cb59e585de2ec51c6c13759069e62480efe785fb808d991043a469649624
-SIZE (jbeich-platform_external_libselinux-android-n-preview-5-1-g1fdb726_GH0.tar.gz) = 63005
-SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
-SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
+SHA256 (android-platform_system_core-android-n-preview-5-3582-gdfd30c4a169e_GH0.tar.gz) = 2a4530432d51797fcc426b737d66b411d7ba4635afabe32b0c89cb581b19bc34
+SIZE (android-platform_system_core-android-n-preview-5-3582-gdfd30c4a169e_GH0.tar.gz) = 1464524
+SHA256 (jbeich-platform_system_extras-android-n-preview-5-907-g1a35848b34d6_GH0.tar.gz) = 76c5b258753e6168796a5eeff64b44376439aa793d34786d27a9a1ba3759e174
+SIZE (jbeich-platform_system_extras-android-n-preview-5-907-g1a35848b34d6_GH0.tar.gz) = 95573256
+SHA256 (jbeich-platform_external_libselinux-android-n-preview-5-43-ga63b41e_GH0.tar.gz) = eb85e6ea45fedb123a14a2326ba3e4a9a6ef2577b2ecd258be4097a4445f8f36
+SIZE (jbeich-platform_external_libselinux-android-n-preview-5-43-ga63b41e_GH0.tar.gz) = 63141
+SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
+SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
diff --git a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp b/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
new file mode 100644
index 000000000000..199da0b95aca
--- /dev/null
+++ b/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
@@ -0,0 +1,40 @@
+--- base/file.cpp.orig	2016-09-28 18:07:09 UTC
++++ base/file.cpp
+@@ -18,6 +18,9 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <limits.h> // PATH_MAX
++#include <stdio.h> // BUFSIZ
++#include <string.h> // strerror
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -34,6 +37,9 @@
+ #if defined(__APPLE__)
+ #include <mach-o/dyld.h>
+ #endif
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++#include <sys/sysctl.h>
++#endif
+ #if defined(_WIN32)
+ #include <windows.h>
+ #endif
+@@ -231,6 +237,17 @@ std::string GetExecutablePath() {
+   if (result == 0 || result == sizeof(path) - 1) return "";
+   path[PATH_MAX - 1] = 0;
+   return path;
++#elif defined(KERN_PROC_PATHNAME)
++  char path[PATH_MAX + 1];
++  size_t path_len = sizeof(path);
++  int mib[] = {
++    CTL_KERN,
++    KERN_PROC,
++    KERN_PROC_PATHNAME,
++    getpid()
++  };
++  int rc = sysctl(mib, arraysize(mib), path, &path_len, NULL, 0);
++  return rc ? "" : path;
+ #else
+ #error unknown OS
+ #endif