Laszlo,
I have just uploaded 4.2.2+git20130529-2.2 which contains the last
version of my patch to DELAYED/5. Feel free to delay, cancel, or move
forward the package.
The debdiff between 4.2.2+git20130529-2.1 and 4.2.2+git20130529-2.2 is
attached.
Cheers,
-Hilko
diff -Nru android-tools-4.2.2+git20130529/debian/changelog android-tools-4.2.2+git20130529/debian/changelog
--- android-tools-4.2.2+git20130529/debian/changelog 2013-07-04 23:29:24.000000000 +0200
+++ android-tools-4.2.2+git20130529/debian/changelog 2013-07-19 23:29:17.000000000 +0200
@@ -1,3 +1,10 @@
+android-tools (4.2.2+git20130529-2.2) unstable; urgency=low
+
+ * Non-maintainer upload, sorry for breaking adb in -2.1.
+ * Fix previous local socket patch for adb (Closes: #715238, #716996)
+
+ -- Hilko Bengen <ben...@debian.org> Fri, 19 Jul 2013 23:28:37 +0200
+
android-tools (4.2.2+git20130529-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru android-tools-4.2.2+git20130529/debian/patches/use-local-socket.patch android-tools-4.2.2+git20130529/debian/patches/use-local-socket.patch
--- android-tools-4.2.2+git20130529/debian/patches/use-local-socket.patch 2013-07-04 23:27:52.000000000 +0200
+++ android-tools-4.2.2+git20130529/debian/patches/use-local-socket.patch 2013-07-19 23:26:26.000000000 +0200
@@ -1,13 +1,61 @@
-Index: android-tools-4.2.2+git20130529/core/adb/adb.c
+Subject: adb: Use local sockets where appropriate
+Author: Hilko Bengen <ben...@debian.org>
+
+Index: android-tools/core/adb/adb.c
===================================================================
---- android-tools-4.2.2+git20130529.orig/core/adb/adb.c 2013-07-04 23:25:41.000000000 +0200
-+++ android-tools-4.2.2+git20130529/core/adb/adb.c 2013-07-04 23:27:45.222822648 +0200
-@@ -1154,7 +1154,7 @@
+--- android-tools.orig/core/adb/adb.c 2013-07-19 23:26:22.408974096 +0200
++++ android-tools/core/adb/adb.c 2013-07-19 23:26:22.396974391 +0200
+@@ -1154,7 +1154,11 @@
*/
void build_local_name(char* target_str, size_t target_size, int server_port)
{
- snprintf(target_str, target_size, "tcp:%d", server_port);
-+ snprintf(target_str, target_size, "local:%d", server_port);
++ if (gListenAll > 0) {
++ snprintf(target_str, target_size, "tcp:%d", server_port);
++ } else {
++ snprintf(target_str, target_size, "local:%d", server_port);
++ }
}
#if !ADB_HOST
+Index: android-tools/core/adb/adb_client.c
+===================================================================
+--- android-tools.orig/core/adb/adb_client.c 2013-07-19 23:26:22.408974096 +0200
++++ android-tools/core/adb/adb_client.c 2013-07-19 23:26:22.396974391 +0200
+@@ -185,12 +185,12 @@
+ strcpy(__adb_error, "service name too long");
+ return -1;
+ }
+- snprintf(tmp, sizeof tmp, "%04x", len);
++ snprintf(tmp, sizeof tmp, "%d", __adb_server_port);
+
+ if (__adb_server_name)
+ fd = socket_network_client(__adb_server_name, __adb_server_port, SOCK_STREAM);
+ else
+- fd = socket_loopback_client(__adb_server_port, SOCK_STREAM);
++ fd = socket_local_client(tmp, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
+
+ if(fd < 0) {
+ strcpy(__adb_error, "cannot connect to daemon");
+@@ -201,6 +201,7 @@
+ return -1;
+ }
+
++ snprintf(tmp, sizeof tmp, "%04x", len);
+ if(writex(fd, tmp, 4) || writex(fd, service, len)) {
+ strcpy(__adb_error, "write failure during connection");
+ adb_close(fd);
+Index: android-tools/core/adb/transport_local.c
+===================================================================
+--- android-tools.orig/core/adb/transport_local.c 2013-07-19 23:26:22.408974096 +0200
++++ android-tools/core/adb/transport_local.c 2013-07-19 23:26:22.400974292 +0200
+@@ -118,7 +118,8 @@
+ }
+ #endif
+ if (fd < 0) {
+- fd = socket_loopback_client(adb_port, SOCK_STREAM);
++ snprintf(buf, sizeof buf, "%d", adb_port);
++ fd = socket_local_client(buf, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
+ }
+
+ if (fd >= 0) {
