devel/android-tools-fastboot-devel: update to o.p.2.332

Changes:	https://android.googlesource.com/platform/system/core/+log/dfd30c4a169e..d1e9e7bc06f0/fastboot

7 files changed, 45 insertions, 25 deletions

diff --git a/devel/android-tools-adb-devel/files/patch-base_file.cpp b/devel/android-tools-adb-devel/files/patch-base_file.cpp
index 1bc6c785dcf9..a0406b97b605 100644
--- a/devel/android-tools-adb-devel/files/patch-base_file.cpp
+++ b/devel/android-tools-adb-devel/files/patch-base_file.cpp
@@ -1,11 +1,12 @@
 --- base/file.cpp.orig	2017-06-20 10:50:27 UTC
 +++ base/file.cpp
-@@ -19,6 +19,9 @@
+@@ -19,6 +19,10 @@
  #include <errno.h>
  #include <fcntl.h>
  #include <libgen.h>
 +#include <limits.h> // PATH_MAX
 +#include <stdio.h> // BUFSIZ
++#include <stdlib.h> // realpath
 +#include <string.h> // strerror
  #include <sys/stat.h>
  #include <sys/types.h>
diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile
index 1b2c1ba43ec9..d903de3c4187 100644
--- a/devel/android-tools-fastboot-devel/Makefile
+++ b/devel/android-tools-fastboot-devel/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-# Hint: git describe --abbrev=12 --match android-n-preview-5
-DISTVERSION=	n-preview-5-3582
-DISTVERSIONSUFFIX=	-gdfd30c4a169e
+# Hint: git describe --abbrev=12 --match android-o-preview-2
+DISTVERSION=	o-preview-2-332
+DISTVERSIONSUFFIX=	-gd1e9e7bc06f0
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
-GH_TAGNAME=	${GH_MYTAG}-907-g1a35848b34d6:extras \
+GH_TAGNAME=	${GH_MYTAG}-50-gebf42931: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 d57fa1c069f9..62d0b3eb73dd 100644
--- a/devel/android-tools-fastboot-devel/distinfo
+++ b/devel/android-tools-fastboot-devel/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1474960220
+TIMESTAMP = 1497955827
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-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 (android-platform_system_core-android-o-preview-2-332-gd1e9e7bc06f0_GH0.tar.gz) = 212dd9cbca65a167b3833e5077b1a9f2db3a50a04e637da3e0db7814f60cf9fd
+SIZE (android-platform_system_core-android-o-preview-2-332-gd1e9e7bc06f0_GH0.tar.gz) = 5188822
+SHA256 (jbeich-platform_system_extras-android-o-preview-2-50-gebf42931_GH0.tar.gz) = fff9cb211ed96e0f898ed3738a9325be3c9b18f333cfff1562af668162b6c531
+SIZE (jbeich-platform_system_extras-android-o-preview-2-50-gebf42931_GH0.tar.gz) = 107631212
+SHA256 (jbeich-platform_external_libselinux-android-o-preview-2-43-ga63b41e_GH0.tar.gz) = 7b3198361574a22364a611015c772198f2ec06ba0f84bab061c03d41d2959b0b
+SIZE (jbeich-platform_external_libselinux-android-o-preview-2-43-ga63b41e_GH0.tar.gz) = 63139
 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/Makefile b/devel/android-tools-fastboot-devel/files/Makefile
index ecfacc04a503..6aea6bb27ec3 100644
--- a/devel/android-tools-fastboot-devel/files/Makefile
+++ b/devel/android-tools-fastboot-devel/files/Makefile
@@ -49,6 +49,7 @@ SRCS+=	wipe.c
 
 # required by fastboot
 .PATH: ${.CURDIR}/../libcutils
+SRCS+=	android_get_control_file.cpp
 SRCS+=	../libcutils/sockets.cpp
 SRCS+=	socket_inaddr_any_server_unix.c
 SRCS+=	socket_network_client_unix.c
@@ -57,13 +58,17 @@ CPPFLAGS.sockets.cpp+=	-o ${.TARGET} # XXX pre-r279980
 
 # required by base and libutils
 .PATH:	${.CURDIR}/../liblog
+SRCS+=	config_read.c
 SRCS+=	config_write.c
 SRCS+=	fake_log_device.c
 SRCS+=	fake_writer.c
+SRCS+=	local_logger.c
 SRCS+=	logger_lock.c
 SRCS+=	logger_name.c
 SRCS+=	logger_write.c
-CPPFLAGS.config_write.c+=	-DFAKE_LOG_DEVICE=1
+SRCS+=	logprint.c
+SRCS+=	stderr_write.c
+SRCS+=	test_utils.cpp
 
 # required by ext4_utils
 .PATH:	${.CURDIR}/../libselinux/src
