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

Bug#854491: unblock: irssi-plugin-robustirc/0.6-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package irssi-plugin-robustirc

The new package builds correctly on all release architectures:
https://buildd.debian.org/status/package.php?p=irssi-plugin-robustirc&suite=unstable

justification: the fix is cherry-picked from upstream, quite a short and
simple patch, and fixes an annoying bug (which was discovered too late
to get it fixed before the freeze). Thanks!

debian bug numbers: #854434 (severity normal)

source debdiff:
$ debdiff irssi-plugin-robustirc_0.6-2.dsc irssi-plugin-robustirc_0.6-3.dsc
diff -Nru irssi-plugin-robustirc-0.6/debian/changelog irssi-plugin-robustirc-0.6/debian/changelog
--- irssi-plugin-robustirc-0.6/debian/changelog	2017-01-02 17:44:42.000000000 +0100
+++ irssi-plugin-robustirc-0.6/debian/changelog	2017-02-07 08:54:49.000000000 +0100
@@ -1,3 +1,11 @@
+irssi-plugin-robustirc (0.6-3) unstable; urgency=medium
+
+  * debian/patches/uint64.diff: ensure last_id_id and last_id_reply are 64-bit
+    (fixes duplicate messages showing up when network connection is
+    interrupted) (closes: #854434)
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Tue, 07 Feb 2017 08:54:49 +0100
+
 irssi-plugin-robustirc (0.6-2) unstable; urgency=medium
 
   * install README.md as documentation (closes: #849755)
diff -Nru irssi-plugin-robustirc-0.6/debian/patches/series irssi-plugin-robustirc-0.6/debian/patches/series
--- irssi-plugin-robustirc-0.6/debian/patches/series	2017-01-02 17:44:42.000000000 +0100
+++ irssi-plugin-robustirc-0.6/debian/patches/series	2017-02-07 08:54:49.000000000 +0100
@@ -1 +1,2 @@
 cmake.diff
+uint64.diff
diff -Nru irssi-plugin-robustirc-0.6/debian/patches/uint64.diff irssi-plugin-robustirc-0.6/debian/patches/uint64.diff
--- irssi-plugin-robustirc-0.6/debian/patches/uint64.diff	1970-01-01 01:00:00.000000000 +0100
+++ irssi-plugin-robustirc-0.6/debian/patches/uint64.diff	2017-02-07 08:54:49.000000000 +0100
@@ -0,0 +1,53 @@
+Description: bugfix: ensure last_id_id and last_id_reply are 64-bit
+Author: Michael Stapelberg <stapelberg@debian.org>
+Origin: upstream, https://github.com/robustirc/irssi-robustirc/commit/a4244f9a72f583cdb7e6b85db60d861d1ccf5999
+Forwarded: not-needed
+Last-Update: 2017-02-17
+
+---
+
+diff --git a/src/core/robustsession/robustsession.c b/src/core/robustsession/robustsession.c
+index 0a9481a..2c771db 100644
+--- a/src/core/robustsession/robustsession.c
++++ b/src/core/robustsession/robustsession.c
+@@ -6,6 +6,8 @@
+ #include <stdio.h>
+ #include <stdbool.h>
+ #include <assert.h>
++#include <stdint.h>
++#include <inttypes.h>
+ 
+ // external library includes
+ #include <curl/curl.h>
+@@ -88,8 +90,8 @@ struct t_robustirc_request {
+     char *data;
+     bool parsing_id;
+     bool parsing_servers;
+-    long last_id_id;
+-    long last_id_reply;
++    uint64_t last_id_id;
++    uint64_t last_id_reply;
+     long last_type;
+     int depth;
+     GList *servers;
+@@ -156,9 +158,9 @@ static int gm_json_integer(void *ctx, long long val) {
+     }
+     if (request->parsing_id) {
+         if (strcasecmp(request->last_key, "id") == 0) {
+-            request->last_id_id = val;
++            request->last_id_id = (uint64_t)val;
+         } else if (strcasecmp(request->last_key, "reply") == 0) {
+-            request->last_id_reply = val;
++            request->last_id_reply = (uint64_t)val;
+         }
+     }
+     if (strcasecmp(request->last_key, "type") == 0) {
+@@ -225,7 +227,7 @@ static int gm_json_end_map(void *ctx) {
+         request->data = NULL;
+         free(request->ctx->lastseen);
+         request->ctx->lastseen = g_strdup_printf(
+-            "%ld.%ld",
++            PRIu64 "." PRIu64,
+             request->last_id_id,
+             request->last_id_reply);
+     }

unblock irssi-plugin-robustirc/0.6-3

-- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armel, mipsel

Kernel: Linux 4.9.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)


Reply to: