On 2016/03/12 19:18, Florian Stinglmayr wrote: > This is also fixed in the patch below for irssi-otr. > > Also +1 for the irssi patch.
irssi-icb, irssi-otr: fixes committed. irssi-xmpp: jung, could you take a look at this please? https://github.com/cdidier/irssi-xmpp adds the ABI check, it looks like it will also be affected by the privmsg-to-self API change. irssi-silc: *UNTESTED* diff inline below. if anyone is still using this, please test in conjunction with the irssi update. Index: Makefile =================================================================== RCS file: /cvs/ports/net/irssi-silc/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- Makefile 6 Jan 2016 17:01:54 -0000 1.34 +++ Makefile 13 Mar 2016 14:59:48 -0000 @@ -5,7 +5,7 @@ SHARED_ONLY= Yes COMMENT= SILC plugin for irssi DISTNAME= irssi-silc-1.1.8 -REVISION= 7 +REVISION= 8 CATEGORIES= net Index: patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c =================================================================== RCS file: /cvs/ports/net/irssi-silc/patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-apps_irssi_src_fe-common_silc_fe-common-silc_c --- patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c 18 Nov 2007 17:36:18 -0000 1.1 +++ patches/patch-apps_irssi_src_fe-common_silc_fe-common-silc_c 13 Mar 2016 14:59:48 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-apps_irssi_src_fe-common_silc_fe-common-silc_c,v 1.1 2007/11/18 17:36:18 martynas Exp $ ---- apps/irssi/src/fe-common/silc/fe-common-silc.c.orig Sun May 20 19:40:29 2007 -+++ apps/irssi/src/fe-common/silc/fe-common-silc.c Wed Nov 14 00:06:11 2007 +--- apps/irssi/src/fe-common/silc/fe-common-silc.c.orig Sat May 23 01:08:57 2009 ++++ apps/irssi/src/fe-common/silc/fe-common-silc.c Sun Mar 13 14:54:45 2016 @@ -42,6 +42,7 @@ static void silc_init(void) fe_silc_messages_init(); fe_silc_queries_init(); @@ -9,3 +9,15 @@ $OpenBSD: patch-apps_irssi_src_fe-common } void fe_common_silc_init(void) +@@ -71,3 +72,11 @@ void fe_silc_deinit(void) + { + fe_common_silc_deinit(); + } ++ ++#ifdef IRSSI_ABI_VERSION ++void ++silc_core_abicheck(int * version) ++{ ++ *version = IRSSI_ABI_VERSION; ++} ++#endif Index: patches/patch-apps_irssi_src_silc_core_client_ops_c =================================================================== RCS file: /cvs/ports/net/irssi-silc/patches/patch-apps_irssi_src_silc_core_client_ops_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-apps_irssi_src_silc_core_client_ops_c --- patches/patch-apps_irssi_src_silc_core_client_ops_c 31 Jul 2010 12:43:25 -0000 1.3 +++ patches/patch-apps_irssi_src_silc_core_client_ops_c 13 Mar 2016 14:59:48 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-apps_irssi_src_silc_core_client_ops_c,v 1.3 2010/07/31 12:43:25 sthen Exp $ ---- apps/irssi/src/silc/core/client_ops.c.orig Fri May 22 20:11:25 2009 -+++ apps/irssi/src/silc/core/client_ops.c Thu Jul 29 22:42:52 2010 +--- apps/irssi/src/silc/core/client_ops.c.orig Sat May 23 01:11:25 2009 ++++ apps/irssi/src/silc/core/client_ops.c Sun Mar 13 14:59:18 2016 @@ -262,10 +262,11 @@ int verify_message_signature(SilcClientEntry sender, sizeof(sender->fingerprint)); if (strcmp(fingerprint, fingerprint2)) { @@ -15,7 +15,39 @@ $OpenBSD: patch-apps_irssi_src_silc_core } silc_free(fingerprint2); } -@@ -1069,6 +1070,8 @@ void silc_notify(SilcClient client, SilcClientConnecti +@@ -663,9 +664,15 @@ void silc_private_message(SilcClient client, SilcClien + sender->nickname[0] ? sender->nickname : "[<unknown>]", + sender->username[0] ? userhost : NULL, verified); + else ++#if IRSSI_VERSION_DATE > 20141206 ++ signal_emit("message private", 5, server, cp, ++ sender->nickname[0] ? sender->nickname : "[<unknown>]", ++ sender->username[0] ? userhost : NULL, server->nick); ++#else + signal_emit("message private", 4, server, cp, + sender->nickname[0] ? sender->nickname : "[<unknown>]", + sender->username[0] ? userhost : NULL); ++#endif + silc_free(dm); + return; + } +@@ -675,9 +682,15 @@ void silc_private_message(SilcClient client, SilcClien + sender->nickname[0] ? sender->nickname : "[<unknown>]", + sender->username[0] ? userhost : NULL, verified); + else ++#if IRSSI_VERSION_DATE > 20141206 ++ signal_emit("message private", 5, server, cp, ++ sender->nickname[0] ? sender->nickname : "[<unknown>]", ++ sender->username[0] ? userhost : NULL, server->nick); ++#else + signal_emit("message private", 4, server, message, + sender->nickname[0] ? sender->nickname : "[<unknown>]", + sender->username[0] ? userhost : NULL); ++#endif + } + } + +@@ -1069,6 +1082,8 @@ void silc_notify(SilcClient client, SilcClientConnecti nick = silc_nicklist_find(chanrec, client_entry2); if (nick != NULL) { @@ -24,7 +56,7 @@ $OpenBSD: patch-apps_irssi_src_silc_core nick->op = (mode & SILC_CHANNEL_UMODE_CHANOP) != 0; nick->founder = (mode & SILC_CHANNEL_UMODE_CHANFO) != 0; signal_emit("nick mode changed", 2, chanrec, nick); -@@ -2790,6 +2793,15 @@ static void silc_get_auth_ask_passphrase(const unsigne +@@ -2790,6 +2805,15 @@ static void silc_get_auth_ask_passphrase(const unsigne silc_free(a); } @@ -40,7 +72,7 @@ $OpenBSD: patch-apps_irssi_src_silc_core /* Find authentication data by hostname and port. The hostname may be IP address as well.*/ -@@ -2811,7 +2823,7 @@ void silc_get_auth_method(SilcClient client, SilcClien +@@ -2811,7 +2835,7 @@ void silc_get_auth_method(SilcClient client, SilcClien /* Check whether we find the password for this server in our configuration. If it's set, always send it server. */ Index: patches/patch-apps_irssi_src_silc_core_silc-core_c =================================================================== RCS file: patches/patch-apps_irssi_src_silc_core_silc-core_c diff -N patches/patch-apps_irssi_src_silc_core_silc-core_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-apps_irssi_src_silc_core_silc-core_c 13 Mar 2016 14:59:48 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ +--- apps/irssi/src/silc/core/silc-core.c.orig Sun Mar 13 14:52:09 2016 ++++ apps/irssi/src/silc/core/silc-core.c Sun Mar 13 14:53:23 2016 +@@ -883,3 +883,11 @@ void silc_core_deinit(void) + silc_pkcs_private_key_free(irssi_privkey); + silc_client_free(silc_client); + } ++ ++#ifdef IRSSI_ABI_VERSION ++void ++silc_core_abicheck(int * version) ++{ ++ *version = IRSSI_ABI_VERSION; ++} ++#endif
