Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:brltty
User: [email protected]
Usertags: pu

Hello,

I have uploaded brltty 6.7-3.1+deb13u5 for trixie.

[ Reason ]
This is actually a follow-up for 6.7-3.1+deb13u4 supposed to fix
Bug#1087173

It was reported in Bug#1087173 that in some network configuration cases
(ipv6 packets getting dropped instead of ipv6 being disabled), the mere
presence of the xbrlapi package makes X sessions startup get stuck for
two minutes. The underlying issue is that xbrlapi tries to connect to
an existing brltty through localhost, but in that configuration case,
the connect() call waits for 2m before timing out instead of immediately
returning ECONNREFUSED.

6.7-3.1+deb13u4 was supposed to fix it, but it was apparently
mis-tested... 6.7-3.1+deb13u5 fixes the 6.7-3.1+deb13u4 fix, as
discussed in Bug#1153378

[ Impact ]
Some people report this long login delay. They have to remove the
xbrlapi package to avoid the issue.

[ Tests ]
This was tested manually.

[ Risks ]
The code is very simple.

[ Checklist ]
  [X] *all* changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in (old)stable
  [X] the issue is verified as fixed in unstable

[ Changes ]
This fixes the adresse within struct sockaddr_in6 to get the address to
be compared
diff -Nru brltty-6.7/debian/changelog brltty-6.7/debian/changelog
--- brltty-6.7/debian/changelog 2026-09-19 14:27:54.000000000 +0200
+++ brltty-6.7/debian/changelog 2026-11-14 21:59:38.000000000 +0100
@@ -1,3 +1,10 @@
+brltty (6.7-3.1+deb13u5) trixie; urgency=medium
+
+  * patches/git-localhost-timeout2: Fix connections to localhost for IPv6
+    (Closes: Bug#1153378)
+
+ -- Samuel Thibault <[email protected]>  Sat, 14 Nov 2026 21:59:38 +0100
+
 brltty (6.7-3.1+deb13u4) trixie; urgency=medium
 
   * patches/git-localhost-timeout: Make connections to localhost timeout after
diff -Nru brltty-6.7/debian/patches/git-localhost-timeout2 
brltty-6.7/debian/patches/git-localhost-timeout2
--- brltty-6.7/debian/patches/git-localhost-timeout2    1970-01-01 
01:00:00.000000000 +0100
+++ brltty-6.7/debian/patches/git-localhost-timeout2    2026-11-14 
21:59:38.000000000 +0100
@@ -0,0 +1,23 @@
+commit b3c93ca73cf82558c9a0735c8b525af58861aee7
+Author: Komorebi Aware <[email protected]>
+Date:   Sat Nov 7 21:48:45 2026 +0100
+
+    Compare the IPv6 address field when applying the localhost timeout
+    
+    The existing guard compares the sockaddr_in6 header to an in6_addr, so it
+    does not recognize ::1 and never sets the short timeout for IPv6 loopback.
+    Compare sin6_addr instead, preserving the IPv4 test and the existing 
timeout.
+
+diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c
+index e0dca7ee8..b9745dac5 100644
+--- a/Programs/brlapi_client.c
++++ b/Programs/brlapi_client.c
+@@ -935,7 +935,7 @@ static int tryHost(brlapi_handle_t *handle, const char 
*hostAndPort) {
+           && (ntohl(((struct sockaddr_in *)cur->ai_addr)->sin_addr.s_addr) & 
IN_CLASSA_NET)
+             == (INADDR_LOOPBACK & IN_CLASSA_NET))
+         || (cur->ai_family == AF_INET6
+-          && !memcmp(cur->ai_addr, &ip6_localhost, sizeof(ip6_localhost)))) {
++          && !memcmp(&((struct sockaddr_in6 *)cur->ai_addr)->sin6_addr, 
&ip6_localhost, sizeof(ip6_localhost)))) {
+       /* Local connection, it should be fast, otherwise it means we have a
+        * firewall blocking us, and then better not wait unnecessarily. */
+       struct timeval tv = { .tv_usec = 100000 };
diff -Nru brltty-6.7/debian/patches/series brltty-6.7/debian/patches/series
--- brltty-6.7/debian/patches/series    2026-09-19 14:27:29.000000000 +0200
+++ brltty-6.7/debian/patches/series    2026-11-14 21:59:38.000000000 +0100
@@ -9,3 +9,4 @@
 noverbose-usbfs
 systemd-vtnr
 git-localhost-timeout
+git-localhost-timeout2

Reply via email to