Pullup ticket #5104 - requested by sevan

chat/irssi: security fix, bugfixes chat/irssi-icb: security fix, bugfixes chat/irssi-xmpp: security fix, bugfixes Revisions pulled up: - chat/irssi-icb/Makefile 1.39 - chat/irssi-icb/distinfo 1.23-1.24 - chat/irssi-icb/patches/patch-src_core_icb-core.c 1.1 - chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c 1.1 - chat/irssi-xmpp/Makefile 1.6-1.7,1.9-1.10 - chat/irssi-xmpp/PLIST 1.2 - chat/irssi-xmpp/distinfo 1.5-1.6 - chat/irssi/Makefile 1.72-1.73 - chat/irssi/Makefile.common 1.17-1.18 - chat/irssi/PLIST 1.13-1.14 - chat/irssi/distinfo 1.35-1.37 - chat/irssi/options.mk 1.12 - chat/irssi/patches/patch-scripts_buf.pl 1.1 --- Module Name: pkgsrc Committed By: maya Date: Sun Aug 14 21:10:35 UTC 2016 Modified Files: pkgsrc/chat/irssi: Makefile Makefile.common PLIST distinfo options.mk Log Message: Update irssi to 0.8.19 Changes: v0.8.19 2016-03-23 The Irssi team <staff%irssi.org@localhost> - Fixed regression when joining and parting channels on IRCnet (#435) - Fixed SASL EXTERNAL (#432) - Fixed regression when not using SASL (#438) - Fixed incorrect SSL disconnects when using SSL from modules/scripts (#439) - Fixed regression where proxy_string could not be configured or certain file transfers could not be accepted (#445) - Fixed storing layout of !channels (#183) - Fixed restoration of bracketed paste mode on quit (#449) - Make the usage of meta-O for cursor keys configurable with /set term_appkey_mode off v0.8.18 2016-02-13 The Irssi team <staff%irssi.org@localhost> * Modules will now require to define a void MODULENAME ## _abicheck(int *version) method to ensure that they are compiled against the correct Irssi version. * The signature of "message private" has been changed to 5: server, message, nick, address, target in order to support "self messages". Module authors should implement this change if they are using this signal. * Removing networks will now remove all attached servers and channels (#45). * The proxy module now has an /irssiproxy command. * sb_search has been moved to scripts.irssi.org * WIN32 has been completely removed (it had not been working and is lacking a maintainer.) * Garbage Collection support has been removed. This will hardly have any effect for anyone given that it has been unsupported for several years. + CAP SASL PLAIN login is now supported natively. + Paste bracket markers can be requested from terminal with /set paste_use_bracketed_mode on + "Self messages" generated by some bouncers can now be received in the proper window. + Try to split long lines on spaces to avoid words being splitted. Adds a new option: 'split_line_on_space' which defaults to on. + Add setting hilight_nick_matches_everywhere (#56). + The config parser is more robust and prints out better diagnostics on incorrect config files. + Ctrl+^ (FS#721) and Ctrl+J can now be bound. + Command history can be cleared with /window history -clear + /hilight -mask -line is now supported (FS#275). + CHANTYPES are now supported. + Improved reload speed of ignores. + Add -date feature to /lastlog + irssiproxy can be more easily enabled and disabled. + Expando for hostname (FS#829). + UNIX sockets can now also be specified in the config file. + Disable SSLv3 due to the POODLE vulnerability. + SSL ciphers can now be specified per server. + Added SNI support for SSL. - /ignore now respects -pattern on merge (#78). - irssiproxy (BNC) module now uses correct line endings. - Fix missing lines on large pastes (FS#905). - Correctly preserve STATUSMSG prefixes (#291). - Fix infinite recursion in key bindings (FS#817). - Fix incomplete awaylog caused by buffering. - Fix calculation of UTF-8 string length display in some cases. - Fix some Perl warnings related to @ISA. - EXEC windowitems now get proper references on the Perl side. - Incremental help file improvements. - ANSI attributes are now properly reset. - Fixed regression where text would blink when terminal lacks color support. - Permit the usage of Freenode extban syntax in /ban (#150) - Fixed regression in scriptassist on unload of scripts. - Fixed regression in -actcolor %n --- Module Name: pkgsrc Committed By: leot Date: Sun Aug 14 21:15:12 UTC 2016 Modified Files: pkgsrc/chat/irssi-icb: Makefile distinfo Added Files: pkgsrc/chat/irssi-icb/patches: patch-src_core_icb-core.c patch-src_fe-common_fe-icb.c Log Message: Add support for irssi>=0.8.18 and update distinfo for irssi-0.8.19 update --- Module Name: pkgsrc Committed By: leot Date: Sun Aug 14 21:16:04 UTC 2016 Modified Files: pkgsrc/chat/irssi-xmpp: Makefile PLIST distinfo Log Message: Update chat/irssi-xmpp to 0.53 pkgsrc changes: - Drop MAINTAINERship - Update distinfo for irssi-0.8.19 Changes: 0.53 - 18/03/2016 - Irssi 0.8.18 support - Bug fixes and stability improvements --- Module Name: pkgsrc Committed By: jperkin Date: Mon Sep 19 17:17:27 UTC 2016 Modified Files: pkgsrc/chat/irssi-xmpp: Makefile Log Message: Use correct linker flags on Darwin. --- Module Name: pkgsrc Committed By: maya Date: Wed Sep 21 20:53:57 UTC 2016 Modified Files: pkgsrc/chat/irssi: Makefile.common PLIST distinfo pkgsrc/chat/irssi-icb: distinfo pkgsrc/chat/irssi-xmpp: Makefile distinfo Log Message: irssi: update to 0.8.20, security fix. catch up with irssi-icb, irssi-xmpp distinfo (they grab irssi versioned file). comment out part of irssi-xmpp makefile which is breaking the build. irssi 0.8.20 changes: - Correct the name of an emitted sasl signal (#484) - Correct the prototype for the 'message private' signal (#515) - Corrections in away and hilight help text (#477, #518) - /squery and /servlist commands have been restored. - Where Irssi would previously only report "System error" on connect, it will now try harder to retrieve the system error message. - Fixed issue with +channels not working properly (#533) - Fixed crash in optchan when item has no server (#485) - Fixed random remote crash in the nicklist handling (#529) - Fixed remote crash due to incorrect bounds checking on formats, reported by Gabriel Campana and Adrien Guinet from Quarkslab. --- Module Name: pkgsrc Committed By: jperkin Date: Wed Sep 21 20:58:15 UTC 2016 Modified Files: pkgsrc/chat/irssi-xmpp: Makefile Log Message: Fix Darwin subst. --- Module Name: pkgsrc Committed By: maya Date: Thu Sep 22 09:07:08 UTC 2016 Modified Files: pkgsrc/chat/irssi: Makefile distinfo Added Files: pkgsrc/chat/irssi/patches: patch-scripts_buf.pl Log Message: irssi: add patch for buf.pl update as it is shipped with irssi. previously it would create a world readable file containing chat logs when /upgrade was used. while a security fix, you have to jump through many hoops to be affected by it - we don't enable perl scripts by default, we don't run that perl script by default, and you'd have to know that /upgrade exists in the first place, and run on a system where world readability of files is a concern. still, grab upstream update, bump PKGREVISION.
author: bsiegert <bsiegert> 2016-09-24 09:48:32 +0000
committer: bsiegert <bsiegert> 2016-09-24 09:48:32 +0000
commit: 079e2882151e415db4b8b52f3037f4eef8d3db90 (patch)
tree: 7d608d3a85c44fe6fc14c0c6cd0e99ad2661b04c
parent: 53e4e4d634ab0374483390b8b686f2ac09c11cf5 (diff)
download: pkgsrc-079e2882151e415db4b8b52f3037f4eef8d3db90.tar.gz
13 files changed, 199 insertions, 42 deletions
diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile
index cfb58b90cb8..2e2db75fb71 100644
--- a/chat/irssi-icb/Makefile
+++ b/chat/irssi-icb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2014/09/30 08:59:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.38.16.1 2016/09/24 09:48:32 bsiegert Exp $
 #
 
 DISTNAME=	irssi-icb-0.15
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	https://github.com/downloads/jperkin/irssi-icb/
 DISTFILES=	${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
diff --git a/chat/irssi-icb/distinfo b/chat/irssi-icb/distinfo
index a6e0690b2b6..4fc0d7ef28a 100644
--- a/chat/irssi-icb/distinfo
+++ b/chat/irssi-icb/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2015/11/03 01:20:20 agc Exp $
+$NetBSD: distinfo,v 1.22.6.1 2016/09/24 09:48:32 bsiegert Exp $
 
-SHA1 (irssi-0.8.17.tar.bz2) = 3bdee9a1c1f3e99673143c275d2c40275136664a
-RMD160 (irssi-0.8.17.tar.bz2) = 0ee6f41a4725c8498030d2c524e202df78a2aff6
-SHA512 (irssi-0.8.17.tar.bz2) = e3d9b130c46e6977400f5a75374cf3e32d5a6e6907b2fd4c920463b5413575708b094c9fa38151997a120ce581de26092424296510ca93b3eee7b0844be45953
-Size (irssi-0.8.17.tar.bz2) = 1102196 bytes
+SHA1 (irssi-0.8.20.tar.gz) = 080be963f79be5921a0a5c359e163bb8c8fd9fbc
+RMD160 (irssi-0.8.20.tar.gz) = 4425bfc55f07b8113cd0d31055d5ad1d8e51e1e3
+SHA512 (irssi-0.8.20.tar.gz) = 9d70453b6ee7d66a2ddc8ca494935aaba1a5cf56c9e70cceb9ab19aa1d0ca4bc19302113471fb271236339eb53f8546b1324eebd8a9113ad1f0021d41364b995
+Size (irssi-0.8.20.tar.gz) = 1565952 bytes
 SHA1 (irssi-icb-0.15.tar.gz) = c5a739960eb98e6686a94f6d4662cfab5a95d447
 RMD160 (irssi-icb-0.15.tar.gz) = b947a341e1fc2f6d42bee3cb7b738bfdbb0a031d
 SHA512 (irssi-icb-0.15.tar.gz) = 00af04d14c2c6b65eaf93f9859e6f9f51be4bc8b270c602f4f3b2cc722b148f35c29c7efb12432b063dd41095cf823f2ad329515b0298d0c541742199f3c5fa5
@@ -11,4 +11,6 @@ Size (irssi-icb-0.15.tar.gz) = 306973 bytes
 SHA1 (patch-am) = 3bd9e38d0fde6d99d9b6a6ad67268bd63a8a92e2
 SHA1 (patch-an) = bca7fff754b60b49a6322bd5595a4a7f4003a828
 SHA1 (patch-src_core_Makefile.in) = d052d78b4f084da51498f1df934ca16412b8e5a0
+SHA1 (patch-src_core_icb-core.c) = fc0f99c383b6452d09641c2b5f049166370d1fc2
+SHA1 (patch-src_fe-common_fe-icb.c) = 47ca218d295a818028102ca041cf4b9c2053276b
 SHA1 (patch-src_fe-common_module-formats.c) = 5af701e6919051c834c52e6932e0028324362b9f
diff --git a/chat/irssi-icb/patches/patch-src_core_icb-core.c b/chat/irssi-icb/patches/patch-src_core_icb-core.c
new file mode 100644
index 00000000000..e83aeb455be
--- /dev/null
+++ b/chat/irssi-icb/patches/patch-src_core_icb-core.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_core_icb-core.c,v 1.1.2.2 2016/09/24 09:48:32 bsiegert Exp $
+
+Add `void MODULENAME ## _abicheck(int *version)' function required by
+irssi>=0.8.18.
+
+--- src/core/icb-core.c.orig	2002-05-20 04:17:44.000000000 +0000
++++ src/core/icb-core.c
+@@ -156,3 +156,11 @@ void icb_core_deinit(void)
+ 	signal_emit("chat protocol deinit", 1, chat_protocol_find("ICB"));
+ 	chat_protocol_unregister("ICB");
+ }
++
++#ifdef IRSSI_ABI_VERSION
++void
++icb_core_abicheck(int * version)
++{
++	*version = IRSSI_ABI_VERSION;
++}
++#endif
diff --git a/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c b/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c
new file mode 100644
index 00000000000..24ce22aac46
--- /dev/null
+++ b/chat/irssi-icb/patches/patch-src_fe-common_fe-icb.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_fe-common_fe-icb.c,v 1.1.2.2 2016/09/24 09:48:32 bsiegert Exp $
+
+Add `void MODULENAME ## _abicheck(int *version)' function required by
+irssi>=0.8.18.
+
+--- src/fe-common/fe-icb.c.orig	2011-06-13 18:10:41.000000000 +0000
++++ src/fe-common/fe-icb.c
+@@ -531,3 +531,11 @@ void fe_icb_deinit(void)
+ 
+ 	signal_remove("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
+ }
++
++#ifdef IRSSI_ABI_VERSION
++void
++fe_icb_abicheck(int * version)
++{
++	*version = IRSSI_ABI_VERSION;
++}
++#endif
diff --git a/chat/irssi-xmpp/Makefile b/chat/irssi-xmpp/Makefile
index 99f5b5c83ae..462414f1b3a 100644
--- a/chat/irssi-xmpp/Makefile
+++ b/chat/irssi-xmpp/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2014/06/07 23:49:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.5.18.1 2016/09/24 09:48:32 bsiegert Exp $
 #
 
-DISTNAME=	irssi-xmpp-0.52
+DISTNAME=	irssi-xmpp-0.53
 CATEGORIES=	chat
 MASTER_SITES=	http://cybione.org/~irssi-xmpp/files/
 DISTFILES=	${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
 
-MAINTAINER=	leot1990@users.sourceforge.net
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cybione.org/~irssi-xmpp/
 COMMENT=	Irssi plugin to connect to the Jabber network
 LICENSE=	gnu-gpl-v2
@@ -35,6 +35,11 @@ SUBST_FILES.configmk=	config.mk
 SUBST_SED.configmk+=	-e 's/^CFLAGS =/CFLAGS +=/'
 SUBST_SED.configmk+=	-e 's/^LDFLAGS =/LDFLAGS +=/'
 
+SUBST_CLASSES.Darwin+=	osxmk
+SUBST_STAGE.osxmk=	pre-build
+SUBST_FILES.osxmk=	config.mk
+SUBST_SED.osxmk=	-e 's,-shared,-dynamiclib -undefined dynamic_lookup,'
+
 CFLAGS.SunOS+=	-D__BEGIN_DECLS= -D__END_DECLS=
 
 post-extract:
diff --git a/chat/irssi-xmpp/PLIST b/chat/irssi-xmpp/PLIST
index fdd02c8e0a6..22aefe56889 100644
--- a/chat/irssi-xmpp/PLIST
+++ b/chat/irssi-xmpp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/08/26 14:06:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1.32.1 2016/09/24 09:48:32 bsiegert Exp $
 lib/irssi/modules/libfe_xmpp.so
 lib/irssi/modules/libtext_xmpp.so
 lib/irssi/modules/libxmpp_core.so
@@ -7,6 +7,7 @@ share/doc/irssi/irssi-xmpp/GENERAL
 share/doc/irssi/irssi-xmpp/MUC
 share/doc/irssi/irssi-xmpp/STARTUP
 share/doc/irssi/irssi-xmpp/XEP
+share/irssi/help/presence
 share/irssi/help/roster
 share/irssi/help/xmppconnect
 share/irssi/help/xmppserver
diff --git a/chat/irssi-xmpp/distinfo b/chat/irssi-xmpp/distinfo
index de580e36750..eb0517c20d2 100644
--- a/chat/irssi-xmpp/distinfo
+++ b/chat/irssi-xmpp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:20:20 agc Exp $
+$NetBSD: distinfo,v 1.4.6.1 2016/09/24 09:48:32 bsiegert Exp $
 
-SHA1 (irssi-0.8.17.tar.bz2) = 3bdee9a1c1f3e99673143c275d2c40275136664a
-RMD160 (irssi-0.8.17.tar.bz2) = 0ee6f41a4725c8498030d2c524e202df78a2aff6
-SHA512 (irssi-0.8.17.tar.bz2) = e3d9b130c46e6977400f5a75374cf3e32d5a6e6907b2fd4c920463b5413575708b094c9fa38151997a120ce581de26092424296510ca93b3eee7b0844be45953
-Size (irssi-0.8.17.tar.bz2) = 1102196 bytes
-SHA1 (irssi-xmpp-0.52.tar.gz) = 330d80e6deb115b875d2a4e1ad0841888285e378
-RMD160 (irssi-xmpp-0.52.tar.gz) = b007e0462fee3a24dc06296713e4fc912b8c2528
-SHA512 (irssi-xmpp-0.52.tar.gz) = 27f7b877d02e0812b59e9f23ee12e58b842e3923ab5f0aa8cdf874dc9b30d9d22dbae9ef848ee5ffe2dcb667a0344f960125a3ffc072ce065e1fdf714eb98b27
-Size (irssi-xmpp-0.52.tar.gz) = 68105 bytes
+SHA1 (irssi-0.8.20.tar.gz) = 080be963f79be5921a0a5c359e163bb8c8fd9fbc
+RMD160 (irssi-0.8.20.tar.gz) = 4425bfc55f07b8113cd0d31055d5ad1d8e51e1e3
+SHA512 (irssi-0.8.20.tar.gz) = 9d70453b6ee7d66a2ddc8ca494935aaba1a5cf56c9e70cceb9ab19aa1d0ca4bc19302113471fb271236339eb53f8546b1324eebd8a9113ad1f0021d41364b995
+Size (irssi-0.8.20.tar.gz) = 1565952 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
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index 5ef6052c920..bd493568378 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2016/06/08 19:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.70.2.1 2016/09/24 09:48:32 bsiegert Exp $
 
 DISTNAME=		${IRSSI_DISTNAME}
-PKGREVISION=		3
 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 7b480d54a21..5104d17f307 100644
--- a/chat/irssi/Makefile.common
+++ b/chat/irssi/Makefile.common
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.16 2015/12/29 04:04:26 dholland Exp $
-# 
+# $NetBSD: Makefile.common,v 1.16.4.1 2016/09/24 09:48:32 bsiegert Exp $
+#
 # used by chat/irssi-icb/Makefile
 # used by chat/irssi-xmpp/Makefile
 
 # Specific distribution information.
-IRSSI_VERSION=		0.8.17
-IRSSI_DISTNAME=		irssi-${IRSSI_VERSION}
-IRSSI_EXTRACT_SUFX=	.tar.bz2
-IRSSI_DISTFILE=		${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX}
-SITES.${IRSSI_DISTFILE}=	http://www.irssi.org/files/
+IRSSI_VERSION=			0.8.20
+IRSSI_DISTNAME=			irssi-${IRSSI_VERSION}
+IRSSI_EXTRACT_SUFX=		.tar.gz
+IRSSI_DISTFILE=			${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX}
+SITES.${IRSSI_DISTFILE}=	https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/
 
 # These files are generated during Irssi's build, but are required by
 # plugins to compile properly.
-IRSSI_CONFIG=		${PREFIX}/share/irssi/irssi-config
-IRSSI_CONFIG_H=		${PREFIX}/include/irssi/irssi-config.h
+IRSSI_CONFIG=			${PREFIX}/share/irssi/irssi-config
+IRSSI_CONFIG_H=			${PREFIX}/include/irssi/irssi-config.h
diff --git a/chat/irssi/PLIST b/chat/irssi/PLIST
index 423e9fb79db..6072829532a 100644
--- a/chat/irssi/PLIST
+++ b/chat/irssi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2015/01/06 12:40:06 mef Exp $
+@comment $NetBSD: PLIST,v 1.12.12.1 2016/09/24 09:48:32 bsiegert Exp $
 bin/irssi
 include/irssi/irssi-config.h
 include/irssi/irssi-version.h
@@ -72,6 +72,7 @@ include/irssi/src/fe-common/core/windows-layout.h
 include/irssi/src/fe-common/irc/dcc/fe-dcc.h
 include/irssi/src/fe-common/irc/dcc/module-formats.h
 include/irssi/src/fe-common/irc/dcc/module.h
+include/irssi/src/fe-common/irc/fe-irc-channels.h
 include/irssi/src/fe-common/irc/fe-irc-server.h
 include/irssi/src/fe-common/irc/module-formats.h
 include/irssi/src/fe-common/irc/module.h
@@ -81,6 +82,7 @@ include/irssi/src/fe-text/statusbar-item.h
 include/irssi/src/irc/core/bans.h
 include/irssi/src/irc/core/channel-rejoin.h
 include/irssi/src/irc/core/ctcp.h
+include/irssi/src/irc/core/irc-cap.h
 include/irssi/src/irc/core/irc-channels.h
 include/irssi/src/irc/core/irc-chatnets.h
 include/irssi/src/irc/core/irc-commands.h
@@ -94,6 +96,7 @@ include/irssi/src/irc/core/mode-lists.h
 include/irssi/src/irc/core/modes.h
 include/irssi/src/irc/core/module.h
 include/irssi/src/irc/core/netsplit.h
+include/irssi/src/irc/core/sasl.h
 include/irssi/src/irc/core/servers-idle.h
 include/irssi/src/irc/core/servers-redirect.h
 include/irssi/src/irc/dcc/dcc-chat.h
@@ -157,6 +160,7 @@ share/irssi/help/hilight
 share/irssi/help/ignore
 share/irssi/help/info
 share/irssi/help/invite
+share/irssi/help/irssiproxy
 share/irssi/help/ison
 share/irssi/help/join
 share/irssi/help/kick
@@ -205,8 +209,10 @@ share/irssi/help/sconnect
 share/irssi/help/script
 share/irssi/help/scrollback
 share/irssi/help/server
+share/irssi/help/servlist
 share/irssi/help/set
 share/irssi/help/silence
+share/irssi/help/squery
 share/irssi/help/squit
 share/irssi/help/stats
 share/irssi/help/statusbar
@@ -247,9 +253,7 @@ share/irssi/scripts/mlock.pl
 share/irssi/scripts/msg-event.pl
 share/irssi/scripts/quitmsg.pl
 share/irssi/scripts/redirect.pl
-share/irssi/scripts/sb_search.pl
 share/irssi/scripts/scriptassist.pl
-share/irssi/scripts/splitlong.pl
 share/irssi/scripts/usercount.pl
 share/irssi/themes/colorless.theme
 share/irssi/themes/default.theme
diff --git a/chat/irssi/distinfo b/chat/irssi/distinfo
index 6f5494e510a..81e110758f3 100644
--- a/chat/irssi/distinfo
+++ b/chat/irssi/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.34 2015/11/03 01:20:20 agc Exp $
+$NetBSD: distinfo,v 1.34.6.1 2016/09/24 09:48:32 bsiegert Exp $
 
-SHA1 (irssi-0.8.17.tar.bz2) = 3bdee9a1c1f3e99673143c275d2c40275136664a
-RMD160 (irssi-0.8.17.tar.bz2) = 0ee6f41a4725c8498030d2c524e202df78a2aff6
-SHA512 (irssi-0.8.17.tar.bz2) = e3d9b130c46e6977400f5a75374cf3e32d5a6e6907b2fd4c920463b5413575708b094c9fa38151997a120ce581de26092424296510ca93b3eee7b0844be45953
-Size (irssi-0.8.17.tar.bz2) = 1102196 bytes
+SHA1 (irssi-0.8.20.tar.gz) = 080be963f79be5921a0a5c359e163bb8c8fd9fbc
+RMD160 (irssi-0.8.20.tar.gz) = 4425bfc55f07b8113cd0d31055d5ad1d8e51e1e3
+SHA512 (irssi-0.8.20.tar.gz) = 9d70453b6ee7d66a2ddc8ca494935aaba1a5cf56c9e70cceb9ab19aa1d0ca4bc19302113471fb271236339eb53f8546b1324eebd8a9113ad1f0021d41364b995
+Size (irssi-0.8.20.tar.gz) = 1565952 bytes
 SHA1 (patch-aa) = 83a0f6def09cb283aa55b63a249a81121748232b
 SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7
+SHA1 (patch-scripts_buf.pl) = bd18e2b416f163849845fd14b5135c640a89d659
diff --git a/chat/irssi/options.mk b/chat/irssi/options.mk
index c8b08ee4652..6023fd9c33e 100644
--- a/chat/irssi/options.mk
+++ b/chat/irssi/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.10 2011/03/06 04:12:09 dholland Exp $
+# $NetBSD: options.mk,v 1.10.44.1 2016/09/24 09:48:32 bsiegert Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.irssi
-PKG_SUPPORTED_OPTIONS=	inet6 perl ssl
-PKG_SUGGESTED_OPTIONS=	inet6
+PKG_OPTIONS_VAR=		PKG_OPTIONS.irssi
+PKG_SUPPORTED_OPTIONS=		inet6 perl ssl
+PKG_SUGGESTED_OPTIONS=		inet6 ssl
 PKG_OPTIONS_LEGACY_OPTS+=	irssi-perl:perl
 
 .include "../../mk/bsd.options.mk"
diff --git a/chat/irssi/patches/patch-scripts_buf.pl b/chat/irssi/patches/patch-scripts_buf.pl
new file mode 100644
index 00000000000..eef23a498e0
--- /dev/null
+++ b/chat/irssi/patches/patch-scripts_buf.pl
@@ -0,0 +1,105 @@
+$NetBSD: patch-scripts_buf.pl,v 1.1.2.2 2016/09/24 09:48:32 bsiegert Exp $
+
+Don't create a world readable file containing chat contents.
+https://irssi.org/2016/09/22/buf.pl-update/
+
+--- scripts/buf.pl.orig	2016-08-11 12:59:21.000000000 +0000
++++ scripts/buf.pl
+@@ -5,7 +5,7 @@ use Irssi qw(command signal_add signal_a
+              settings_get_str settings_get_bool channels windows
+ 	     settings_add_str settings_add_bool get_irssi_dir
+ 	     window_find_refnum signal_stop);
+-$VERSION = '2.13';
++$VERSION = '2.20';
+ %IRSSI = (
+     authors	=> 'Juerd',
+     contact	=> 'juerd@juerd.nl',
+@@ -13,10 +13,8 @@ $VERSION = '2.13';
+     description	=> 'Saves the buffer for /upgrade, so that no information is lost',
+     license	=> 'Public Domain',
+     url		=> 'http://juerd.nl/irssi/',
+-    changed	=> 'Mon May 13 19:41 CET 2002',
+-    changes	=> 'Severe formatting bug removed * oops, I ' .
+-                   'exposed Irssi to ircII foolishness * sorry ' .
+-		   '** removed logging stuff (this is a fix)',
++    changed	=> 'Thu Sep 22 01:37 CEST 2016',
++    changes	=> 'Fixed file permissions (leaked everything via filesystem)',
+     note1	=> 'This script HAS TO BE in your scripts/autorun!',
+     note2	=> 'Perl support must be static or in startup',
+ );
+@@ -39,9 +37,15 @@ use Data::Dumper;
+ 
+ my %suppress;
+ 
++sub _filename { sprintf '%s/scrollbuffer', get_irssi_dir }
++
+ sub upgrade {
+-    open BUF, q{>}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
+-    print BUF join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
++    my $fn = _filename;
++    my $old_umask = umask 0077;
++    open my $fh, q{>}, $fn or die "open $fn: $!";
++    umask $old_umask;
++
++    print $fh join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
+     for my $window (windows) {
+ 	next unless defined $window;
+ 	next if $window->{name} eq 'status';
+@@ -57,36 +61,39 @@ sub upgrade {
+ 		redo if defined $line;
+ 	    }
+ 	}
+-	printf BUF "%s:%s\n%s", $window->{refnum}, $lines, $buf;
++	printf $fh "%s:%s\n%s", $window->{refnum}, $lines, $buf;
+     }
+-    close BUF;
++    close $fh;
+     unlink sprintf("%s/sessionconfig", get_irssi_dir);
+     command 'layout save';
+     command 'save';
+ }
+ 
+ sub restore {
+-    open BUF, q{<}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!;
+-    my @suppress = split /\0/, <BUF>;
++    my $fn = _filename;
++    open my $fh, q{<}, $fn or die "open $fn: $!";
++    unlink $fn or warn "unlink $fn: $!";
++
++    my @suppress = split /\0/, readline $fh;
+     if (settings_get_bool 'upgrade_suppress_join') {
+ 	chomp $suppress[-1];
+ 	@suppress{@suppress} = (2) x @suppress;
+     }
+     active_win->command('^window scroll off');
+-    while (my $bla = <BUF>){
++    while (my $bla = readline $fh){
+ 	chomp $bla;
+ 	my ($refnum, $lines) = split /:/, $bla;
+ 	next unless $lines;
+ 	my $window = window_find_refnum $refnum;
+ 	unless (defined $window){
+-	    <BUF> for 1..$lines;
++	    readline $fh for 1..$lines;
+ 	    next;
+ 	}
+ 	my $view = $window->view;
+ 	$view->remove_all_lines();
+ 	$view->redraw();
+ 	my $buf = '';
+-	$buf .= <BUF> for 1..$lines;
++	$buf .= readline $fh for 1..$lines;
+ 	my $sep = settings_get_str 'upgrade_separator';
+ 	$sep .= "\n" if $sep ne '';
+ 	$window->gui_printtext_after(undef, MSGLEVEL_CLIENTNOTICE, "$buf\cO$sep");
+@@ -119,3 +126,10 @@ signal_add       'event join'      => 's
+ unless (-f sprintf('%s/scripts/autorun/buf.pl', get_irssi_dir)) {
+     Irssi::print('PUT THIS SCRIPT IN ~/.irssi/scripts/autorun/ BEFORE /UPGRADING!!');
+ }
++
++# Remove any left-over file. If 'session' doesn't exist (created by irssi
++# during /UPGRADE), neither should our file.
++unless (-e sprintf('%s/session', get_irssi_dir)) {
++    my $fn = _filename;
++    unlink $fn or warn "unlink $fn: $!" if -e $fn;
++}
author	bsiegert <bsiegert>	2016-09-24 09:48:32 +0000
committer	bsiegert <bsiegert>	2016-09-24 09:48:32 +0000
commit	079e2882151e415db4b8b52f3037f4eef8d3db90 (patch)
tree	7d608d3a85c44fe6fc14c0c6cd0e99ad2661b04c
parent	53e4e4d634ab0374483390b8b686f2ac09c11cf5 (diff)
download	pkgsrc-079e2882151e415db4b8b52f3037f4eef8d3db90.tar.gz