[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#980799: buster-pu: package irssi-plugin-xmpp/0.54-3



Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

As explained in #931886 / upstream at
https://github.com/cdidier/irssi-xmpp/issues/43, due to recent changes
in irssi, irssi-plugin-xmpp in buster is unable to establish STARTTLS
connections because the connect timeout triggers prematurely.

This update contains a one-line patch that allows the intended
connection timeout to take effect.

I have verified that this bug is present in the version of
irssi-plugin-xmpp in buster and fixed by this proposed update. A
corresponding fix has just been uploaded to unstable as part of
irssi-plugin-xmpp 0.54+git20191101+c13fa5-1.

As I think the change is rather trivial and low-risk, I take the liberty
to upload to buster-pu right away. Debdiff below.

Florian


diff -Nru irssi-plugin-xmpp-0.54/debian/changelog irssi-plugin-xmpp-0.54/debian/changelog
--- irssi-plugin-xmpp-0.54/debian/changelog	2019-03-27 19:57:14.000000000 +0800
+++ irssi-plugin-xmpp-0.54/debian/changelog	2021-01-22 21:53:27.000000000 +0800
@@ -1,3 +1,11 @@
+irssi-plugin-xmpp (0.54-3+deb10u1) buster; urgency=medium
+
+  * Cherry-pick bug931886.patch from upstream to not trigger the irssi core
+    connect timeout prematurely, thus fixing STARTTLS connections
+    (closes: #931886)
+
+ -- Florian Schlichting <fsfs@debian.org>  Fri, 22 Jan 2021 21:53:27 +0800
+
 irssi-plugin-xmpp (0.54-3) unstable; urgency=medium
 
   * drop -dbg→-dbgsym transition (no longer needed)
diff -Nru irssi-plugin-xmpp-0.54/debian/patches/bug931886.patch irssi-plugin-xmpp-0.54/debian/patches/bug931886.patch
--- irssi-plugin-xmpp-0.54/debian/patches/bug931886.patch	1970-01-01 08:00:00.000000000 +0800
+++ irssi-plugin-xmpp-0.54/debian/patches/bug931886.patch	2021-01-22 21:53:06.000000000 +0800
@@ -0,0 +1,16 @@
+commit 57c62278b97aeb999f3ca2e2b8a492f364405b61
+Author: Ailin Nemui <ailin@z30a.localdomain>
+Date:   Tue Jan 29 21:37:05 2019 +0100
+
+    do not trigger the irssi core connect timeout prematurely
+
+--- a/src/core/xmpp-servers.c
++++ b/src/core/xmpp-servers.c
+@@ -528,6 +528,7 @@
+ 	}
+ 	lm_connection_set_disconnect_function(server->lmconn,
+ 	    lm_close_cb, server, NULL);
++	server->connect_time = time(NULL);
+ 	lookup_servers = g_slist_append(lookup_servers, server);
+ 	signal_emit("server looking", 1, server);
+ 	server->timeout_tag = g_timeout_add(
diff -Nru irssi-plugin-xmpp-0.54/debian/patches/series irssi-plugin-xmpp-0.54/debian/patches/series
--- irssi-plugin-xmpp-0.54/debian/patches/series	2019-03-27 19:57:14.000000000 +0800
+++ irssi-plugin-xmpp-0.54/debian/patches/series	2021-01-22 21:52:47.000000000 +0800
@@ -42,3 +42,4 @@
 ailin-nemui-0008-Add-support-for-messages-coming-directly-from-room.patch
 ailin-nemui-0009-Add-support-for-mode-change-in-MUC.patch
 comparison-between-pointer-and-zero-character-constant.patch
+bug931886.patch

Reply to: