6 files changed, 101 insertions, 6 deletions

diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index 27059efe5021..b2e344751b99 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	platform-tools-
 DISTVERSION?=	29.0.6
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel comms
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/android-tools-adb/files/patch-adb_socket__spec__test.cpp b/devel/android-tools-adb/files/patch-adb_socket__spec__test.cpp
new file mode 100644
index 000000000000..774c9b23c357
--- /dev/null
+++ b/devel/android-tools-adb/files/patch-adb_socket__spec__test.cpp
@@ -0,0 +1,14 @@
+--- adb/socket_spec_test.cpp.orig	2020-02-11 20:44:45 UTC
++++ adb/socket_spec_test.cpp
+@@ -98,7 +98,11 @@ TEST(socket_spec, get_host_socket_spec_port) {
+     EXPECT_EQ(5555, get_host_socket_spec_port("tcp:5555", &error));
+     EXPECT_EQ(5555, get_host_socket_spec_port("tcp:localhost:5555", &error));
+     EXPECT_EQ(5555, get_host_socket_spec_port("tcp:[::1]:5555", &error));
++#if ADB_LINUX
+     EXPECT_EQ(5555, get_host_socket_spec_port("vsock:5555", &error));
++#else
++    EXPECT_EQ(-1, get_host_socket_spec_port("vsock:5555", &error));
++#endif
+ }
+ 
+ TEST(socket_spec, get_host_socket_spec_port_no_port) {
diff --git a/devel/android-tools-adb/files/patch-base_file__test.cpp b/devel/android-tools-adb/files/patch-base_file__test.cpp
index 91950644efd3..f0c8bab75b77 100644
--- a/devel/android-tools-adb/files/patch-base_file__test.cpp
+++ b/devel/android-tools-adb/files/patch-base_file__test.cpp
@@ -1,6 +1,6 @@
---- base/file_test.cpp.orig	2017-06-20 10:50:27 UTC
+--- base/file_test.cpp.orig	2020-02-11 20:44:45 UTC
 +++ base/file_test.cpp
-@@ -52,12 +52,20 @@ TEST(file, ReadFileToString_WriteStringToFile_symlink)
+@@ -61,12 +61,20 @@ TEST(file, ReadFileToString_WriteStringToFile_symlink)
    ASSERT_EQ(0, unlink(link.path));
    ASSERT_EQ(0, symlink(target.path, link.path));
    ASSERT_FALSE(android::base::WriteStringToFile("foo", link.path, false));
@@ -21,7 +21,16 @@
    ASSERT_TRUE(android::base::ReadFileToString(link.path, &s, true));
    ASSERT_EQ("foo", s);
  }
-@@ -131,6 +139,7 @@ TEST(file, RemoveFileIfExist) {
+@@ -235,7 +243,7 @@ TEST(file, RemoveFileIfExists_EACCES) {
+   // EACCES -- one of the directories in the path has no search permission
+   // root can bypass permission restrictions, so drop root.
+   if (getuid() == 0) {
+-    passwd* shell = getpwnam("shell");
++    passwd* shell = getpwnam("nobody");
+     setgid(shell->pw_gid);
+     setuid(shell->pw_uid);
+   }
+@@ -257,6 +265,7 @@ TEST(file, RemoveFileIfExists_EACCES) {
  
  TEST(file, Readlink) {
  #if !defined(_WIN32)
@@ -29,7 +38,7 @@
    // Linux doesn't allow empty symbolic links.
    std::string min("x");
    // ext2 and ext4 both have PAGE_SIZE limits.
-@@ -139,6 +148,10 @@ TEST(file, Readlink) {
+@@ -265,6 +274,10 @@ TEST(file, Readlink) {
    // in current kernels (and marlin/sailfish where we're seeing this
    // failure are still on 3.18, far from current). http://b/33306057.
    std::string max(static_cast<size_t>(4096 - 2 - 1 - 1), 'x');
diff --git a/devel/android-tools-adb/files/patch-liblog_logger__write.cpp b/devel/android-tools-adb/files/patch-liblog_logger__write.cpp
new file mode 100644
index 000000000000..de32cf8fbf70
--- /dev/null
+++ b/devel/android-tools-adb/files/patch-liblog_logger__write.cpp
@@ -0,0 +1,36 @@
+--- liblog/logger_write.cpp.orig	2020-02-11 20:44:45 UTC
++++ liblog/logger_write.cpp
+@@ -51,6 +51,16 @@
+ #include <syscall.h>
+ #elif defined(_WIN32)
+ #include <windows.h>
++#elif defined(__DragonFly__) || defined(__FreeBSD__)
++#include <pthread_np.h>
++#elif defined(__NetBSD__)
++#include <lwp.h>
++#elif defined(__OpenBSD__)
++#include <unistd.h>
++#elif defined(__sun)
++#include <thread.h>
++#else // fallback
++#include <stdint.h>
+ #endif
+ 
+ using android::base::ErrnoRestorer;
+@@ -248,6 +258,16 @@ static uint64_t GetThreadId() {
+   return syscall(__NR_gettid);
+ #elif defined(_WIN32)
+   return GetCurrentThreadId();
++#elif defined(__DragonFly__) || defined(__FreeBSD__)
++  return pthread_getthreadid_np();
++#elif defined(__NetBSD__)
++  return _lwp_self();
++#elif defined(__OpenBSD__)
++  return getthrid();
++#elif defined(__sun)
++  return thr_self();
++#else // fallback
++  return (intptr_t) pthread_self();
+ #endif
+ }
+ 
diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index ddc083bbcf05..381cc609b592 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	platform-tools-
 DISTVERSION?=	29.0.6
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel sysutils
 MASTER_SITES=	https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage
 DISTFILES=	fastboot.1:manpage
diff --git a/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp b/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp
new file mode 100644
index 000000000000..de32cf8fbf70
--- /dev/null
+++ b/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp
@@ -0,0 +1,36 @@
+--- liblog/logger_write.cpp.orig	2020-02-11 20:44:45 UTC
++++ liblog/logger_write.cpp
+@@ -51,6 +51,16 @@
+ #include <syscall.h>
+ #elif defined(_WIN32)
+ #include <windows.h>
++#elif defined(__DragonFly__) || defined(__FreeBSD__)
++#include <pthread_np.h>
++#elif defined(__NetBSD__)
++#include <lwp.h>
++#elif defined(__OpenBSD__)
++#include <unistd.h>
++#elif defined(__sun)
++#include <thread.h>
++#else // fallback
++#include <stdint.h>
+ #endif
+ 
+ using android::base::ErrnoRestorer;
+@@ -248,6 +258,16 @@ static uint64_t GetThreadId() {
+   return syscall(__NR_gettid);
+ #elif defined(_WIN32)
+   return GetCurrentThreadId();
++#elif defined(__DragonFly__) || defined(__FreeBSD__)
++  return pthread_getthreadid_np();
++#elif defined(__NetBSD__)
++  return _lwp_self();
++#elif defined(__OpenBSD__)
++  return getthrid();
++#elif defined(__sun)
++  return thr_self();
++#else // fallback
++  return (intptr_t) pthread_self();
+ #endif
+ }
+