diff options
| author | Steve Wills <swills@FreeBSD.org> | 2019-01-16 13:13:32 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2019-01-16 13:13:32 +0000 |
| commit | 942956250dc726b31b6d0e5558a622e26106efcf (patch) | |
| tree | 223338d4f1e34fc31b0fd3ea625b925c209aa71c | |
| parent | c2caa128877b6faec39a2882ab243b595be24358 (diff) | |
| download | ports-942956250dc726b31b6d0e5558a622e26106efcf.tar.gz ports-942956250dc726b31b6d0e5558a622e26106efcf.zip | |
Notes
| -rw-r--r-- | irc/irssi-xmpp/Makefile | 3 | ||||
| -rw-r--r-- | irc/irssi-xmpp/distinfo | 5 | ||||
| -rw-r--r-- | irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c | 57 |
3 files changed, 4 insertions, 61 deletions
diff --git a/irc/irssi-xmpp/Makefile b/irc/irssi-xmpp/Makefile index 0767e0459f32..d699abd74162 100644 --- a/irc/irssi-xmpp/Makefile +++ b/irc/irssi-xmpp/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= irssi-xmpp -PORTVERSION= 0.53 -PORTREVISION= 3 +PORTVERSION= 0.54 CATEGORIES= irc MASTER_SITES= http://cybione.org/~irssi-xmpp/files/ diff --git a/irc/irssi-xmpp/distinfo b/irc/irssi-xmpp/distinfo index 46b85a410cc0..7dead12f2d6b 100644 --- a/irc/irssi-xmpp/distinfo +++ b/irc/irssi-xmpp/distinfo @@ -1,2 +1,3 @@ -SHA256 (irssi-xmpp-0.53.tar.gz) = 6487362d23af7b9c185d8ac74e6b651e697cacc01de8bb9c750db1752140536f -SIZE (irssi-xmpp-0.53.tar.gz) = 65649 +TIMESTAMP = 1515367493 +SHA256 (irssi-xmpp-0.54.tar.gz) = 1033cc6bf03abaacdb083e1fbe7d75d8a62622339e06d889422d8f0705fa7776 +SIZE (irssi-xmpp-0.54.tar.gz) = 65618 diff --git a/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c b/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c deleted file mode 100644 index c53ebe4d69a6..000000000000 --- a/irc/irssi-xmpp/files/patch-src_core_xmpp-servers.c +++ /dev/null @@ -1,57 +0,0 @@ -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; |