devel/android-tools-{adb,fastboot}: update to 29.0.5

Changes:	https://android.googlesource.com/platform/system/core/+log/platform-tools-29.0.4..platform-tools-29.0.5/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/platform-tools-29.0.4..platform-tools-29.0.5/fastboot
Reported by:	portscout

7 files changed, 82 insertions, 35 deletions

diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index cb7fb8f3197c..b67cc025335c 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	platform-tools-
-DISTVERSION?=	29.0.4
+DISTVERSION?=	29.0.5
 PORTREVISION?=	0
 CATEGORIES=	devel sysutils
 MASTER_SITES=	https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage
@@ -17,6 +17,7 @@ LICENSE_COMB=	multi
 
 USE_GITHUB=	yes
 GH_TUPLE=	aosp-mirror:platform_system_core:${DISTVERSIONFULL} \
+		jbeich:platform_external_avb:${DISTVERSIONFULL}:avb/avb \
 		jbeich:platform_system_extras:${DISTVERSIONFULL}:extras/extras \
 		jbeich:platform_system_tools_mkbootimg:${DISTVERSIONFULL}:mkbootimg/mkbootimg
 
diff --git a/devel/android-tools-fastboot/distinfo b/devel/android-tools-fastboot/distinfo
index adaca7c30426..1989d4f2c29d 100644
--- a/devel/android-tools-fastboot/distinfo
+++ b/devel/android-tools-fastboot/distinfo
@@ -1,11 +1,13 @@
-TIMESTAMP = 1568309901
+TIMESTAMP = 1571358141
 SHA256 (fastboot.1) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1) = 5906
-SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.4_GH0.tar.gz) = 95e20a50253d82b2d5f96b1acd2672c3fbdb57908e44757ba76a25d5d56a4f64
-SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.4_GH0.tar.gz) = 61253830
-SHA256 (jbeich-platform_system_extras-platform-tools-29.0.4_GH0.tar.gz) = b273a90d91132732b1fa77df273ee219cdafa0f71b000350d406d720a1b59fda
-SIZE (jbeich-platform_system_extras-platform-tools-29.0.4_GH0.tar.gz) = 210790487
-SHA256 (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.4_GH0.tar.gz) = 743b5cbcacbc635238f7113c8ddcab212729e7abbbf50816b389b7a4a6442970
-SIZE (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.4_GH0.tar.gz) = 6619
+SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.5_GH0.tar.gz) = a89ed6195862578acc01092e8ca390cd7578725bca9eed77b6b730f334b4c255
+SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.5_GH0.tar.gz) = 68752941
+SHA256 (jbeich-platform_external_avb-platform-tools-29.0.5_GH0.tar.gz) = 276c9b656f99dbf80a0fd8e06bdbdcf5d24916902e3b215b18b24cad858be5bc
+SIZE (jbeich-platform_external_avb-platform-tools-29.0.5_GH0.tar.gz) = 797490
+SHA256 (jbeich-platform_system_extras-platform-tools-29.0.5_GH0.tar.gz) = 5183a633aec89474cbe0c53875983e7719436e106a4a7aa1e9097a93bb8a3883
+SIZE (jbeich-platform_system_extras-platform-tools-29.0.5_GH0.tar.gz) = 276210581
+SHA256 (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.5_GH0.tar.gz) = 772b13294ffcab508ad27461e1bdcb1ce3d95bacf10ed2191f62b2493e1b6aed
+SIZE (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.5_GH0.tar.gz) = 12180
 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/files/Makefile b/devel/android-tools-fastboot/files/Makefile
index be9029ea8d77..9aa93b8a07ba 100644
--- a/devel/android-tools-fastboot/files/Makefile
+++ b/devel/android-tools-fastboot/files/Makefile
@@ -59,15 +59,12 @@ CPPFLAGS.sockets.cpp+=	-o ${.TARGET}
 
 # required by base and libutils
 .PATH:	${.CURDIR}/../liblog
-SRCS+=	config_read.cpp
-SRCS+=	config_write.cpp
 SRCS+=	fake_log_device.cpp
 SRCS+=	fake_writer.cpp
 SRCS+=	logger_lock.cpp
 SRCS+=	logger_name.cpp
 SRCS+=	logger_write.cpp
 SRCS+=	logprint.cpp
-SRCS+=	stderr_write.cpp
 
 # required by fastboot
 .PATH:	${.CURDIR}/../libsparse
@@ -91,13 +88,14 @@ CPPFLAGS+=	-Dpread64=pread
 CPPFLAGS+=	-DFAKE_LOG_DEVICE=1
 CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	-I${.CURDIR}/../include
-CPPFLAGS+=	-I${.CURDIR}/../mkbootimg/include/bootimg
+CPPFLAGS+=	-I${.CURDIR}/../avb
 CPPFLAGS+=	-I${.CURDIR}/../base/include
 CPPFLAGS+=	-I${.CURDIR}/../diagnose_usb/include
 CPPFLAGS+=	-I${.CURDIR}/../extras/ext4_utils/include
 CPPFLAGS+=	-I${.CURDIR}/../fs_mgr/liblp/include
 CPPFLAGS+=	-I${.CURDIR}/../libsparse/include
 CPPFLAGS+=	-I${.CURDIR}/../libziparchive/include
+CPPFLAGS+=	-I${.CURDIR}/../mkbootimg/include/bootimg
 CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
 CPPFLAGS+=	$$(${PKG_CONFIG} libcrypto --cflags 2>/dev/null)
 CPPFLAGS+=	$$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null)
