Index: branches/2020Q2/devel/android-tools-adb/Makefile =================================================================== --- branches/2020Q2/devel/android-tools-adb/Makefile (revision 531780) +++ branches/2020Q2/devel/android-tools-adb/Makefile (revision 531781) @@ -1,81 +1,81 @@ # $FreeBSD$ PORTNAME= android-tools-adb DISTVERSIONPREFIX= platform-tools- DISTVERSION?= 29.0.6 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel comms MAINTAINER= jbeich@FreeBSD.org COMMENT= Android debug bridge command line tool LICENSE= APACHE20 USE_GITHUB= yes GH_TUPLE= aosp-mirror:platform_system_core:${DISTVERSIONFULL} CONFLICTS_INSTALL?= ${PORTNAME}-devel-* USES= compiler:c++17-lang pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} MAKEFILE?= ${.CURDIR}/files/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" FILESDIR="${DOCSDIR}" \ VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}" ALL_TARGET= all TEST_TARGET= test PLIST_FILES= bin/adb PORTDOCS= * OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON OPTIONS_DEFAULT=MDNSRESPONDER OPTIONS_SUB= yes .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" .endif BASH_GH_TUPLE= mbrubeck:android-completion:c1b0656:bashcomp BASH_PLIST_FILES= etc/bash_completion.d/adb BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_USES= localbase:ldflags MDNSRESPONDER_LDFLAGS= -ldns_sd MDNSRESPONDER_MAKE_ENV_OFF= MDNSEXT=_unsupported TEST_BUILD_DEPENDS+= googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_GH_TUPLE= aosp-mirror:platform_development:${DISTVERSIONFULL}:development TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} TEST_PYTHON_USES= python:2.7,build post-patch: # XXX Hidden by poudriere/tinderbox, see lindev(4) for FreeBSD < 11.0 @if [ ! -e /dev/full ]; then \ ${REINPLACE_CMD} -e '/TEST/s/[^ ]*ENOSPC/DISABLED_&/' \ ${WRKSRC}/adb/adb_io_test.cpp; \ fi # XXX getcwd fails and not connected upstream @${REINPLACE_CMD} -e '/TEST/s/, /&DISABLED_/' \ ${WRKSRC}/adb/bugreport_test.cpp pre-install-TEST-on: do-test pre-install-TEST_PYTHON-on: # XXX python tests may leave behind running adb server ${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \ PYTHONPATH=${WRKSRC_development}/python-packages \ ${PYTHON_CMD} -m unittest discover -vs ${BUILD_WRKSRC} post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} .include Index: branches/2020Q2/devel/android-tools-adb/files/patch-adb_socket__spec__test.cpp =================================================================== --- branches/2020Q2/devel/android-tools-adb/files/patch-adb_socket__spec__test.cpp (nonexistent) +++ branches/2020Q2/devel/android-tools-adb/files/patch-adb_socket__spec__test.cpp (revision 531781) @@ -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) { Property changes on: branches/2020Q2/devel/android-tools-adb/files/patch-adb_socket__spec__test.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q2/devel/android-tools-adb/files/patch-base_file__test.cpp =================================================================== --- branches/2020Q2/devel/android-tools-adb/files/patch-base_file__test.cpp (revision 531780) +++ branches/2020Q2/devel/android-tools-adb/files/patch-base_file__test.cpp (revision 531781) @@ -1,42 +1,51 @@ ---- 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)); +#ifdef __linux__ ASSERT_EQ(ELOOP, errno); +#else + ASSERT_EQ(EMLINK, errno); +#endif ASSERT_TRUE(android::base::WriteStringToFile("foo", link.path, true)); std::string s; ASSERT_FALSE(android::base::ReadFileToString(link.path, &s)); +#ifdef __linux__ ASSERT_EQ(ELOOP, errno); +#else + ASSERT_EQ(EMLINK, errno); +#endif 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) +#ifdef __linux__ // 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(4096 - 2 - 1 - 1), 'x'); +#else + std::string min(""); + std::string max(static_cast(1024 - 1), 'x'); +#endif TemporaryDir td; std::string min_path{std::string(td.path) + "/" + "min"}; Index: branches/2020Q2/devel/android-tools-adb/files/patch-liblog_logger__write.cpp =================================================================== --- branches/2020Q2/devel/android-tools-adb/files/patch-liblog_logger__write.cpp (nonexistent) +++ branches/2020Q2/devel/android-tools-adb/files/patch-liblog_logger__write.cpp (revision 531781) @@ -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 + #elif defined(_WIN32) + #include ++#elif defined(__DragonFly__) || defined(__FreeBSD__) ++#include ++#elif defined(__NetBSD__) ++#include ++#elif defined(__OpenBSD__) ++#include ++#elif defined(__sun) ++#include ++#else // fallback ++#include + #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 + } + Property changes on: branches/2020Q2/devel/android-tools-adb/files/patch-liblog_logger__write.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q2/devel/android-tools-fastboot/Makefile =================================================================== --- branches/2020Q2/devel/android-tools-fastboot/Makefile (revision 531780) +++ branches/2020Q2/devel/android-tools-fastboot/Makefile (revision 531781) @@ -1,61 +1,61 @@ # $FreeBSD$ 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 EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} MAINTAINER= jbeich@FreeBSD.org COMMENT= Android Fastboot protocol CLI tool LICENSE= APACHE20 BSD2CLAUSE 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 CONFLICTS_INSTALL?= ${PORTNAME}-devel-* USES= compiler:c++17-lang pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/fastboot INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKEFILE?= ${.CURDIR}/files/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" \ VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}" \ MANDIR="${PREFIX}/share/man/man" PLIST_FILES= bin/fastboot \ share/man/man1/fastboot.1.gz PORTDOCS= * SUB_FILES= pkg-message OPTIONS_DEFINE= BASH DOCS OPTIONS_SUB= yes .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" .endif BASH_GH_TUPLE= mbrubeck:android-completion:c1b0656:bashcomp BASH_PLIST_FILES= etc/bash_completion.d/fastboot BASH_VARS= LICENSE+=MIT DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" post-extract: @${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \ ${BUILD_WRKSRC} post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} .include Index: branches/2020Q2/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp =================================================================== --- branches/2020Q2/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp (nonexistent) +++ branches/2020Q2/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp (revision 531781) @@ -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 + #elif defined(_WIN32) + #include ++#elif defined(__DragonFly__) || defined(__FreeBSD__) ++#include ++#elif defined(__NetBSD__) ++#include ++#elif defined(__OpenBSD__) ++#include ++#elif defined(__sun) ++#include ++#else // fallback ++#include + #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 + } + Property changes on: branches/2020Q2/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q2 =================================================================== --- branches/2020Q2 (revision 531780) +++ branches/2020Q2 (revision 531781) Property changes on: branches/2020Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r531780