building with irssi 1.0 fails about irssi-xmpp

[darix]

Patch to fix it:

diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c
index 405ecd9..b6d9bd5 100644
--- a/src/core/xmpp-servers.c
+++ b/src/core/xmpp-servers.c
@@ -151,7 +151,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 +335,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 +470,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;

[darix]

Better patch which should allow building on older irssi versions

diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c
index 405ecd9..edcaeaa 100644
--- a/src/core/xmpp-servers.c
+++ b/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;

[cdidier]

OK, can you make a pull request against the master branch?

[leitu]

it works for me to change the ssl to tls, since irssi 1.0.0 use tls after vulnerabilities

[cdidier]

fixed by 0d9e5f7