irssi: update to 1.1.1

irssi-{xmpp,icb}: catch up with distinfo file.

1.1.1:
	Restore compatibility with OpenSSL < 1.0.2 (#820, #831)
	Fix test compilation on some platforms (#815, #816)
	Fix portability and backwards compatibility of test runner (#818, #845)

Also contains all changes from 1.0.7:
	Prevent use after free error during the execution of some commands. Found by Joseph Bisch (GL#17, GL!24).
	Revert netsplit print optimisation due to crashes (#465, #809, #812, #819, #824).
	Fix use after free when SASL messages are received in unexpected order (GL#26, GL!33).
	Fix null pointer dereference in the tab completion when an empty nick is joined (GL#24, GL!31).
	Fix use after free when entering oper password (GL#22, GL!32).
	Fix null pointer dereference when too many windows are opened (GL#27, #837).
	Fix out of bounds access in theme strings when the last escape is incomplete. Credit to Oss-Fuzz (#842).
	Fix out of bounds write when using negative counts on window resize (GL#25, GL#29, #836).
	Minor help correction. By William Jackson (#834).

5 files changed, 9 insertions, 27 deletions

diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index 7ce6a53b20c..4c448f7f055 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2018/02/06 10:06:34 maya Exp $
+# $NetBSD: Makefile,v 1.87 2018/02/15 21:27:11 maya Exp $
 
 DISTNAME=		${IRSSI_DISTNAME}
 CATEGORIES=		chat
 EXTRACT_SUFX=		${IRSSI_EXTRACT_SUFX}
-PKGREVISION=		1
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.irssi.org/
diff --git a/chat/irssi/Makefile.common b/chat/irssi/Makefile.common
index e5c9df497e2..db8db87c996 100644
--- a/chat/irssi/Makefile.common
+++ b/chat/irssi/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.27 2018/01/16 07:18:45 maya Exp $
+# $NetBSD: Makefile.common,v 1.28 2018/02/15 21:27:11 maya Exp $
 #
 # used by chat/irssi-icb/Makefile
 # used by chat/irssi-xmpp/Makefile
 
 # Specific distribution information.
-IRSSI_VERSION=			1.1.0
+IRSSI_VERSION=			1.1.1
 IRSSI_DISTNAME=			irssi-${IRSSI_VERSION}
 IRSSI_EXTRACT_SUFX=		.tar.gz
 IRSSI_DISTFILE=			${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX}
diff --git a/chat/irssi/distinfo b/chat/irssi/distinfo
index d3d38b52772..24e9bfb9ae4 100644
--- a/chat/irssi/distinfo
+++ b/chat/irssi/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.46 2018/01/16 07:18:45 maya Exp $
+$NetBSD: distinfo,v 1.47 2018/02/15 21:27:11 maya Exp $
 
-SHA1 (irssi-1.1.0.tar.gz) = 3098ece751d9174142d1ec768a51a37859e59a2c
-RMD160 (irssi-1.1.0.tar.gz) = 45f08e3ecb5557559d45005528e4cd441304df7c
-SHA512 (irssi-1.1.0.tar.gz) = 6ec171dca86817f0832a77ea721ea3cb84157664512e073980ed08f81671293e4bcee7cf3b32006891f27c439b75f679b6b7c54c45b1e6a45f8bdb971ee27cdf
-Size (irssi-1.1.0.tar.gz) = 1705125 bytes
+SHA1 (irssi-1.1.1.tar.gz) = 1e4a7f01a6a1fb56b537ae5575f335291cb86b48
+RMD160 (irssi-1.1.1.tar.gz) = 3345e431cc5dd10c995c69839eacafe3c6ba4812
+SHA512 (irssi-1.1.1.tar.gz) = a8322872881e9cf372faf73326943750804efbf02ca24c0db05f8996a07801d7ac1bae127637fa67a0a923f31de26ccee817bc36b30ee1dafa816d19862e4925
+Size (irssi-1.1.1.tar.gz) = 1708603 bytes
 SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7
-SHA1 (patch-build-aux_test-driver) = 4d055e510098dcdc499e19a426eb3a85fdef56c8
diff --git a/chat/irssi/options.mk b/chat/irssi/options.mk
index 2bd681830eb..b28ac1c80ef 100644
--- a/chat/irssi/options.mk
+++ b/chat/irssi/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2018/02/06 10:06:34 maya Exp $
+# $NetBSD: options.mk,v 1.20 2018/02/15 21:27:11 maya Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.irssi
 PKG_SUPPORTED_OPTIONS=		ssl perl truecolor
@@ -23,7 +23,6 @@ CONFIGURE_ARGS+=	--with-perl=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mssl)
-BUILDLINK_API_DEPENDS.openssl+=	openssl>=1.0.2
 .include "../../security/openssl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-ssl
diff --git a/chat/irssi/patches/patch-build-aux_test-driver b/chat/irssi/patches/patch-build-aux_test-driver
deleted file mode 100644
index 5b2060e2dba..00000000000
--- a/chat/irssi/patches/patch-build-aux_test-driver
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-build-aux_test-driver,v 1.1 2018/01/16 07:18:45 maya Exp $
-
-Shell portability
-
---- build-aux/test-driver.orig	2018-01-14 20:22:43.000000000 +0000
-+++ build-aux/test-driver
-@@ -59,7 +59,7 @@ enable_hard_errors=yes
- while test $# -gt 1; do
-  arg=${1%=*}
-  val=${1#*=}
-- if [ $arg == $val ]; then
-+ if [ $arg = $val ]; then
-    val=$2
-    shift
-  fi