[pkgsrc/pkgsrc-2016Q4]: pkgsrc/chat Pullup ticket #5182 - requested by maya

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26b7a5691303
branches:  pkgsrc-2016Q4
changeset: 408704:26b7a5691303
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Jan 08 19:59:14 2017 +0000

description:
Pullup ticket #5182 - requested by maya
chat/irssi: security fix
chat/irssi-icb: security fix
chat/irssi-xmpp: security fix

Revisions pulled up:
- chat/irssi-icb/Makefile                                       1.40
- chat/irssi-icb/distinfo                                       1.25
- chat/irssi-xmpp/Makefile                                      1.11
- chat/irssi-xmpp/distinfo                                      1.7
- chat/irssi/Makefile                                           1.75
- chat/irssi/Makefile.common                                    1.19
- chat/irssi/distinfo                                           1.38
- chat/irssi/patches/patch-scripts_buf.pl                       deleted

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Thu Jan  5 15:49:47 UTC 2017

   Modified Files:
          pkgsrc/chat/irssi-xmpp: Makefile distinfo

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

   bump PKGREVISION to ensure it is rebuilt.

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Thu Jan  5 15:48:34 UTC 2017

   Modified Files:
          pkgsrc/chat/irssi-icb: Makefile distinfo

   Log Message:
   irssi-icb: catch up with irssi changes.

   bump PKGREVISION to ensure it is rebuilt.

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

   Modified Files:
          pkgsrc/chat/irssi: Makefile Makefile.common distinfo
   Removed Files:
          pkgsrc/chat/irssi/patches: patch-scripts_buf.pl

   Log Message:
   irssi: update to 0.8.21.

   irssi 0.8.21 is a maintenance release without any new features.

   Changes:

   - Correct a NULL pointer dereference in the nickcmp function found by
   Joseph Bisch (GL#1)
   - Correct an out of bounds read in certain incomplete control codes
   found by Joseph Bisch (GL#2)
   - Correct an out of bounds read in certain incomplete character
   sequences found by Hanno B?ck and independently by J. Bisch (GL#3)
   - Correct an error when receiving invalid nick message (GL#4, #466)

diffstat:

 chat/irssi-icb/Makefile                 |    4 +-
 chat/irssi-icb/distinfo                 |   10 +-
 chat/irssi-xmpp/Makefile                |    4 +-
 chat/irssi-xmpp/distinfo                |   10 +-
 chat/irssi/Makefile                     |    3 +-
 chat/irssi/Makefile.common              |    4 +-
 chat/irssi/distinfo                     |   11 +-
 chat/irssi/patches/patch-scripts_buf.pl |  105 --------------------------------
 8 files changed, 22 insertions(+), 129 deletions(-)

diffs (221 lines):

diff -r a9bfc057b534 -r 26b7a5691303 chat/irssi-icb/Makefile
--- a/chat/irssi-icb/Makefile   Sun Jan 08 19:46:17 2017 +0000
+++ b/chat/irssi-icb/Makefile   Sun Jan 08 19:59:14 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2016/08/14 21:15:12 leot Exp $
+# $NetBSD: Makefile,v 1.39.4.1 2017/01/08 19:59:14 bsiegert Exp $
 #
 
 DISTNAME=      irssi-icb-0.15
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  https://github.com/downloads/jperkin/irssi-icb/
 DISTFILES=     ${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
diff -r a9bfc057b534 -r 26b7a5691303 chat/irssi-icb/distinfo
--- a/chat/irssi-icb/distinfo   Sun Jan 08 19:46:17 2017 +0000
+++ b/chat/irssi-icb/distinfo   Sun Jan 08 19:59:14 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2016/09/21 20:53:57 maya Exp $
+$NetBSD: distinfo,v 1.24.4.1 2017/01/08 19:59:14 bsiegert Exp $
 
-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-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-icb-0.15.tar.gz) = c5a739960eb98e6686a94f6d4662cfab5a95d447
 RMD160 (irssi-icb-0.15.tar.gz) = b947a341e1fc2f6d42bee3cb7b738bfdbb0a031d
 SHA512 (irssi-icb-0.15.tar.gz) = 00af04d14c2c6b65eaf93f9859e6f9f51be4bc8b270c602f4f3b2cc722b148f35c29c7efb12432b063dd41095cf823f2ad329515b0298d0c541742199f3c5fa5
diff -r a9bfc057b534 -r 26b7a5691303 chat/irssi-xmpp/Makefile
--- a/chat/irssi-xmpp/Makefile  Sun Jan 08 19:46:17 2017 +0000
+++ b/chat/irssi-xmpp/Makefile  Sun Jan 08 19:59:14 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2016/09/21 20:58:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.10.4.1 2017/01/08 19:59:14 bsiegert Exp $
 #
 
 DISTNAME=      irssi-xmpp-0.53
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  http://cybione.org/~irssi-xmpp/files/
 DISTFILES=     ${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
diff -r a9bfc057b534 -r 26b7a5691303 chat/irssi-xmpp/distinfo
--- a/chat/irssi-xmpp/distinfo  Sun Jan 08 19:46:17 2017 +0000
+++ b/chat/irssi-xmpp/distinfo  Sun Jan 08 19:59:14 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2016/09/21 20:53:57 maya Exp $
+$NetBSD: distinfo,v 1.6.4.1 2017/01/08 19:59:14 bsiegert Exp $
 
-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-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-xmpp-0.53.tar.gz) = 57d993bbebc30c72b500e2c4b4c4e79c15d8b6f9
 RMD160 (irssi-xmpp-0.53.tar.gz) = ed65af7220834f7fb6701612e81c6a523f730b06
 SHA512 (irssi-xmpp-0.53.tar.gz) = 09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be
diff -r a9bfc057b534 -r 26b7a5691303 chat/irssi/Makefile
--- a/chat/irssi/Makefile       Sun Jan 08 19:46:17 2017 +0000
+++ b/chat/irssi/Makefile       Sun Jan 08 19:59:14 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2016/09/22 09:07:08 maya Exp $
+# $NetBSD: Makefile,v 1.73.4.1 2017/01/08 19:59:14 bsiegert Exp $
 
 DISTNAME=              ${IRSSI_DISTNAME}
 CATEGORIES=            chat
 EXTRACT_SUFX=          ${IRSSI_EXTRACT_SUFX}
-PKGREVISION=           1
 
 MAINTAINER=            maya%NetBSD.org@localhost
 HOMEPAGE=              http://www.irssi.org/
diff -r a9bfc057b534 -r 26b7a5691303 chat/irssi/Makefile.common
--- a/chat/irssi/Makefile.common        Sun Jan 08 19:46:17 2017 +0000
+++ b/chat/irssi/Makefile.common        Sun Jan 08 19:59:14 2017 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.18 2016/09/21 20:53:57 maya Exp $
+# $NetBSD: Makefile.common,v 1.18.4.1 2017/01/08 19:59:14 bsiegert Exp $
 #
 # used by chat/irssi-icb/Makefile
 # used by chat/irssi-xmpp/Makefile
 
 # Specific distribution information.
-IRSSI_VERSION=                 0.8.20
+IRSSI_VERSION=                 0.8.21
 IRSSI_DISTNAME=                        irssi-${IRSSI_VERSION}
 IRSSI_EXTRACT_SUFX=            .tar.gz
 IRSSI_DISTFILE=                        ${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX}
diff -r a9bfc057b534 -r 26b7a5691303 chat/irssi/distinfo
--- a/chat/irssi/distinfo       Sun Jan 08 19:46:17 2017 +0000
+++ b/chat/irssi/distinfo       Sun Jan 08 19:59:14 2017 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.37 2016/09/22 09:07:08 maya Exp $
+$NetBSD: distinfo,v 1.37.4.1 2017/01/08 19:59:14 bsiegert Exp $
 
-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-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 (patch-aa) = 83a0f6def09cb283aa55b63a249a81121748232b
 SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7
-SHA1 (patch-scripts_buf.pl) = bd18e2b416f163849845fd14b5135c640a89d659
diff -r a9bfc057b534 -r 26b7a5691303 chat/irssi/patches/patch-scripts_buf.pl
--- a/chat/irssi/patches/patch-scripts_buf.pl   Sun Jan 08 19:46:17 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-$NetBSD: patch-scripts_buf.pl,v 1.1 2016/09/22 09:07:08 maya 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@localhost',
-@@ -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;
-+}