@@ -85,7 +90,7 @@ SRCS+=	output_file.c
 SRCS+=	sparse.c
 SRCS+=	sparse_crc32.c
 SRCS+=	sparse_err.c
-SRCS+=	sparse_read.c
+SRCS+=	sparse_read.cpp
 
 # required by libziparchive
 .PATH: ${.CURDIR}/../libutils
@@ -97,18 +102,19 @@ SRCS+=	zip_archive.cc
 
 REVISION?=	$$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
-CPPFLAGS+=	-DFASTBOOT_REVISION="\"${REVISION}-android\""
+CPPFLAGS+=	-DFASTBOOT_VERSION="\"0.0.0-${REVISION}-android\""
 CPPFLAGS+=	-Doff64_t=off_t
 CPPFLAGS+=	-Dftruncate64=ftruncate
 CPPFLAGS+=	-Dlseek64=lseek
 CPPFLAGS+=	-Dmmap64=mmap
 CPPFLAGS+=	-Dpread64=pread
+CPPFLAGS+=	-DFAKE_LOG_DEVICE=1
 CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	-I${.CURDIR}/../include
 CPPFLAGS+=	-I${.CURDIR}/../adb
 CPPFLAGS+=	-I${.CURDIR}/../mkbootimg
 CPPFLAGS+=	-I${.CURDIR}/../base/include
-CPPFLAGS+=	-I${.CURDIR}/../ext4_utils
+CPPFLAGS+=	-I${.CURDIR}/../ext4_utils/include
 CPPFLAGS+=	-I${.CURDIR}/../f2fs_utils
 CPPFLAGS+=	-I${.CURDIR}/../libselinux/include
 CPPFLAGS+=	-I${.CURDIR}/../libsparse/include
diff --git a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp b/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
index 199da0b95aca..a0406b97b605 100644
--- a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
+++ b/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
@@ -1,16 +1,17 @@
---- base/file.cpp.orig	2016-09-28 18:07:09 UTC
+--- base/file.cpp.orig	2017-06-20 10:50:27 UTC
 +++ base/file.cpp
-@@ -18,6 +18,9 @@
- 
+@@ -19,6 +19,10 @@
  #include <errno.h>
  #include <fcntl.h>
+ #include <libgen.h>
 +#include <limits.h> // PATH_MAX
 +#include <stdio.h> // BUFSIZ
++#include <stdlib.h> // realpath
 +#include <string.h> // strerror
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -34,6 +37,9 @@
+@@ -36,6 +39,9 @@
  #if defined(__APPLE__)
  #include <mach-o/dyld.h>
  #endif
@@ -19,8 +20,8 @@
 +#endif
  #if defined(_WIN32)
  #include <windows.h>
- #endif
-@@ -231,6 +237,17 @@ std::string GetExecutablePath() {
+ #define O_CLOEXEC O_NOINHERIT
+@@ -251,6 +257,17 @@ std::string GetExecutablePath() {
    if (result == 0 || result == sizeof(path) - 1) return "";
    path[PATH_MAX - 1] = 0;
    return path;
diff --git a/devel/android-tools-fastboot-devel/files/patch-libsparse_sparse__read.cpp b/devel/android-tools-fastboot-devel/files/patch-libsparse_sparse__read.cpp
new file mode 100644
index 000000000000..30753c5b96cd
--- /dev/null
+++ b/devel/android-tools-fastboot-devel/files/patch-libsparse_sparse__read.cpp
@@ -0,0 +1,10 @@
+--- libsparse/sparse_read.cpp.orig	2017-06-20 10:50:27 UTC
++++ libsparse/sparse_read.cpp
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string>
++#include <string.h> // memset
+ #include <unistd.h>
+ 
+ #include <sparse/sparse.h>
diff --git a/devel/android-tools-fastboot/pkg-descr b/devel/android-tools-fastboot/pkg-descr
index 2fd2edd56d97..d80b116a953b 100644
--- a/devel/android-tools-fastboot/pkg-descr
+++ b/devel/android-tools-fastboot/pkg-descr
@@ -1,4 +1,6 @@
-Fastboot is a diagnostic protocol primarily used to update the flash
-filesystem of Android devices over USB.
+Fastboot protocol is a mechanism for communicating with bootloaders
+over USB or Ethernet. It is designed to be very straightforward to
+implement, to allow it to be used across a wide range of devices and
+from hosts running Linux, macOS, or Windows.
 
-This package provides the fastboot command-line tool.
+WWW: https://android.googlesource.com/platform/system/core/+/master/fastboot/README.md