Skip to content

android-tools-adb: update to 9.0 based on FreeBSD patches #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jbeich wants to merge 1 commit into from
Closed

android-tools-adb: update to 9.0 based on FreeBSD patches #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 40 additions & 14 deletions android-tools-adb/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,54 @@
# $NetBSD: Makefile,v 1.4 2015/03/07 21:39:40 tnn2 Exp $

DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG}
PKGNAME= android-tools-adb-5.0.2
PKGNAME= android-tools-adb-9.0.0_r3
CATEGORIES= devel
MASTER_SITES= https://github.com/android/
MASTER_SITES= ${MASTER_SITE_GITHUB:=aosp-mirror/}
GITHUB_PROJECT= platform_system_core
GITHUB_TAG= android-5.0.2_r1
GITHUB_TAG= ${PKGNAME:S/-tools-adb//}
DIST_SUBDIR= adb${PKGVERSION_NOREV:R:R}
DISTFILES= ${DEFAULT_DISTFILES} Makefile
SITES.Makefile:=${PATCH_SITES}

PATCH_SITES= ${MASTER_SITE_GITHUB:=freebsd/freebsd-ports/raw/734e5c93a88e/devel/android-tools-adb/files/}
PATCHFILES+= patch-adb_adb__auth__host.cpp
PATCHFILES+= patch-adb_adb__io__test.cpp
PATCHFILES+= patch-adb_bugreport__test.cpp
PATCHFILES+= patch-adb_client_usb__libusb.cpp
PATCHFILES+= patch-adb_commandline.cpp
PATCHFILES+= patch-adb_commandline.h
PATCHFILES+= patch-adb_fdevent__test.cpp
PATCHFILES+= patch-adb_sysdeps.h
PATCHFILES+= patch-adb_sysdeps__test.cpp
PATCHFILES+= patch-adb_sysdeps_posix_network.cpp
PATCHFILES+= patch-adb_transport__usb.cpp
PATCHFILES+= patch-adb_usb.h
PATCHFILES+= patch-base_file.cpp
PATCHFILES+= patch-base_file__test.cpp
PATCHFILES+= patch-base_include_android-base_logging.h
PATCHFILES+= patch-base_logging.cpp
PATCHFILES+= patch-base_parsenetaddress.cpp
PATCHFILES+= patch-base_stringprintf__test.cpp
PATCHFILES+= patch-gtest-1.8.1
PATCHFILES+= patch-include_cutils_trace.h
PATCHFILES+= patch-libcrypto__utils_android__pubkey.c
PATCHFILES+= patch-libcutils_threads.cpp
PATCHFILES+= patch-liblog_logger__write.c

MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://developer.android.com/tools/help/adb.html
COMMENT= Android debug bridge command line tool
LICENSE= apache-2.0

WRKSRC= ${WRKDIR}/${DISTNAME}/adb
USE_TOOLS+= gmake

MAKE_JOBS_SAFE= no

CPPFLAGS+= -I${BUILDLINK_PREFIX.libusb1}/include/libusb-1.0

INSTALLATION_DIRS+= bin

post-extract:
${CP} ${FILESDIR}/Makefile ${WRKSRC}
USE_LANGUAGES= c c++
GCC_REQD+= 5.3 # c++14
USE_TOOLS+= pkg-config
USE_BSD_MAKEFILE= yes
MAKE_FILE= ${_DISTDIR}/Makefile
MAKE_ENV+= MDNSEXT=_unsupported # XXX expose as option
CXXFLAGS+= $${PIE_CFLAGS} # XXX move to bsd.sys.mk
BUILD_DIRS= adb
INSTALLATION_DIRS= bin

.include "../../devel/libusb1/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
Expand Down
106 changes: 100 additions & 6 deletions android-tools-adb/distinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,102 @@
$NetBSD: distinfo,v 1.2 2015/03/07 16:28:33 tnn2 Exp $

SHA1 (platform_system_core-android-5.0.2_r1.tar.gz) = fc5626cf84cc18175be498ea3e664d7c7b188c27
RMD160 (platform_system_core-android-5.0.2_r1.tar.gz) = e1e73c0f6ac99cd0641b8ff575fe56f3a79decfb
Size (platform_system_core-android-5.0.2_r1.tar.gz) = 1202992 bytes
SHA1 (patch-adb__auth__host.c) = f0e559f3643e660960c69cd466cf73ec5078b091
SHA1 (patch-get__my__path__freebsd.c) = 608d3d51d46519487e1494918647dfa6540bccb0
SHA1 (patch-usb__libusb.c) = d41f8a5d7639682c6d186121cd56f0a5ba87dcd7
SHA1 (adb9/Makefile) = 217c39a2eff83172f46538261f2aef6821801e43
RMD160 (adb9/Makefile) = faad320ff950a6c999626573eeac743f6d56cb92
SHA512 (adb9/Makefile) = b2eba28e15f6f305cd014b941e7598c4004bc35d649eb45ca67289b0dc070b02d1a8cb007f0b930acbe939070477bb098d5588dbd362a3b50338eedf2fb7d096
Size (adb9/Makefile) = 3783 bytes
SHA1 (adb9/patch-adb_adb__auth__host.cpp) = dff4da9c65c1ed906d1f87de8a6c4ec262ae8e9f
RMD160 (adb9/patch-adb_adb__auth__host.cpp) = ec0fbd83734d76a69eeca8c9efb590adc11ba853
SHA512 (adb9/patch-adb_adb__auth__host.cpp) = b0915be32e52e8067224da4024b347fe63aae4fc38856a106ddc4795c0793149f58926d6ccc4513dbfac87d739f7692b390b76e902e3269ced15ce661e930969
Size (adb9/patch-adb_adb__auth__host.cpp) = 1121 bytes
SHA1 (adb9/patch-adb_adb__io__test.cpp) = 9050fc079f9701360dc52b72b7dcb13acd492a5f
RMD160 (adb9/patch-adb_adb__io__test.cpp) = 7620d8e8d795d3358f08bbd206f803bf3a3af6f0
SHA512 (adb9/patch-adb_adb__io__test.cpp) = 41ea0606d380ee35742bed7ec79c5404bd49424c2f3d3306d6b4c729bba4d8aca8455640c11fd6fd058d89f21565b855a3a3a67c0642d3525f3f61f78d4f3ada
Size (adb9/patch-adb_adb__io__test.cpp) = 206 bytes
SHA1 (adb9/patch-adb_bugreport__test.cpp) = 310c3ba6e4e4332f642457f869880f8cc4bbf1dd
RMD160 (adb9/patch-adb_bugreport__test.cpp) = 4bc93c02d0b6ac47b1c8017e958fc5ff3c7823be
SHA512 (adb9/patch-adb_bugreport__test.cpp) = bc02d1f47755fde980d3f473403f7cca145f301faeb90e26103f27f6de2c98c2e8a1f5724587c1d1142f5e4da81720b2d249fcd0c5d021a70ad14d19bbedb4fc
Size (adb9/patch-adb_bugreport__test.cpp) = 809 bytes
SHA1 (adb9/patch-adb_client_usb__libusb.cpp) = 5714c2b21716b05cc73861a5a3487dde2cc77dae
RMD160 (adb9/patch-adb_client_usb__libusb.cpp) = 521b76990336d85339f766bf77cd7c4efa79d3c2
SHA512 (adb9/patch-adb_client_usb__libusb.cpp) = 783ab54adfd06ee136a0fd5af3643d6aa639f9742fb6d7f29f994ea2044e53e79509100126882ef85cb764604e7d3a4d174cfa630a154d144bd00da93daf6378
Size (adb9/patch-adb_client_usb__libusb.cpp) = 4486 bytes
SHA1 (adb9/patch-adb_commandline.cpp) = 4980ea64581edaaf5bf42b992a0d0a99bf93ca33
RMD160 (adb9/patch-adb_commandline.cpp) = c56d7ce31782dddb0848a05b1f6bc258d091754d
SHA512 (adb9/patch-adb_commandline.cpp) = e422aee09ea18dacb878b82467a3ae60cd4855a7b5613db71f99ea40b0e4c126de2e2f25e35aaa1e1e6d1a1f85c949754faeb353db8aa57b820c3c059024dd03
Size (adb9/patch-adb_commandline.cpp) = 818 bytes
SHA1 (adb9/patch-adb_commandline.h) = 38b9eec6662d69a6ba014367dec87f7792c6ac13
RMD160 (adb9/patch-adb_commandline.h) = 0ea6ce6e308d05ddc4c8d31aeeb703cbac603213
SHA512 (adb9/patch-adb_commandline.h) = 2007d03605f1396cf6d856831978c86a7481c0e11b24a49971ff5f89c535ac5ca808a6a8eb7ef515b44ade86ec185524ac1c4755b075c06b6c8b4150b33474e0
Size (adb9/patch-adb_commandline.h) = 272 bytes
SHA1 (adb9/patch-adb_fdevent__test.cpp) = 8ea7c59786d80ad144562a89caf9e99ff9094c9a
RMD160 (adb9/patch-adb_fdevent__test.cpp) = d34ca02037d32b26e9e7084b8535b8fe718dae47
SHA512 (adb9/patch-adb_fdevent__test.cpp) = 55d9501b2e6b347c96926be1dbf8a2a601d924e4ea8ab758e4b6826379b9bed7ff596743c8ce5e70fe943d1c9b88804bdbc74e10a5f9819726a0b3749f11aa18
Size (adb9/patch-adb_fdevent__test.cpp) = 238 bytes
SHA1 (adb9/patch-adb_sysdeps.h) = 00d2e790685aa79d4ac109cc8bde1d36021cdb11
RMD160 (adb9/patch-adb_sysdeps.h) = 57a20f5211488d111fb6d37939ec8c1a1bf4520f
SHA512 (adb9/patch-adb_sysdeps.h) = 0e6a1b8472a77b00d6f6c3089c43f3318b2eec809f91a45646ea8c5964be8aa2bf2b872bcb7b488714edcd9ff1b9b98c64a8516240880c7adfccb02bd1cbb71e
Size (adb9/patch-adb_sysdeps.h) = 1206 bytes
SHA1 (adb9/patch-adb_sysdeps__test.cpp) = 8d5affc4c883bb5427402f2a94e3361586e77917
RMD160 (adb9/patch-adb_sysdeps__test.cpp) = 1e9fecd19988c5e75d10c575aad810beacef59d9
SHA512 (adb9/patch-adb_sysdeps__test.cpp) = b27647510567930f1764027fd20b9f7055ed2987358e15c001fa501d0bdd5bf42303b735d5027d29496184f413863ed360628be19bb8aa02a971ead5bb1e181a
Size (adb9/patch-adb_sysdeps__test.cpp) = 209 bytes
SHA1 (adb9/patch-adb_sysdeps_posix_network.cpp) = 3ccec5f49b2d45e2790e004ba4ca660bea2c6472
RMD160 (adb9/patch-adb_sysdeps_posix_network.cpp) = 08c624284a409db5bf9b24d20f73e8ba49569578
SHA512 (adb9/patch-adb_sysdeps_posix_network.cpp) = c843a5b7f069197baa1ddb9f6afe8478e1057cb1e382b08d4189bc5feebc846e9b7a73b15375d86b6b955e4818bbcfe2a5b8cb0d2fde5f306d54774edaed0b4d
Size (adb9/patch-adb_sysdeps_posix_network.cpp) = 252 bytes
SHA1 (adb9/patch-adb_transport__usb.cpp) = 50488f08fc92646ce538085544fc60f0b0ee5b24
RMD160 (adb9/patch-adb_transport__usb.cpp) = 87f9c25e7395a53404491cad970f09edaea381a7
SHA512 (adb9/patch-adb_transport__usb.cpp) = 06c30089223be42173190872b4d19ee0a9ae217f9e81fcd753b3af6cc682bab9765eda5e6937dc8c60ff8e71acd3cc0cbb2d4df614c9adf87adbfaa549fa2b7e
Size (adb9/patch-adb_transport__usb.cpp) = 423 bytes
SHA1 (adb9/patch-adb_usb.h) = 975a35ced3c31e7f32818e869d2e33ddb9b461bd
RMD160 (adb9/patch-adb_usb.h) = e1b326fcc8c2bb633aefab29a8fb044c4fbee6be
SHA512 (adb9/patch-adb_usb.h) = ef8505a672e43d8997d984096da015c25a5f504c7ef32604b87d3f83a98fa1521c1aaf8ef8b03ee8dcdaa03d30e6628c7a3ac474bbb5f89e70d0c6797678a89c
Size (adb9/patch-adb_usb.h) = 453 bytes
SHA1 (adb9/patch-base_file.cpp) = 040a86a79475c4459fb5aea7dbff51ca4ab55531
RMD160 (adb9/patch-base_file.cpp) = f8ea30dcee85828c4b2a1ea29f7dc7ee6e937dec
SHA512 (adb9/patch-base_file.cpp) = 91f71ad6bd57067b0f9ea1d8cee4511bc7c704709fb6b9623251ed71e2a35c64d92fe6672160f796a5bdaf83bfbd286a672e772e5236f9b3322b6177a4452bc7
Size (adb9/patch-base_file.cpp) = 1167 bytes
SHA1 (adb9/patch-base_file__test.cpp) = 67e71f0facf9d912389d12ac1150e378d2d8f208
RMD160 (adb9/patch-base_file__test.cpp) = 35acd003d68456ed2e099b48fd4d465b27727a5c
SHA512 (adb9/patch-base_file__test.cpp) = be88d2a51eebb25e27ef857c9cdba8f8ab9e7a6cd919a2d088e043cc87e2aa235eba3c66a4c4b24f37baf36cc202232c045bbdc721e32b4baf1184b563f7ba94
Size (adb9/patch-base_file__test.cpp) = 1414 bytes
SHA1 (adb9/patch-base_include_android-base_logging.h) = 1263121afb607ab9229ea838d8253e78cde2c91f
RMD160 (adb9/patch-base_include_android-base_logging.h) = 7131c341a05d56475cc8bba7df62b8e26f635e6e
SHA512 (adb9/patch-base_include_android-base_logging.h) = c3d157e1ddd32b6c9a1f34a45fe1a33169e04f72296d2793cea30e8c0844bf37e5380aafec83d9c186915a9fd4b324bd444dcd39dcb89e509acbef03bf6b4688
Size (adb9/patch-base_include_android-base_logging.h) = 696 bytes
SHA1 (adb9/patch-base_logging.cpp) = 765f9752c9278a714d2e22d3cf5fd3979a7ca23c
RMD160 (adb9/patch-base_logging.cpp) = b815b9275238579440bbee71c093df56c3ff8b36
SHA512 (adb9/patch-base_logging.cpp) = 0eee2f2acb7172ba47b324b464055ec31a3601c0b40014fd2324596a43125b9d95737ae704544c9658307c6653348cd26365e169e50110c145da61b199219746
Size (adb9/patch-base_logging.cpp) = 1196 bytes
SHA1 (adb9/patch-base_parsenetaddress.cpp) = b247867a51c8936310f1682e27b5a1730a2279d4
RMD160 (adb9/patch-base_parsenetaddress.cpp) = a0cd5b986a85eecb5c8846a744ae851f369fd1fd
SHA512 (adb9/patch-base_parsenetaddress.cpp) = 0f326624a0a18b28cf41067f179ae4b01b16df3e50632439e20ca9b52b66f54866e013e40ffc470dc9ad3d00ab69cf9f0c58ab666747ac8e17cd33a549eeabd1
Size (adb9/patch-base_parsenetaddress.cpp) = 246 bytes
SHA1 (adb9/patch-base_stringprintf__test.cpp) = ab772e494c57f27c2f549ac320511901f71a7df0
RMD160 (adb9/patch-base_stringprintf__test.cpp) = a98a29d1ac330ea9e8567898984871163c91ec48
SHA512 (adb9/patch-base_stringprintf__test.cpp) = 814c1014d8b016aa3e56689f78801701fda0585f2dfe19c694304fcb352d88cbe7512dd732cb47cf9c97312202d01db47096e6d08b59ea837fb0c0d19168aa65
Size (adb9/patch-base_stringprintf__test.cpp) = 216 bytes
SHA1 (adb9/patch-gtest-1.8.1) = 102d5294087fd6481c3d16c5d02d9dac690a4dbb
RMD160 (adb9/patch-gtest-1.8.1) = 3e469ad7318381f118fdba938d50b0314b17d4a6
SHA512 (adb9/patch-gtest-1.8.1) = 8004cffce3ffa04b5ed5466f8662cbc2df20db809dceb27af21d20305457d2ea96df8a14014759c58108f5d5f967602d951800fe9eec055253bab78f21f22217
Size (adb9/patch-gtest-1.8.1) = 3430 bytes
SHA1 (adb9/patch-include_cutils_trace.h) = bbe70ad0e494892cf8caebe6d7ded2f124831425
RMD160 (adb9/patch-include_cutils_trace.h) = 6e2a9c622a06d96afb86c1430e64eca3d656c32a
SHA512 (adb9/patch-include_cutils_trace.h) = b5622308126347ba3f1ac804ca56598e394ed34af78c983ba1dd68c1bdc3a359cb0c0c7c6dd9836c7665611f092c75ecceaf6175f18623de84bf9184a2da2ce4
Size (adb9/patch-include_cutils_trace.h) = 381 bytes
SHA1 (adb9/patch-libcrypto__utils_android__pubkey.c) = 8efa2db8bf7ceeefb310a2274dd0a78e8c5ce178
RMD160 (adb9/patch-libcrypto__utils_android__pubkey.c) = 17694deeb3b1b2ac29a5eb0cec940c33f3db4cf6
SHA512 (adb9/patch-libcrypto__utils_android__pubkey.c) = 93bd6b2c0fbb55efed6a1ff09649036e08c6f3576be6852690c18b6d95afc90a43cdf5db5d7584475899af7c8d2914ca7c4d09e53417509f0cbe1cd45091ab6c
Size (adb9/patch-libcrypto__utils_android__pubkey.c) = 7028 bytes
SHA1 (adb9/patch-libcutils_threads.cpp) = 37a1a6af3cfc2bb79cd52a1cdced8c4181e34f46
RMD160 (adb9/patch-libcutils_threads.cpp) = 2e326da31dec3c6b73e42f255faf4645c503d5cd
SHA512 (adb9/patch-libcutils_threads.cpp) = 736c5b28bdf5711ae027481011e9651df23c19f5e040a593ebad20ca214b9f58f6d342510f13bc21a685014173ed9c3ffbc78d2345407ba610248e92d92bb97b
Size (adb9/patch-libcutils_threads.cpp) = 1081 bytes
SHA1 (adb9/patch-liblog_logger__write.c) = 557ef35f81dbc2c82c51969a92f7e101bdacb9ad
RMD160 (adb9/patch-liblog_logger__write.c) = bb6f46e3c9c2baba95c572b04cb2120f8f7d69b5
SHA512 (adb9/patch-liblog_logger__write.c) = 235f235f6b248931c9aa80342c0b79650a0a1ad446370f4db316264a476209e3acdb8b7ad310d282ba53c8208a422a2f37d0c9301b3f1d81a6fea8ecc8360c97
Size (adb9/patch-liblog_logger__write.c) = 312 bytes
SHA1 (adb9/platform_system_core-android-9.0.0_r3.tar.gz) = d5063dba2abfa0e167e79b8e91589df1c5a470f2
RMD160 (adb9/platform_system_core-android-9.0.0_r3.tar.gz) = d26db0b087ac343adf0ee583d29374ad7e665f8e
SHA512 (adb9/platform_system_core-android-9.0.0_r3.tar.gz) = 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
Size (adb9/platform_system_core-android-9.0.0_r3.tar.gz) = 27484684 bytes
64 changes: 0 additions & 64 deletions android-tools-adb/files/Makefile
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions android-tools-adb/patches/patch-adb__auth__host.c
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions android-tools-adb/patches/patch-get__my__path__freebsd.c
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions android-tools-adb/patches/patch-usb__libusb.c
View file
Open in desktop

This file was deleted.