On Sun, Mar 06, 2016 at 01:48:41PM +0000, Stuart Henderson wrote: > This is due to needing a version check adding, I've committed the fix > for this to irssi-icb; the other modules will need similar. Mentioned > offlist but irssi-otr has https://github.com/cryptodotis/irssi-otr/pull/60, > if maintainers of any other modules would like to look for similar or > write it themselves that'd be nice :) >
Upstream is AWOL so a patch is attached. Can be removed if upstream merges and releases a new version. > There is another problem which affects at least irssi-otr and irssi-icb > (and I suspect the others too), sending yourself a message fails like this > (this is mentioned in https://github.com/cryptodotis/irssi-otr/pull/58) > > 13:44 -!- Irssi: critical privmsg_get_query: assertion 'nick != NULL' failed > 13:44 -!- Irssi: critical query_find: assertion 'nick != NULL' failed > 13:44 [msg()] test > This is also fixed in the patch below for irssi-otr. Also +1 for the irssi patch. Regards, Florian Index: Makefile =================================================================== RCS file: /cvs/ports/net/irssi-otr/Makefile,v retrieving revision 1.5 diff -u -p -u -r1.5 Makefile --- Makefile 29 Dec 2015 22:45:48 -0000 1.5 +++ Makefile 12 Mar 2016 18:16:13 -0000 @@ -5,7 +5,7 @@ SHARED_ONLY = Yes COMMENT = OTR (off the record) encryption support for irssi V = 1.0.1 -REVISION = 0 +REVISION = 1 DISTNAME = irssi-otr-$V CATEGORIES = net security Index: patches/patch-src_module_c =================================================================== RCS file: patches/patch-src_module_c diff -N patches/patch-src_module_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_module_c 12 Mar 2016 18:16:13 -0000 @@ -0,0 +1,51 @@ +$OpenBSD$ +--- src/module.c.orig Mon Sep 29 22:11:07 2014 ++++ src/module.c Sat Mar 12 19:03:22 2016 +@@ -32,6 +32,7 @@ + #include "otr.h" + #include "otr-formats.h" + #include "utils.h" ++#include "irssi-version.h" + + GCRY_THREAD_OPTION_PTHREAD_IMPL; + +@@ -90,8 +91,13 @@ end: + /* + * Pipes all incoming private messages through OTR + */ ++#if IRSSI_VERSION_DATE > 20141206 + void sig_message_private(SERVER_REC *server, const char *msg, ++ const char *nick, const char *address, const char *target) ++#else ++void sig_message_private(SERVER_REC *server, const char *msg, + const char *nick, const char *address) ++#endif + { + int ret; + char *new_msg = NULL; +@@ -106,7 +112,11 @@ void sig_message_private(SERVER_REC *server, const cha + + if (!new_msg) { + /* This message was not OTR */ ++#if IRSSI_VERSION_DATE > 20141206 ++ signal_continue(5, server, msg, nick, address, target); ++#else + signal_continue(4, server, msg, nick, address); ++#endif + } else { + /* + * Check for /me IRC marker and if so, handle it so the user does not +@@ -371,3 +381,13 @@ void otr_deinit(void) + + theme_unregister(); + } ++ ++#ifdef IRSSI_ABI_VERSION ++/* ++ * irssi abicheck() ++ */ ++void otr_abicheck(int *version) ++{ ++ *version = IRSSI_ABI_VERSION; ++} ++#endif
