Bug#988458: unblock: erlang-p1-xmpp/1.5.2-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package erlang-p1-xmpp.
The package's patch series was extended with the change from
https://github.com/processone/xmpp/commit/0de31e95078e744b1faeafb314a469bbd0f444ef
as-is by downloading
https://github.com/processone/xmpp/commit/0de31e95078e744b1faeafb314a469bbd0f444ef.patch
[ Reason ]
Targeted bugfix that greatly improves stability + reliability of
ejabberd in testing, closing important bug #988115.
[ Impact ]
Admins see crashes in ejabberd's logs and some users experience weird
behaviour (like receiving the same room invitation again and again,
even after accepting or refusing the invitation).
[ Tests ]
Automated unit tests at build time, manual tests by me and the submitter of
#988115. The change has been committed upstream and will be part of future
releases.
[ Risks ]
Close to zero - a trivial 1-line change in the upstream source fixes the
return value when skipping queued tcp packets to already closed sockets.
[ 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 testing
[ Other info ]
None.
unblock erlang-p1-xmpp/1.5.2-3
diff -Nru erlang-p1-xmpp-1.5.2/debian/changelog erlang-p1-xmpp-1.5.2/debian/changelog
--- erlang-p1-xmpp-1.5.2/debian/changelog 2021-01-31 19:43:57.000000000 +0100
+++ erlang-p1-xmpp-1.5.2/debian/changelog 2021-05-13 12:35:16.000000000 +0200
@@ -1,3 +1,10 @@
+erlang-p1-xmpp (1.5.2-3) unstable; urgency=medium
+
+ * Added upstream patch to fix random crashes and weird behaviour with
+ ejabberd 21.01 (Closes: #988115)
+
+ -- Philipp Huebner <debalance@debian.org> Thu, 13 May 2021 12:35:16 +0200
+
erlang-p1-xmpp (1.5.2-2) unstable; urgency=medium
* Corrected Multi-Arch setting to "allowed"
diff -Nru erlang-p1-xmpp-1.5.2/debian/patches/0de31e95078e744b1faeafb314a469bbd0f444ef.patch erlang-p1-xmpp-1.5.2/debian/patches/0de31e95078e744b1faeafb314a469bbd0f444ef.patch
--- erlang-p1-xmpp-1.5.2/debian/patches/0de31e95078e744b1faeafb314a469bbd0f444ef.patch 1970-01-01 01:00:00.000000000 +0100
+++ erlang-p1-xmpp-1.5.2/debian/patches/0de31e95078e744b1faeafb314a469bbd0f444ef.patch 2021-05-13 10:58:50.000000000 +0200
@@ -0,0 +1,24 @@
+From 0de31e95078e744b1faeafb314a469bbd0f444ef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
+Date: Wed, 10 Feb 2021 10:04:56 +0100
+Subject: [PATCH] Fix return value when skipping queued tcp packet to already
+ closed socket
+
+This should fix ejabberd#3524
+---
+ src/xmpp_stream_in.erl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xmpp_stream_in.erl b/src/xmpp_stream_in.erl
+index f1a3330..1a4bb5a 100644
+--- a/src/xmpp_stream_in.erl
++++ b/src/xmpp_stream_in.erl
+@@ -447,7 +447,7 @@ handle_info({tcp, _, Data}, #{socket := Socket} = State) ->
+ end);
+ % Skip new tcp messages after socket get removed from state
+ handle_info({tcp, _, _}, State) ->
+- State;
++ noreply(State);
+ handle_info({tcp_closed, _}, State) ->
+ handle_info({'$gen_event', closed}, State);
+ handle_info({tcp_error, _, Reason}, State) ->
diff -Nru erlang-p1-xmpp-1.5.2/debian/patches/series erlang-p1-xmpp-1.5.2/debian/patches/series
--- erlang-p1-xmpp-1.5.2/debian/patches/series 2021-01-31 19:43:57.000000000 +0100
+++ erlang-p1-xmpp-1.5.2/debian/patches/series 2021-05-13 10:59:11.000000000 +0200
@@ -1,3 +1,3 @@
remove-deps.diff
fix-includes.diff
-#disable_cover.diff
+0de31e95078e744b1faeafb314a469bbd0f444ef.patch
Reply to: