CVS commit: pkgsrc/chat/irssi-xmpp

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Jan  5 17:15:46 UTC 2017

Modified Files:
        pkgsrc/chat/irssi-xmpp: Makefile distinfo
Added Files:
        pkgsrc/chat/irssi-xmpp/patches: patch-src_core_xmpp-servers.c

Log Message:
irssi-xmpp: catch up with irssi 1.0.0.

thanks leot for testing!


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/chat/irssi-xmpp/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/chat/irssi-xmpp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/chat/irssi-xmpp/patches/patch-src_core_xmpp-servers.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/irssi-xmpp/Makefile
diff -u pkgsrc/chat/irssi-xmpp/Makefile:1.11 pkgsrc/chat/irssi-xmpp/Makefile:1.12
--- pkgsrc/chat/irssi-xmpp/Makefile:1.11        Thu Jan  5 15:49:46 2017
+++ pkgsrc/chat/irssi-xmpp/Makefile     Thu Jan  5 17:15:46 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2017/01/05 15:49:46 maya Exp $
+# $NetBSD: Makefile,v 1.12 2017/01/05 17:15:46 maya Exp $
 #
 
 DISTNAME=      irssi-xmpp-0.53
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    chat
 MASTER_SITES=  http://cybione.org/~irssi-xmpp/files/
 DISTFILES=     ${DISTNAME}.tar.gz ${IRSSI_DISTFILE}

Index: pkgsrc/chat/irssi-xmpp/distinfo
diff -u pkgsrc/chat/irssi-xmpp/distinfo:1.7 pkgsrc/chat/irssi-xmpp/distinfo:1.8
--- pkgsrc/chat/irssi-xmpp/distinfo:1.7 Thu Jan  5 15:49:46 2017
+++ pkgsrc/chat/irssi-xmpp/distinfo     Thu Jan  5 17:15:46 2017
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.7 2017/01/05 15:49:46 maya Exp $
+$NetBSD: distinfo,v 1.8 2017/01/05 17:15:46 maya Exp $
 
-SHA1 (irssi-0.8.21.tar.gz) = dfe26d217f2abab50d8e9f02202e948bd2943c0f
-RMD160 (irssi-0.8.21.tar.gz) = 700bb4750a1c0ae923fcd46707a3da608e562bd9
-SHA512 (irssi-0.8.21.tar.gz) = 46ebee8c86cd4ae1006174b5b987207d23cf46bff0f9759ee069a4f7546f7560fdeab598cb455318cb01c976d72d6cb304de13bf9a9e7f295546b8e75cbe0ac5
-Size (irssi-0.8.21.tar.gz) = 1566527 bytes
+SHA1 (irssi-1.0.0.tar.gz) = 452a3d84b3297d6200d0cec8c24a26cb763787ae
+RMD160 (irssi-1.0.0.tar.gz) = 6dda62a397220f767103cd5663c0e5f258eb5a06
+SHA512 (irssi-1.0.0.tar.gz) = 8412165c6527972fe1298cc26dc29adf2b2ee8146a86e8bde72af1e43c806320123b8b4a16f44121906e7b19c118ad36b4102ce3b2404f793160a93d7a4566e3
+Size (irssi-1.0.0.tar.gz) = 1590031 bytes
 SHA1 (irssi-xmpp-0.53.tar.gz) = 57d993bbebc30c72b500e2c4b4c4e79c15d8b6f9
 RMD160 (irssi-xmpp-0.53.tar.gz) = ed65af7220834f7fb6701612e81c6a523f730b06
 SHA512 (irssi-xmpp-0.53.tar.gz) = 09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be
 Size (irssi-xmpp-0.53.tar.gz) = 65649 bytes
+SHA1 (patch-src_core_xmpp-servers.c) = a07b88b7ca63ca3d7b1c742ee49315f681f9c5ef

Added files:

Index: pkgsrc/chat/irssi-xmpp/patches/patch-src_core_xmpp-servers.c
diff -u /dev/null pkgsrc/chat/irssi-xmpp/patches/patch-src_core_xmpp-servers.c:1.1
--- /dev/null   Thu Jan  5 17:15:46 2017
+++ pkgsrc/chat/irssi-xmpp/patches/patch-src_core_xmpp-servers.c        Thu Jan  5 17:15:46 2017
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_core_xmpp-servers.c,v 1.1 2017/01/05 17:15:46 maya Exp $
+
+use_ssl renamed to use_tls in irssi 1.0.0
+
+--- src/core/xmpp-servers.c.orig       2016-03-18 14:07:32.000000000 +0000
++++ src/core/xmpp-servers.c
+@@ -151,7 +151,7 @@ xmpp_server_init_connect(SERVER_CONNECT_
+       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, gbo
+               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 *ser
+               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;