Index: head/devel/android-tools-adb-devel/Makefile =================================================================== --- head/devel/android-tools-adb-devel/Makefile (revision 416543) +++ head/devel/android-tools-adb-devel/Makefile (revision 416544) @@ -1,32 +1,32 @@ # $FreeBSD$ -# Hint: git describe --abbrev=12 --match android-n-preview-2 -DISTVERSION= n-preview-2-74 -DISTVERSIONSUFFIX= -gd61bfb9a79e3 +# Hint: git describe --abbrev=12 --match android-n-preview-3 +DISTVERSION= n-preview-3-101 +DISTVERSIONSUFFIX= -g35d84096e9a5 PORTREVISION= 0 PKGNAMESUFFIX= -devel CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* MASTERDIR= ${.CURDIR}/../android-tools-adb DISTINFO_FILE= ${.CURDIR}/distinfo FILESDIR= ${.CURDIR}/files EXTRA_PATCHES= ${.CURDIR}/files/patch-* GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//} OPTIONS_DEFINE= TEST_PYTHON TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_GH_PROJECT= platform_development:development -TEST_PYTHON_GH_TAGNAME= ${GH_MYTAG}-7-gd66a831ffc05:development +TEST_PYTHON_GH_TAGNAME= ${GH_MYTAG}-47-g6925e3e:development TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock TEST_PYTHON_USES= python:2.7,build 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} .include "${MASTERDIR}/Makefile" Index: head/devel/android-tools-adb-devel/distinfo =================================================================== --- head/devel/android-tools-adb-devel/distinfo (revision 416543) +++ head/devel/android-tools-adb-devel/distinfo (revision 416544) @@ -1,6 +1,6 @@ -SHA256 (android-platform_system_core-android-n-preview-2-74-gd61bfb9a79e3_GH0.tar.gz) = 2e8d7d19a888805a12cd20b035ca1b6d10c721cc4e2bcb029ebd3d9801ae9664 -SIZE (android-platform_system_core-android-n-preview-2-74-gd61bfb9a79e3_GH0.tar.gz) = 1514832 +SHA256 (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 0f18ec5fc99aaa1c5c755148759bb5994b366680bda6f23433c9454dbddcab66 +SIZE (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 1559018 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 -SHA256 (android-platform_development-android-n-preview-2-7-gd66a831ffc05_GH0.tar.gz) = d17c1ac1ea597f897b9768104e3dac86922ba3a6edabddfbde3858dc75c7de93 -SIZE (android-platform_development-android-n-preview-2-7-gd66a831ffc05_GH0.tar.gz) = 167896858 +SHA256 (android-platform_development-android-n-preview-3-47-g6925e3e_GH0.tar.gz) = 9956ed223b1f10e70890f51b218f0672dee5818f967d1abf413008c829975d68 +SIZE (android-platform_development-android-n-preview-3-47-g6925e3e_GH0.tar.gz) = 149186317 Index: head/devel/android-tools-adb-devel/files/Makefile =================================================================== --- head/devel/android-tools-adb-devel/files/Makefile (revision 416543) +++ head/devel/android-tools-adb-devel/files/Makefile (revision 416544) @@ -1,137 +1,141 @@ # $FreeBSD$ PROG_CXX=adb NO_MAN= BINDIR?=/usr/bin FILESDIR?=${DOCDIR}/${PROG} FILES= *.[Tt][Xx][Tt] SRCS+= adb.cpp SRCS+= adb_auth.cpp SRCS+= adb_auth_host.cpp SRCS+= adb_client.cpp SRCS+= adb_io.cpp SRCS+= adb_listeners.cpp SRCS+= adb_trace.cpp SRCS+= adb_utils.cpp SRCS+= commandline.cpp SRCS+= console.cpp SRCS+= diagnose_usb.cpp SRCS+= fdevent.cpp SRCS+= file_sync_client.cpp SRCS+= line_printer.cpp SRCS+= services.cpp SRCS+= shell_service_protocol.cpp SRCS+= ../adb/sockets.cpp SRCS+= sysdeps_unix.cpp SRCS+= transport.cpp SRCS+= transport_local.cpp SRCS+= transport_usb.cpp TEST_SRCS+= adb_io_test.cpp +TEST_SRCS+= adb_listeners_test.cpp TEST_SRCS+= adb_utils_test.cpp TEST_SRCS+= fdevent_test.cpp TEST_SRCS+= shell_service_protocol_test.cpp TEST_SRCS+= socket_test.cpp TEST_SRCS+= sysdeps_test.cpp TEST_SRCS+= transport_test.cpp .PATH: ${.CURDIR}/client SRCS+= main.cpp .PATH: ${EXTRADIR} SRCS+= get_my_path_freebsd.cpp SRCS+= usb_libusb.cpp .PATH: ${.CURDIR}/../base SRCS+= file.cpp SRCS+= logging.cpp SRCS+= parsenetaddress.cpp SRCS+= stringprintf.cpp SRCS+= strings.cpp TEST_SRCS+= file_test.cpp TEST_SRCS+= logging_test.cpp TEST_SRCS+= parsenetaddress_test.cpp TEST_SRCS+= stringprintf_test.cpp TEST_SRCS+= strings_test.cpp TEST_SRCS+= test_main.cpp TEST_SRCS+= test_utils.cpp .PATH: ${.CURDIR}/../libcrypto_utils SRCS+= android_pubkey.c .PATH: ${.CURDIR}/../libcrypto_utils/tests TEST_SRCS+= android_pubkey_test.cpp .PATH: ${.CURDIR}/../libcutils SRCS+= socket_inaddr_any_server_unix.c SRCS+= socket_local_client_unix.c SRCS+= socket_local_server_unix.c SRCS+= socket_loopback_client_unix.c SRCS+= socket_loopback_server_unix.c SRCS+= socket_network_client_unix.c +SRCS+= ../libcutils/sockets.cpp SRCS+= load_file.c SRCS+= threads.c +# XXX Obsolete after 10.2 or r279980/r280329 +CPPFLAGS.sockets.cpp+= -o ${.TARGET} # required by base/file.cpp .PATH: ${.CURDIR}/../liblog SRCS+= config_write.c SRCS+= fake_log_device.c SRCS+= fake_writer.c SRCS+= logger_lock.c SRCS+= logger_name.c SRCS+= logger_write.c CPPFLAGS.config_write.c+= -DFAKE_LOG_DEVICE=1 REVISION?= $$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown) CPPFLAGS+= -DADB_REVISION="\"${REVISION}-android\"" CPPFLAGS+= -DADB_HOST=1 CPPFLAGS+= -DHAVE_FORKEXEC=1 CPPFLAGS+= -DHAVE_SYMLINKS CPPFLAGS+= -DHAVE_TERMIO_H CPPFLAGS+= -DHAVE_SYS_SOCKET_H CPPFLAGS+= -D_FILE_OFFSET_BITS=64 CPPFLAGS+= -I${.CURDIR} CPPFLAGS+= -I${.CURDIR}/../include CPPFLAGS+= -I${.CURDIR}/../base/include CPPFLAGS+= -I${.CURDIR}/../libcrypto_utils/include CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}} CPPFLAGS+= $$(${PKG_CONFIG} libcrypto --cflags 2>/dev/null) CPPFLAGS+= $$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null) CXXFLAGS+= -std=gnu++11 .ifndef COMPILE.c CFLAGS+= ${CPPFLAGS} CXXFLAGS+= ${CPPFLAGS} .endif TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags) .for f in ${TEST_SRCS} CPPFLAGS.${f}+= ${TEST_CPPFLAGS} .endfor LDADD+= $$(${PKG_CONFIG} libcrypto --libs 2>/dev/null || echo -lcrypto) LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb) LDADD+= -lz \-lpthread DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ} TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags) TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/} CLEANFILES+= ${PROG}_test ${TEST_OBJS} GIT?= git GTEST_CONFIG?= gtest-config PKG_CONFIG?= pkg-config beforeinstall: ${INSTALL} -d ${DESTDIR}${FILESDIR} .include test: ${PROG}_test @for f in ${.ALLSRC}; do ./$$f; done ${PROG}_test: ${OBJS:Nmain.o:Ncommandline.o} ${TEST_OBJS} ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD} Index: head/devel/android-tools-fastboot/Makefile =================================================================== --- head/devel/android-tools-fastboot/Makefile (revision 416543) +++ head/devel/android-tools-fastboot/Makefile (revision 416544) @@ -1,90 +1,94 @@ # $FreeBSD$ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- DISTVERSION?= 6.0.0_r26 PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage DISTFILES= fastboot.1?id=706e754:manpage EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//} MAINTAINER= jbeich@FreeBSD.org COMMENT= Android Fastboot protocol CLI tool LICENSE= APACHE20 BSD2CLAUSE PD LICENSE_COMB= multi LICENSE_FILE_PD= ${WRKSRC}/libselinux/NOTICE LIB_DEPENDS= libpcre.so:devel/pcre USE_GITHUB= yes GH_ACCOUNT= android jbeich:extras,libselinux GH_PROJECT= platform_system_core platform_system_extras:extras \ platform_external_libselinux:libselinux # Emulate GH_COMMIT without causing desync .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else GH_REVISION= f7f765fd62bf # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* +.ifndef EXTRA_PATCHES +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-liblog_logd__write.c +.endif + USES= compiler:c++11-lib pkgconfig uidfix BUILD_WRKSRC= ${WRKSRC}/fastboot INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKEFILE= ${.CURDIR}/files/Makefile # XXX ?= when bmake-only MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" \ MANDIR="${PREFIX}/man/man" \ LIBPCRE="${LOCALBASE}/lib/libpcre.a" PLIST_FILES= bin/fastboot \ 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_ACCOUNT= mbrubeck:bashcomp BASH_GH_PROJECT= android-completion:bashcomp BASH_GH_TAGNAME= 3b0fabe: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}/${DISTFILES:M*\:manpage:C/\?.*//} # Adjust paths relative to core @(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC}) @${MV} ${WRKSRC_libselinux} ${WRKSRC}/libselinux post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} update-revision: # https://developer.github.com/v3/repos/commits/#get-a-single-commit # Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1) @${REINPLACE_CMD} -i '' -e "/^GH_REVISION.*$@/s/=.*/= $$(\ ${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \ https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \ ${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{12\}\).*/\1/p; q; }' \ ) # generated by: make $@/" \ ${.CURDIR}/Makefile .include # XXX Work around !target(makesum) .ifndef DISTVERSIONSUFFIX makesum: update-revision .endif Index: head/devel/android-tools-fastboot/files/patch-liblog_logd__write.c =================================================================== --- head/devel/android-tools-fastboot/files/patch-liblog_logd__write.c (revision 416543) +++ head/devel/android-tools-fastboot/files/patch-liblog_logd__write.c (nonexistent) @@ -1,12 +0,0 @@ ---- liblog/logd_write.c.orig 2015-05-27 20:24:08 UTC -+++ liblog/logd_write.c -@@ -22,7 +22,9 @@ - #include - #endif - #include -+#if (FAKE_LOG_DEVICE == 0) - #include -+#endif - #include - #include - #include Property changes on: head/devel/android-tools-fastboot/files/patch-liblog_logd__write.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/android-tools-fastboot/files/extra-patch-liblog_logd__write.c =================================================================== --- head/devel/android-tools-fastboot/files/extra-patch-liblog_logd__write.c (nonexistent) +++ head/devel/android-tools-fastboot/files/extra-patch-liblog_logd__write.c (revision 416544) @@ -0,0 +1,12 @@ +--- liblog/logd_write.c.orig 2015-05-27 20:24:08 UTC ++++ liblog/logd_write.c +@@ -22,7 +22,9 @@ + #include + #endif + #include ++#if (FAKE_LOG_DEVICE == 0) + #include ++#endif + #include + #include + #include Property changes on: head/devel/android-tools-fastboot/files/extra-patch-liblog_logd__write.c ___________________________________________________________________ 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: head/devel/android-tools-fastboot-devel/Makefile =================================================================== --- head/devel/android-tools-fastboot-devel/Makefile (revision 416543) +++ head/devel/android-tools-fastboot-devel/Makefile (revision 416544) @@ -1,20 +1,20 @@ # $FreeBSD$ -# Hint: git describe --abbrev=12 --match android-m-preview -DISTVERSION= m-preview-6425 -DISTVERSIONSUFFIX= -g0fc006685c20 +# Hint: git describe --abbrev=12 --match android-n-preview-3 +DISTVERSION= n-preview-3-101 +DISTVERSIONSUFFIX= -g35d84096e9a5 PORTREVISION= 0 PKGNAMESUFFIX= -devel GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//} -GH_TAGNAME= ${GH_MYTAG}-1197-g21ac023:extras \ - ${GH_MYTAG}-98-gde7b594:libselinux +GH_TAGNAME= ${GH_MYTAG}-45-g86bebf8:extras \ + ${GH_MYTAG}:libselinux CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* MASTERDIR= ${.CURDIR}/../android-tools-fastboot DISTINFO_FILE= ${.CURDIR}/distinfo FILESDIR= ${.CURDIR}/files EXTRA_PATCHES= ${.CURDIR}/files/patch-* .include "${MASTERDIR}/Makefile" Index: head/devel/android-tools-fastboot-devel/distinfo =================================================================== --- head/devel/android-tools-fastboot-devel/distinfo (revision 416543) +++ head/devel/android-tools-fastboot-devel/distinfo (revision 416544) @@ -1,10 +1,10 @@ SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 SIZE (fastboot.1?id=706e754) = 5906 -SHA256 (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 96659d021fcabbddbf86ea2e834928352fd81a91d49cabea5d03f4c51c85889e -SIZE (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 1516347 -SHA256 (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = bf6df99267b76e7a3446f3d4d613bbb1493b3ba43ab87aca99f0ade9d2990163 -SIZE (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = 76589937 -SHA256 (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 6ce79ee148103a59ed16e49fd3b9af80e84e65ec4a4ab0a883c14befd6cc29b6 -SIZE (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 59433 +SHA256 (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 0f18ec5fc99aaa1c5c755148759bb5994b366680bda6f23433c9454dbddcab66 +SIZE (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 1559018 +SHA256 (jbeich-platform_system_extras-android-n-preview-3-45-g86bebf8_GH0.tar.gz) = 0b08abf97108f7c2a6c56b728ecf8fbc34ec26f6b00e1ee002828eee9d5b7209 +SIZE (jbeich-platform_system_extras-android-n-preview-3-45-g86bebf8_GH0.tar.gz) = 80661868 +SHA256 (jbeich-platform_external_libselinux-android-n-preview-3_GH0.tar.gz) = 3c90521a2f86064cb0968603972f7d1df45621a7407bfd62d5fdc25cd30a70e2 +SIZE (jbeich-platform_external_libselinux-android-n-preview-3_GH0.tar.gz) = 63015 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 Index: head/devel/android-tools-fastboot-devel/files/Makefile =================================================================== --- head/devel/android-tools-fastboot-devel/files/Makefile (revision 416543) +++ head/devel/android-tools-fastboot-devel/files/Makefile (revision 416544) @@ -1,131 +1,136 @@ # $FreeBSD$ PROG_CXX=fastboot BINDIR?=/usr/bin FILESDIR?=${DOCDIR}/${PROG} FILES= *.[Tt][Xx][Tt] SRCS+= bootimg_utils.cpp SRCS+= engine.cpp SRCS+= fastboot.cpp SRCS+= ../fastboot/fs.cpp SRCS+= protocol.cpp SRCS+= socket.cpp SRCS+= tcp.cpp SRCS+= udp.cpp SRCS+= util.cpp .PATH: ${EXTRADIR} SRCS+= usb_freebsd.cpp SRCS+= util_freebsd.cpp # required by fastboot .PATH: ${.CURDIR}/../adb SRCS+= diagnose_usb.cpp # required by fastboot, diagnose_usb and libziparchive .PATH: ${.CURDIR}/../base SRCS+= errors_unix.cpp SRCS+= file.cpp SRCS+= parsenetaddress.cpp SRCS+= stringprintf.cpp SRCS+= strings.cpp # required by fastboot .PATH: ${.CURDIR}/../ext4_utils SRCS+= allocate.c SRCS+= contents.c SRCS+= crc16.c SRCS+= ext4_sb.c SRCS+= ext4_utils.c SRCS+= ext4fixup.c SRCS+= extent.c SRCS+= indirect.c SRCS+= make_ext4fs.c SRCS+= sha1.c SRCS+= wipe.c # required by fastboot .PATH: ${.CURDIR}/../libcutils SRCS+= ../libcutils/sockets.cpp SRCS+= socket_inaddr_any_server_unix.c SRCS+= socket_network_client_unix.c SRCS+= sockets_unix.cpp CPPFLAGS.sockets.cpp+= -o ${.TARGET} # XXX pre-r279980 # required by base and libutils .PATH: ${.CURDIR}/../liblog +SRCS+= config_write.c SRCS+= fake_log_device.c -SRCS+= logd_write.c -CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1 +SRCS+= fake_writer.c +SRCS+= logger_lock.c +SRCS+= logger_name.c +SRCS+= logger_write.c +CPPFLAGS.config_write.c+= -DFAKE_LOG_DEVICE=1 # required by ext4_utils .PATH: ${.CURDIR}/../libselinux/src SRCS+= callbacks.c SRCS+= check_context.c SRCS+= freecon.c SRCS+= init.c SRCS+= label.c SRCS+= label_android_property.c SRCS+= label_file.c SRCS+= label_support.c +SRCS+= regex.c CPPFLAGS.label_file.c+= -D_WITH_GETLINE # required by fastboot and ext4_utils .PATH: ${.CURDIR}/../libsparse SRCS+= backed_block.c SRCS+= output_file.c SRCS+= sparse.c SRCS+= sparse_crc32.c SRCS+= sparse_err.c SRCS+= sparse_read.c # required by libziparchive .PATH: ${.CURDIR}/../libutils SRCS+= FileMap.cpp # required by fastboot .PATH: ${.CURDIR}/../libziparchive SRCS+= zip_archive.cc REVISION?= $$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown) CPPFLAGS+= -DFASTBOOT_REVISION="\"${REVISION}-android\"" CPPFLAGS+= -Doff64_t=off_t CPPFLAGS+= -Dftruncate64=ftruncate CPPFLAGS+= -Dlseek64=lseek CPPFLAGS+= -Dmmap64=mmap CPPFLAGS+= -Dpread64=pread 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}/../f2fs_utils CPPFLAGS+= -I${.CURDIR}/../libselinux/include CPPFLAGS+= -I${.CURDIR}/../libsparse/include CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}} CPPFLAGS+= $$(${PKG_CONFIG} libpcre --cflags 2>/dev/null) CPPFLAGS+= $$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null) CXXFLAGS+= -D__STDC_LIMIT_MACROS # DragonFly CXXFLAGS+= -std=gnu++11 .ifndef COMPILE.c CFLAGS+= ${CPPFLAGS} CXXFLAGS+= ${CPPFLAGS} .endif LDADD+= $$(${PKG_CONFIG} libpcre --libs 2>/dev/null || echo -lpcre) LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb) LDADD+= -lz DPADD+= ${LIBPCRE} ${LIBUSB} ${LIBZ} GIT?= git PKG_CONFIG?= pkg-config beforeinstall: ${INSTALL} -d ${DESTDIR}${FILESDIR} .include Index: head/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c =================================================================== --- head/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c (nonexistent) +++ head/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c (revision 416544) @@ -0,0 +1,16 @@ +--- liblog/logger_write.c.orig 2016-04-16 00:01:39 UTC ++++ liblog/logger_write.c +@@ -15,12 +15,12 @@ + */ + + #include +-#include + #include + #include + #include + + #ifdef __BIONIC__ ++#include + #include + #endif + Property changes on: head/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c ___________________________________________________________________ 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: head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp =================================================================== --- head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp (revision 416543) +++ head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp (revision 416544) @@ -1,208 +1,208 @@ /* * Copyright (C) 2011 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include #include #include #include #include #include "usb.h" struct usb_handle { libusb_device_handle *handle; libusb_device *dev; unsigned char ep_in; unsigned char ep_out; unsigned char iface; }; class LibusbUsbTransport : public Transport { public: - LibusbUsbTransport(std::unique_ptr handle): + explicit LibusbUsbTransport(std::unique_ptr handle): h(std::move(handle)) {} ~LibusbUsbTransport() override = default; ssize_t Read(void *_data, size_t len) override; ssize_t Write(const void *_data, size_t len) override; int Close() override; private: std::unique_ptr h; DISALLOW_COPY_AND_ASSIGN(LibusbUsbTransport); }; static int probe(std::unique_ptr &h, ifc_match_func callback) { usb_ifc_info info; libusb_device_descriptor ddesc; libusb_config_descriptor *pcfg; int i, j; if (libusb_open(h->dev, &h->handle) < 0) return (-1); if (libusb_get_device_descriptor(h->dev, &ddesc) < 0) { libusb_close(h->handle); return (-1); } memset(&info, 0, sizeof(info)); info.dev_vendor = ddesc.idVendor; info.dev_product = ddesc.idProduct; info.dev_class = ddesc.bDeviceClass; info.dev_subclass = ddesc.bDeviceSubClass; info.dev_protocol = ddesc.bDeviceProtocol; info.writable = 1; snprintf(info.device_path, sizeof(info.device_path), "ugen%d.%d", libusb_get_bus_number(h->dev), libusb_get_device_address(h->dev)); if (ddesc.iSerialNumber != 0) { libusb_get_string_descriptor_ascii(h->handle, ddesc.iSerialNumber, (unsigned char *)info.serial_number, sizeof(info.serial_number)); } if (libusb_get_active_config_descriptor(h->dev, &pcfg)) { libusb_close(h->handle); return (-1); } for (i = 0; i < pcfg->bNumInterfaces; i++) { h->ep_in = 0; h->ep_out = 0; h->iface = i; for (j = 0; j < pcfg->interface[i].altsetting[0].bNumEndpoints; j++) { unsigned char temp = pcfg->interface[i].altsetting[0]. endpoint[j].bEndpointAddress; unsigned char type = pcfg->interface[i].altsetting[0]. endpoint[j].bmAttributes & 0x03; /* check for BULK endpoint */ if ((type & 0x03) == 0x02) { /* check for IN endpoint */ if (temp & 0x80) h->ep_in = temp; else h->ep_out = temp; } } info.ifc_class = pcfg->interface[i].altsetting[0].bInterfaceClass; info.ifc_subclass = pcfg->interface[i].altsetting[0].bInterfaceSubClass; info.ifc_protocol = pcfg->interface[i].altsetting[0].bInterfaceProtocol; info.has_bulk_in = (h->ep_in != 0); info.has_bulk_out = (h->ep_out != 0); if (libusb_claim_interface(h->handle, h->iface) < 0) continue; if (callback(&info) == 0) { libusb_free_config_descriptor(pcfg); return (0); } libusb_release_interface(h->handle, h->iface); } libusb_free_config_descriptor(pcfg); libusb_close(h->handle); return (-1); } static std::unique_ptr enumerate(ifc_match_func callback) { static libusb_context *ctx = NULL; std::unique_ptr h; libusb_device **ppdev; ssize_t ndev; ssize_t x; if (ctx == NULL) libusb_init(&ctx); ndev = libusb_get_device_list(ctx, &ppdev); for (x = 0; x < ndev; x++) { h.reset(new usb_handle); h->dev = ppdev[x]; if (probe(h, callback) == 0) { libusb_ref_device(h->dev); libusb_free_device_list(ppdev, 1); return (h); } } h.reset(); libusb_free_device_list(ppdev, 1); return (nullptr); } ssize_t LibusbUsbTransport::Write(const void *_data, size_t len) { int actlen; if (libusb_bulk_transfer(h->handle, h->ep_out, (unsigned char *)_data, len, &actlen, 0) < 0) return (-1); return (actlen); } ssize_t LibusbUsbTransport::Read(void *_data, size_t len) { int actlen; if (libusb_bulk_transfer(h->handle, h->ep_in, (unsigned char *)_data, len, &actlen, 0) < 0) return (-1); return (actlen); } int LibusbUsbTransport::Close() { libusb_close(h->handle); h->handle = NULL; libusb_unref_device(h->dev); h.reset(); return (0); } Transport * usb_open(ifc_match_func callback) { std::unique_ptr h = enumerate(callback); return (h ? new LibusbUsbTransport(std::move(h)) : nullptr); } Index: head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp =================================================================== --- head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp (revision 416543) +++ head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp (revision 416544) @@ -1,37 +1,39 @@ /* * Copyright (C) 2011 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include "fastboot.h" #include #include -void -get_my_path(char *path) +std::string +get_my_path() { - getcwd(path, PATH_MAX - 1); + char path[PATH_MAX + 1]; + getcwd(path, sizeof(path) - 1); + return path; }