diff options
| author | brnrd <brnrd@FreeBSD.org> | 2017-04-21 02:57:34 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2017-04-21 02:57:34 +0800 |
| commit | c049ce04f21b65e409e47ed56241143432e5a3b7 (patch) | |
| tree | 709005936c19d0bcb203e04379ba89743abc009a /irc/irssi-xmpp | |
| parent | ec5061555b3cd56850e1a09c45cc1ca3c213c1ca (diff) | |
| download | freebsd-ports-gnome-c049ce04f21b65e409e47ed56241143432e5a3b7.tar.gz freebsd-ports-gnome-c049ce04f21b65e409e47ed56241143432e5a3b7.tar.zst freebsd-ports-gnome-c049ce04f21b65e409e47ed56241143432e5a3b7.zip | |
irc/irssi-xmpp: Fix build with irssi 1.0
- Add patch from upstream
PR: 217916, 218328
Submitted by: Thibault Jouan <tj+freebsd_ports@a13.fr>
Approved by: maintainer timeout
Obtained from: https://github.com/cdidier/irssi-xmpp/issues/18
Diffstat (limited to 'irc/irssi-xmpp')
| -rw-r--r-- | irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c b/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c new file mode 100644 index 000000000000..c53ebe4d69a6 --- /dev/null +++ b/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c @@ -0,0 +1,57 @@ +From 0d9e5f7f1a0edaea0de312828ce47d11f74ee3dc Mon Sep 17 00:00:00 2001 +From: benaryorg <binary@benary.org> +Date: Fri, 20 Jan 2017 06:31:28 +0100 +Subject: [PATCH] fix build with irssi 1.0 + +use_ssl field of SERVER_CONNECT_REC has been renamed to use_tls. + +Original patch from darix. + +Signed-off-by: benaryorg <binary@benary.org> +--- + src/core/xmpp-servers.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c +index 405ecd9..8d0b62d 100644 +--- 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; |