diff --git a/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h b/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h
new file mode 100644
index 000000000000..5e6e51b671a7
--- /dev/null
+++ b/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h
@@ -0,0 +1,58 @@
+--- base/include/android-base/endian.h.orig	2019-10-18 00:22:21 UTC
++++ base/include/android-base/endian.h
+@@ -50,6 +50,8 @@
+ #if defined(__APPLE__)
+ /* macOS has some of the basics. */
+ #include <sys/_endian.h>
++#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#include <sys/endian.h>
+ #else
+ /* Windows has some of the basics as well. */
+ #include <sys/param.h>
+@@ -71,22 +73,39 @@
+ 
+ #define ntohq(x) __builtin_bswap64(x)
+ 
++#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #define htobe16(x) __builtin_bswap16(x)
+ #define htobe32(x) __builtin_bswap32(x)
+ #define htobe64(x) __builtin_bswap64(x)
++#endif
+ 
++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#define betoh16(x) be16toh(x)
++#define betoh32(x) be32toh(x)
++#define betoh64(x) be64toh(x)
++#else
+ #define betoh16(x) __builtin_bswap16(x)
+ #define betoh32(x) __builtin_bswap32(x)
+ #define betoh64(x) __builtin_bswap64(x)
++#endif
+ 
++#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #define htole16(x) (x)
+ #define htole32(x) (x)
+ #define htole64(x) (x)
++#endif
+ 
++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#define letoh16(x) le16toh(x)
++#define letoh32(x) le32toh(x)
++#define letoh64(x) le64toh(x)
++#else
+ #define letoh16(x) (x)
+ #define letoh32(x) (x)
+ #define letoh64(x) (x)
++#endif
+ 
++#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #define be16toh(x) __builtin_bswap16(x)
+ #define be32toh(x) __builtin_bswap32(x)
+ #define be64toh(x) __builtin_bswap64(x)
+@@ -94,5 +113,6 @@
+ #define le16toh(x) (x)
+ #define le32toh(x) (x)
+ #define le64toh(x) (x)
++#endif
+ 
+ #endif
diff --git a/devel/android-tools-fastboot/files/patch-fastboot_fastboot.cpp b/devel/android-tools-fastboot/files/patch-fastboot_fastboot.cpp
index b0aba681ef38..4b8449b72656 100644
--- a/devel/android-tools-fastboot/files/patch-fastboot_fastboot.cpp
+++ b/devel/android-tools-fastboot/files/patch-fastboot_fastboot.cpp
@@ -1,6 +1,6 @@
---- fastboot/fastboot.cpp.orig	2019-08-13 02:10:58 UTC
+--- fastboot/fastboot.cpp.orig	2019-10-18 00:22:21 UTC
 +++ fastboot/fastboot.cpp
-@@ -58,9 +58,20 @@
+@@ -59,10 +59,21 @@
  #include <android-base/stringprintf.h>
  #include <android-base/strings.h>
  #include <android-base/unique_fd.h>
@@ -15,10 +15,11 @@
 +}}}
 +#else
  #include <build/version.h>
--#include <liblp/liblp.h>
- #include <platform_tools_version.h>
++#include <platform_tools_version.h>
 +#endif
-+#include <liblp/liblp.h>
+ #include <libavb/libavb.h>
+ #include <liblp/liblp.h>
+-#include <platform_tools_version.h>
  #include <sparse/sparse.h>
  #include <ziparchive/zip_archive.h>
  
diff --git a/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp b/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp
index e93327448dc3..ea76f483c4a8 100644
--- a/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp
+++ b/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp
@@ -1,12 +1,11 @@
---- liblog/fake_writer.cpp.orig	2019-07-17 19:54:09 UTC
+--- liblog/fake_writer.cpp.orig	2019-10-18 00:22:21 UTC
 +++ liblog/fake_writer.cpp
-@@ -33,8 +33,8 @@ static int logFds[(int)LOG_ID_MAX] = {-1, -1, -1, -1, 
- 
+@@ -34,7 +34,7 @@ static int logFds[(int)LOG_ID_MAX] = {-1, -1, -1, -1, 
  struct android_log_transport_write fakeLoggerWrite = {
-     .node = {&fakeLoggerWrite.node, &fakeLoggerWrite.node},
--    .context.priv = &logFds,
      .name = "fake",
+     .logMask = 0,
+-    .context.priv = &logFds,
 +    .context = { .priv = &logFds }, // GCC
-     .available = NULL,
+     .available = fakeAvailable,
      .open = fakeOpen,
      .close = fakeClose,
diff --git a/devel/android-tools-fastboot/files/patch-liblog_stderr__write.cpp b/devel/android-tools-fastboot/files/patch-liblog_stderr__write.cpp
deleted file mode 100644
index 2da1354f365e..000000000000
--- a/devel/android-tools-fastboot/files/patch-liblog_stderr__write.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- liblog/stderr_write.cpp.orig	2019-08-13 02:10:58 UTC
-+++ liblog/stderr_write.cpp
-@@ -55,8 +55,8 @@ struct stderrContext {
- 
- struct android_log_transport_write stderrLoggerWrite = {
-     .node = {&stderrLoggerWrite.node, &stderrLoggerWrite.node},
--    .context.priv = NULL,
-     .name = "stderr",
-+    .context = { .priv = NULL }, // GCC
-     .available = stderrAvailable,
-     .open = stderrOpen,
-     .close = stderrClose,