Hi, please find below an update to irssi-xmpp. This drops the upstream'ed ABI patch. Slightly tested with the recently committed irssi-1.0.6.
OK? Regards, Joerg Index: Makefile =================================================================== RCS file: /cvs/ports/net/irssi-xmpp/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile 21 Nov 2017 00:13:02 -0000 1.11 +++ Makefile 8 Jan 2018 22:30:59 -0000 @@ -2,8 +2,7 @@ COMMENT= XMPP plugin for irssi -DISTNAME= irssi-xmpp-0.53 -REVISION= 1 +DISTNAME= irssi-xmpp-0.54 CATEGORIES= net Index: distinfo =================================================================== RCS file: /cvs/ports/net/irssi-xmpp/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 18 Mar 2016 19:29:03 -0000 1.3 +++ distinfo 8 Jan 2018 22:30:59 -0000 @@ -1,2 +1,2 @@ -SHA256 (irssi-xmpp-0.53.tar.gz) = ZIc2LSOve5wYXYrHTmtlHml8rMAd6LucdQ2xdSFAU28= -SIZE (irssi-xmpp-0.53.tar.gz) = 65649 +SHA256 (irssi-xmpp-0.54.tar.gz) = EDPMa/A6uqzbCD4fvn112KYmIjOeBtiJQi2PBwX6d3Y= +SIZE (irssi-xmpp-0.54.tar.gz) = 65618 Index: patches/patch-src_core_xmpp-servers_c =================================================================== RCS file: patches/patch-src_core_xmpp-servers_c diff -N patches/patch-src_core_xmpp-servers_c --- patches/patch-src_core_xmpp-servers_c 7 Jun 2017 21:58:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,46 +0,0 @@ -$OpenBSD: patch-src_core_xmpp-servers_c,v 1.1 2017/06/07 21:58:16 sthen Exp $ - -https://github.com/cdidier/irssi-xmpp/commit/0d9e5f7f1a0edaea0de312828ce47d11f74ee3dc - -Index: src/core/xmpp-servers.c ---- src/core/xmpp-servers.c.orig -+++ src/core/xmpp-servers.c -@@ -32,6 +32,11 @@ - #include "rosters-tools.h" - #include "tools.h" - -+/* IRSSI_ABI_VERSION was introduced in 0.8.18 */ -+#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6 -+# define use_tls use_ssl -+#endif -+ - static void - channels_join(SERVER_REC *server, const char *data, int automatic) - { -@@ -151,7 +156,7 @@ xmpp_server_init_connect(SERVER_CONNECT_REC *connrec) - server->connect_pid = -1; - - if (server->connrec->port <= 0) -- server->connrec->port = (server->connrec->use_ssl) ? -+ server->connrec->port = (server->connrec->use_tls) ? - LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT; - - if (conn->real_jid == NULL) -@@ -335,7 +340,7 @@ lm_open_cb(LmConnection *connection, gboolean success, - g_free(host); - } else - signal_emit("server connecting", 1, server); -- if (server->connrec->use_ssl) -+ if (server->connrec->use_tls) - signal_emit("xmpp server status", 2, server, - "Using SSL encryption."); - else if (lm_ssl_get_use_starttls(lm_connection_get_ssl(server->lmconn))) -@@ -470,7 +475,7 @@ xmpp_server_connect(XMPP_SERVER_REC *server) - return; - error = NULL; - err_msg = NULL; -- if (server->connrec->use_ssl) { -+ if (server->connrec->use_tls) { - if (!set_ssl(server->lmconn, &error, server, FALSE)) { - err_msg = "Cannot init ssl"; - goto err;
