pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove android-tools-adb - moved to main pkgsrc
Module Name: pkgsrc-wip
Committed By: David Brownlee <abs%absd.org@localhost>
Pushed By: abs
Date: Sat Sep 21 14:17:06 2024 +0100
Changeset: c238231e38df53e005568cb0d30be1724e4614ab
Removed Files:
android-tools-adb/DESCR
android-tools-adb/Makefile
android-tools-adb/PLIST
android-tools-adb/distinfo
android-tools-adb/files/Makefile
android-tools-adb/patches/patch-adb__auth__host.c
android-tools-adb/patches/patch-get__my__path__freebsd.c
android-tools-adb/patches/patch-usb__libusb.c
Log Message:
Remove android-tools-adb - moved to main pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c238231e38df53e005568cb0d30be1724e4614ab
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
android-tools-adb/DESCR | 3 -
android-tools-adb/Makefile | 29 ----------
android-tools-adb/PLIST | 2 -
android-tools-adb/distinfo | 8 ---
android-tools-adb/files/Makefile | 64 ----------------------
android-tools-adb/patches/patch-adb__auth__host.c | 56 -------------------
.../patches/patch-get__my__path__freebsd.c | 32 -----------
android-tools-adb/patches/patch-usb__libusb.c | 64 ----------------------
8 files changed, 258 deletions(-)
diffs:
diff --git a/android-tools-adb/DESCR b/android-tools-adb/DESCR
deleted file mode 100644
index 85bb74ed91..0000000000
--- a/android-tools-adb/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Android Debug Bridge (adb) is a versatile command line tool that
-lets you communicate with an emulator instance or connected
-Android-powered device.
diff --git a/android-tools-adb/Makefile b/android-tools-adb/Makefile
deleted file mode 100644
index 7ef0688cef..0000000000
--- a/android-tools-adb/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $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
-CATEGORIES= devel
-MASTER_SITES= https://github.com/android/
-GITHUB_PROJECT= platform_system_core
-GITHUB_TAG= android-5.0.2_r1
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-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}
-
-.include "../../devel/libusb1/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/android-tools-adb/PLIST b/android-tools-adb/PLIST
deleted file mode 100644
index 9cbe66cbe1..0000000000
--- a/android-tools-adb/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/28 18:09:32 tnn2 Exp $
-bin/adb
diff --git a/android-tools-adb/distinfo b/android-tools-adb/distinfo
deleted file mode 100644
index 43bd815871..0000000000
--- a/android-tools-adb/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2015/03/07 16:28:33 tnn2 Exp $
-
-RMD160 (platform_system_core-android-5.0.2_r1.tar.gz) = e1e73c0f6ac99cd0641b8ff575fe56f3a79decfb
-SHA512 (platform_system_core-android-5.0.2_r1.tar.gz) = 5fe1935117864d501cb9b543cfcc5ce090f3278f95c691f8da2623c85a0f6f6fcbefbc4886d69f1a940313ce524295be286f41e4601e0427705c0c7d1ace1014
-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
diff --git a/android-tools-adb/files/Makefile b/android-tools-adb/files/Makefile
deleted file mode 100644
index cadd85976f..0000000000
--- a/android-tools-adb/files/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $FreeBSD: 372832 $
-# $NetBSD: Makefile,v 1.3 2015/02/28 22:03:25 tnn2 Exp $
-
-SRCS+= adb.c
-SRCS+= adb_client.c
-SRCS+= adb_auth_host.c
-SRCS+= commandline.c
-SRCS+= console.c
-SRCS+= file_sync_client.c
-SRCS+= fdevent.c
-ifeq ("${OPSYS}", "FreeBSD")
-SRCS+= get_my_path_freebsd.c
-else ifeq ("${OPSYS}", "DragonFly")
-SRCS+= get_my_path_freebsd.c
-else ifeq ("${OPSYS}", "Darwin")
-SRCS+= get_my_path_darwin.c
-else
-SRCS+= get_my_path_linux.c
-endif
-SRCS+= services.c
-SRCS+= sockets.c
-SRCS+= transport.c
-SRCS+= transport_local.c
-SRCS+= transport_usb.c
-SRCS+= usb_libusb.c
-SRCS+= usb_vendors.c
-
-VPATH+= ../libcutils
-SRCS+= socket_inaddr_any_server.c
-SRCS+= socket_local_client.c
-SRCS+= socket_local_server.c
-SRCS+= socket_loopback_client.c
-SRCS+= socket_loopback_server.c
-SRCS+= socket_network_client.c
-SRCS+= load_file.c
-
-VPATH+= ../libzipfile
-SRCS+= centraldir.c
-SRCS+= zipfile.c
-
-
-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.
-CPPFLAGS+= -I../include
-
-LIBS+= -lc -pthread -lz -lcrypto -lusb-1.0
-
-OBJS= $(SRCS:.c=.o)
-
-all: adb
-
-adb: $(OBJS)
- $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
-
-install: adb
- ${BSD_INSTALL_PROGRAM} adb ${DESTDIR}${PREFIX}/bin/
-
-clean:
- rm -rf $(OBJS) adb
diff --git a/android-tools-adb/patches/patch-adb__auth__host.c b/android-tools-adb/patches/patch-adb__auth__host.c
deleted file mode 100644
index accec60f4b..0000000000
--- a/android-tools-adb/patches/patch-adb__auth__host.c
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD$
-
-OpenSSL 1.1.x compatibility.
-Use getter for rsa->n, suggested by
-https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes
-
---- adb_auth_host.c.orig 2014-10-22 00:46:49.000000000 +0000
-+++ adb_auth_host.c
-@@ -50,6 +50,18 @@
- #define ANDROID_PATH ".android"
- #define ADB_KEY_FILE "adbkey"
-
-+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+static inline void RSA_get0_key(const RSA *r,
-+ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-+{
-+ if (n)
-+ *n = r->n;
-+ if (e)
-+ *e = r->e;
-+ if (d)
-+ *d = r->d;
-+}
-+#endif
-
- struct adb_private_key {
- struct listnode node;
-@@ -73,13 +85,17 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
- BIGNUM* n = BN_new();
- BIGNUM* n0inv = BN_new();
-
-+ const BIGNUM* getter1;
-+ const BIGNUM* getter2;
-+
- if (RSA_size(rsa) != RSANUMBYTES) {
- ret = 0;
- goto out;
- }
-
- BN_set_bit(r32, 32);
-- BN_copy(n, rsa->n);
-+ RSA_get0_key(rsa, &getter1, NULL, NULL);
-+ BN_copy(n, getter1);
- BN_set_bit(r, RSANUMWORDS * 32);
- BN_mod_sqr(rr, r, n, ctx);
- BN_div(NULL, rem, n, r32, ctx);
-@@ -93,7 +109,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
- BN_div(n, rem, n, r32, ctx);
- pkey->n[i] = BN_get_word(rem);
- }
-- pkey->exponent = BN_get_word(rsa->e);
-+ RSA_get0_key(rsa, NULL, &getter2, NULL);
-+ pkey->exponent = BN_get_word(getter2);
-
- out:
- BN_free(n0inv);
diff --git a/android-tools-adb/patches/patch-get__my__path__freebsd.c b/android-tools-adb/patches/patch-get__my__path__freebsd.c
deleted file mode 100644
index 81f6c41fa3..0000000000
--- a/android-tools-adb/patches/patch-get__my__path__freebsd.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-get__my__path__freebsd.c,v 1.1 2015/02/28 18:09:32 tnn2 Exp $
-
---- get_my_path_freebsd.c.orig 2014-10-22 00:46:49.000000000 +0000
-+++ get_my_path_freebsd.c
-@@ -18,19 +18,18 @@
- */
-
- #include <sys/types.h>
-+#include <sys/sysctl.h>
- #include <unistd.h>
--#include <limits.h>
--#include <stdio.h>
-
- void
- get_my_path(char *exe, size_t maxLen)
- {
-- char proc[64];
-+ int mib[4] = {
-+ CTL_KERN,
-+ KERN_PROC,
-+ KERN_PROC_PATHNAME,
-+ getpid()
-+ };
-
-- snprintf(proc, sizeof(proc), "/proc/%d/file", getpid());
--
-- int err = readlink(proc, exe, maxLen - 1);
--
-- exe[err > 0 ? err : 0] = '\0';
-+ sysctl(mib, 4, exe, &maxLen, NULL, 0);
- }
--
diff --git a/android-tools-adb/patches/patch-usb__libusb.c b/android-tools-adb/patches/patch-usb__libusb.c
deleted file mode 100644
index 6d24334a8e..0000000000
--- a/android-tools-adb/patches/patch-usb__libusb.c
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-usb__libusb.c,v 1.1 2015/02/28 18:09:32 tnn2 Exp $
-
---- usb_libusb.c.orig 2014-10-22 00:46:49.000000000 +0000
-+++ usb_libusb.c
-@@ -37,7 +37,7 @@
- #define TRACE_TAG TRACE_USB
- #include "adb.h"
-
--static adb_mutex_t usb_lock = ADB_MUTEX_INITIALIZER;
-+ADB_MUTEX_DEFINE( usb_lock );
- static libusb_context *ctx = NULL;
-
- struct usb_handle
-@@ -246,8 +246,8 @@ void usb_kick(struct usb_handle *h)
- }
-
- int
--check_usb_interface(libusb_interface *interface,
-- libusb_device_descriptor *desc,
-+check_usb_interface(struct libusb_interface *interface,
-+ struct libusb_device_descriptor *desc,
- struct usb_handle *uh)
- {
- int e;
-@@ -257,7 +257,7 @@ check_usb_interface(libusb_interface *in
- return -1;
- }
-
-- libusb_interface_descriptor *idesc = &interface->altsetting[0];
-+ const struct libusb_interface_descriptor *idesc = &interface->altsetting[0];
-
- if (idesc->bNumEndpoints != 2) {
- D("check_usb_interface(): Interface have not 2 endpoints, ignoring\n");
-@@ -265,7 +265,7 @@ check_usb_interface(libusb_interface *in
- }
-
- for (e = 0; e < idesc->bNumEndpoints; e++) {
-- libusb_endpoint_descriptor *edesc = &idesc->endpoint[e];
-+ const struct libusb_endpoint_descriptor *edesc = &idesc->endpoint[e];
-
- if (edesc->bmAttributes != LIBUSB_TRANSFER_TYPE_BULK) {
- D("check_usb_interface(): Endpoint (%u) is not bulk (%u), ignoring\n",
-@@ -304,8 +304,8 @@ check_usb_interface(libusb_interface *in
- }
-
- int
--check_usb_interfaces(libusb_config_descriptor *config,
-- libusb_device_descriptor *desc, struct usb_handle *uh)
-+check_usb_interfaces(struct libusb_config_descriptor *config,
-+ struct libusb_device_descriptor *desc, struct usb_handle *uh)
- {
- int i;
-
-@@ -382,8 +382,8 @@ check_device(libusb_device *dev)
- int found = -1;
- char serial[256] = {0};
-
-- libusb_device_descriptor desc;
-- libusb_config_descriptor *config = NULL;
-+ struct libusb_device_descriptor desc;
-+ struct libusb_config_descriptor *config = NULL;
-
- int r = libusb_get_device_descriptor(dev, &desc);
-
Home |
Main Index |
Thread Index |
Old Index