[pkgsrc/trunk]: pkgsrc/chat Update irssi to 0.8.13 (and bump pkgrevision irss...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/06b3578c1b66
branches:  trunk
changeset: 562412:06b3578c1b66
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Jul 27 12:59:44 2009 +0000

description:
Update irssi to 0.8.13 (and bump pkgrevision irssi-icb).
Also contains security fix for CVE-2009-1959 (patch-ab).
Based on patch provided by Leonardo Taccari in PR 41785.

ChangeLog for 0.8.13
Features:

    * Reject some obviously invalid values in /set.
    * Add perl bindings for Window::get_history_lines
    * Use an io channel to write the config file.
    * Use memory slices instead of memory chunks for text buffer.
    * Remove methods to create/destroy TextBuffer and TextBufferView and low
      level api to add/remove lines, scripts should be fine using
      Window::print_after and TextBufferView::remove_line.
    * Add print_after method to Window perl object analogous to
      gui_printtext_after but which also expands formats and forces a full line.
    * Better mapping of signal parameters to Perl. All signals used in scripts
      now need to be registered with Irssi::signal_register.
    * Add public header with interfaces to manage statusbar items (bug #535)
    * Recode: assume utf-8 encoding for an ascii string in which no escape
      character occurs (bug #392).
    * Allow /BAN, /UNBAN, /KICBAN, /KNOCKOUT if channel is not synced.
      Requesting ban lists from an unsynced channel will ask them from the
      server, banning a user whose u@h irssi does not know will ban nick!*@* and
      only bans irssi knows about can be removed.
    * Allow storing multiple "other" prefixes such as +q and +a (original patch
      by JasonX)
    * Add /set autolog_ignore_targets for cherry-picking targets that shouldn't
      get logged.
    * Add support for 16 colors. Formats KBGCRMYW and mirc colors are now mapped
      to colors 8-15. fe-text translates colors 8-15 to bold/blink+0-7 if the
      terminal supports only 8 colors. If your theme uses one of the high color
      formats and you really want bold you can change %FMT<string> to %fmt%_%_,
      it will work fine in all irssi versions.
    * Better 005 PREFIX support (bug #580).
    * Display 407 numerics other than "duplicate channel".
    * Fix display of ratbox-style operspy whois.
    * Recode outgoing irc away messages (bug #412).
    * Recode outgoing irc quit messages.
    * Remove scrollback_levelclear_levels setting and add a 'level' option to
      'sb levelclear' to specify a comma separated list of levels.
    * Add perl __WARN__ handler for scripts (bug #427).
    * Add Irssi::command_parse_options function to parse options for a command.
    * Revert recode changes introduced in 0.8.12.
    * Add completion for /WINDOW SERVER.
    * Support for reading kicks/msgs from TARGMAX/MAXTARGETS 005 tokens.
    * Enhancements to the redirections code.
    * Support for RPL_WHOISACTUALLY (338 numeric) for both ratbox and ircu
      (bug #428).
    * -idle option of /notify is gone.
    * /layout save now makes window-channel bindings instantly effective
      (bug #35).
    * /ping without arguments does not send anymore a ctcp ping to a channel
      (bug #542).
    * Track IRC operator status of nicks a bit better.
    * new 'actlist_names' option to add active items names in 'act' statusbar
      item.
    * new 'word_completion_backward' command to scroll backwards in the
      completion list.
    * add 'list' option to /bind to print all the available commands.
    * show setter/time in +I lists
    * apply -usermode before -autosendcmd (bug #548).
    * reduce memory usage of the scrollback buffer and make the display in /sb
      status more accurate (higher).
    * fix data getting dropped when a lot is sent at a time (e.g. when attaching
      to irssi-proxy, bug #528).
    * introduce the type Irssi::Irc::Client and signals to communicate with
      proxy clients to allow for scripting parts of the irssi-proxy.
    * Add sb_search.pl, a script for /SCROLLBACK SEARCH

Bugfixes:

    * Fix /NOTIFY list when nick is seen joining (bug #642).
    * Include hostmask in 001 event sent by proxy (bug #650).
    * Be more power-friendly: don't run any always-on <1s timers (bug #641).
    * Don't get confused by a failed /JOIN -window (bug #644).
    * Properly initialize embedded Perl (PERL_SYS_INIT3).
    * Replace invalid utf-8 bytes with U+FFFD when drawing a line.
    * Properly unload the original script when using /script load to reload it.
      (bug #525, patch by Lukas Mai)
    * Clean up script loading in general:
       * Don't leak local variables to eval'd code.
       * Set filename/line number to get better error messages from perl.
       * Use three-arg open and lexical filehandles to avoid surprises.
       * Include error reason in message for unopenable scripts.
       * Don't wrap script code in sub handler { } - this avoids spurious
         warnings and should at least allow __END__ to work properly. (Patch by
         Lukas Mai)
    * Fix NETSPLIT_SERVER_REC in signals for Perl.
    * Remove buggy /SCROLLBACK redraw and /SET scrollback_save_formats.
    * Always preserve the active mainwindow when resizing.
    * Ignore DNS not found errors when considering reconnect.
    * Do not strip the comma in a mirc color if it is not followed by a digit
      (bug #250).
    * Fix building perl module with perl-5.10 (bug #630).
    * fix leak with $L expando.
    * fix possible crash with /script reset.
    * ignore exceptions take precedence over ignores in all cases.
    * honour -channels preference for ignore -replies (bug #227).
    * Fix mode display in whois with unreal (379 numeric) (bug #479).
    * Fix regressions that prevented external modules from building/working
      (bugs #537 #539).
    * Fix /set hilight_level not taking effect immediately (bug #598).
    * Fix bold, blinking and indentation in /LASTLOG and buf.pl.

diffstat:

 chat/irssi-icb/Makefile         |   5 +-
 chat/irssi-icb/distinfo         |  12 +++---
 chat/irssi-icb/patches/patch-ad |   4 +-
 chat/irssi-icb/patches/patch-ae |   4 +-
 chat/irssi/Makefile             |  10 +++---
 chat/irssi/Makefile.common      |   6 +-
 chat/irssi/PLIST                |  16 ++-------
 chat/irssi/distinfo             |  19 ++++------
 chat/irssi/patches/patch-aa     |   6 ++-
 chat/irssi/patches/patch-ab     |  66 ++++++++++------------------------------
 chat/irssi/patches/patch-ac     |  13 --------
 chat/irssi/patches/patch-ad     |   5 ++-
 chat/irssi/patches/patch-ae     |   4 +-
 chat/irssi/patches/patch-af     |  21 -------------
 chat/irssi/patches/patch-ag     |  14 --------
 15 files changed, 63 insertions(+), 142 deletions(-)

diffs (truncated from 419 to 300 lines):

diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi-icb/Makefile
--- a/chat/irssi-icb/Makefile   Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi-icb/Makefile   Mon Jul 27 12:59:44 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2009/04/29 12:47:23 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2009/07/27 12:59:44 obache Exp $
 #
 
 DISTNAME=      irssi-icb-0.14
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    chat
 MASTER_SITES=  http://www.irssi.org/files/plugins/icb/
 DISTFILES=     ${DISTNAME}.tar.gz ${IRSSI_DISTFILE}
@@ -10,6 +10,7 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.irssi.org/
 COMMENT=       Irssi plugin to access ICB networks
+LICENSE=       gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi-icb/distinfo
--- a/chat/irssi-icb/distinfo   Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi-icb/distinfo   Mon Jul 27 12:59:44 2009 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.12 2009/04/29 12:47:23 wiz Exp $
+$NetBSD: distinfo,v 1.13 2009/07/27 12:59:44 obache Exp $
 
-SHA1 (irssi-0.8.12.tar.bz2) = 00ecca04766c51feef057b2327f67166be473fa3
-RMD160 (irssi-0.8.12.tar.bz2) = 0588e6c2df0425c4f36bd84c1621d9ad170b6a81
-Size (irssi-0.8.12.tar.bz2) = 935918 bytes
+SHA1 (irssi-0.8.13.tar.bz2) = 8ad6e5de345e64a2aad372ae237fd59a7b43f47b
+RMD160 (irssi-0.8.13.tar.bz2) = d09b76fcb6cbdacea510cefd63ad5638b623f5a3
+Size (irssi-0.8.13.tar.bz2) = 946203 bytes
 SHA1 (irssi-icb-0.14.tar.gz) = 31d7a5d04a896e0e19db44b4d76b7ac85af1a5d4
 RMD160 (irssi-icb-0.14.tar.gz) = dd104925ece6eabd0112b86b9eb6898846ba8f52
 Size (irssi-icb-0.14.tar.gz) = 172647 bytes
 SHA1 (patch-aa) = 8249c9ae3e5ae8b6110db030ee4280aa53ca1192
 SHA1 (patch-ab) = c270c35891164c9e42696e2ffc84d1e7ffaaaa2a
 SHA1 (patch-ac) = 27f9148f68e2fb612dac51ac5d9401338e926d77
-SHA1 (patch-ad) = e07327f473c253c341d83fe9b3ce1f34667b33f2
-SHA1 (patch-ae) = 0a1c916e44d70d108ba1d3b229ff1d3d72365622
+SHA1 (patch-ad) = f5cf3b9294a1a8a450f8c380ff41bbaafd425337
+SHA1 (patch-ae) = ee3ed714e2f1d136562b87cfd82bc4b58b7d80df
diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi-icb/patches/patch-ad
--- a/chat/irssi-icb/patches/patch-ad   Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi-icb/patches/patch-ad   Mon Jul 27 12:59:44 2009 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2008/07/22 09:56:17 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2009/07/27 12:59:45 obache Exp $
+
+Clarify the README.
 
 --- README.orig        2008-07-22 11:42:10.000000000 +0200
 +++ README     2008-07-22 11:46:02.000000000 +0200
diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi-icb/patches/patch-ae
--- a/chat/irssi-icb/patches/patch-ae   Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi-icb/patches/patch-ae   Mon Jul 27 12:59:44 2009 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2009/04/29 12:47:23 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2009/07/27 12:59:45 obache Exp $
+
+Use glib2 instead of glib1.
 
 --- configure.orig     2002-11-24 13:17:37.000000000 +0000
 +++ configure
diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi/Makefile
--- a/chat/irssi/Makefile       Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi/Makefile       Mon Jul 27 12:59:44 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2009/03/21 16:28:05 darcy Exp $
+# $NetBSD: Makefile,v 1.52 2009/07/27 12:59:44 obache Exp $
 
 DISTNAME=              ${IRSSI_DISTNAME}
-PKGREVISION=           2
 CATEGORIES=            chat
 MASTER_SITES=          http://www.irssi.org/files/
 EXTRACT_SUFX=          ${IRSSI_EXTRACT_SUFX}
@@ -9,6 +8,7 @@
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.irssi.org/
 COMMENT=               Secure and modular IRC client with text mode user interface
+LICENSE=               gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -22,7 +22,7 @@
 CONFIGURE_ARGS+=       --with-terminfo \
                        --with-proxy \
                        --without-ncurses \
-                       --sysconfdir=${PKG_SYSCONFDIR:Q}
+                       --sysconfdir=${PKG_SYSCONFDIR}
 
 .if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=YES
@@ -34,12 +34,12 @@
 EGDIR=         ${PREFIX}/share/examples/irssi
 CONF_FILES=    ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
 
+INSTALL_MAKE_FLAGS+=   sysconfdir=${EGDIR}
+
 .include "options.mk"
-
 .include "../../devel/glib2/buildlink3.mk"
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/config.h ${DESTDIR}${IRSSI_CONFIG_H}
        ${INSTALL_DATA} ${WRKSRC}/irssi-config ${DESTDIR}${IRSSI_CONFIG}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi/Makefile.common
--- a/chat/irssi/Makefile.common        Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi/Makefile.common        Mon Jul 27 12:59:44 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.8 2009/04/29 12:48:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2009/07/27 12:59:44 obache Exp $
 # used by chat/irssi-icb/Makefile
 
 # Specific distribution information.
-IRSSI_VERSION=         0.8.12
+IRSSI_VERSION=         0.8.13
 IRSSI_DISTNAME=                irssi-${IRSSI_VERSION}
 IRSSI_EXTRACT_SUFX=    .tar.bz2
 IRSSI_DISTFILE=                ${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX}
@@ -10,4 +10,4 @@
 # 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}/share/irssi/config.h
+IRSSI_CONFIG_H=                ${PREFIX}/include/irssi/irssi-config.h
diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi/PLIST
--- a/chat/irssi/PLIST  Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi/PLIST  Mon Jul 27 12:59:44 2009 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:37:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/07/27 12:59:44 obache Exp $
 bin/irssi
-include/irssi/config.h
+include/irssi/irssi-config.h
 include/irssi/irssi-version.h
 include/irssi/src/common.h
 include/irssi/src/core/args.h
@@ -48,7 +48,6 @@
 include/irssi/src/core/window-item-def.h
 include/irssi/src/core/window-item-rec.h
 include/irssi/src/core/write-buffer.h
-include/irssi/src/fe-common/core/autorun.h
 include/irssi/src/fe-common/core/chat-completion.h
 include/irssi/src/fe-common/core/command-history.h
 include/irssi/src/fe-common/core/completion.h
@@ -67,7 +66,6 @@
 include/irssi/src/fe-common/core/module.h
 include/irssi/src/fe-common/core/printtext.h
 include/irssi/src/fe-common/core/themes.h
-include/irssi/src/fe-common/core/translation.h
 include/irssi/src/fe-common/core/window-activity.h
 include/irssi/src/fe-common/core/window-items.h
 include/irssi/src/fe-common/core/windows-layout.h
@@ -79,6 +77,7 @@
 include/irssi/src/fe-common/irc/module.h
 include/irssi/src/fe-common/irc/notifylist/module-formats.h
 include/irssi/src/fe-common/irc/notifylist/module.h
+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
@@ -113,12 +112,8 @@
 include/irssi/src/irc/notifylist/notifylist.h
 include/irssi/src/lib-config/iconfig.h
 include/irssi/src/lib-config/module.h
-include/irssi/src/lib-popt/findme.h
-include/irssi/src/lib-popt/popt.h
-include/irssi/src/lib-popt/poptint.h
 lib/irssi/modules/libirc_proxy.la
 man/man1/irssi.1
-share/doc/irssi/botnet.txt
 share/doc/irssi/design.txt
 share/doc/irssi/faq.html
 share/doc/irssi/faq.txt
@@ -129,7 +124,6 @@
 share/doc/irssi/special_vars.txt
 share/doc/irssi/startup-HOWTO.html
 share/examples/irssi/irssi.conf
-share/irssi/config.h
 share/irssi/help/accept
 share/irssi/help/action
 share/irssi/help/admin
@@ -146,7 +140,6 @@
 share/irssi/help/connect
 share/irssi/help/ctcp
 share/irssi/help/cycle
-share/irssi/help/date
 share/irssi/help/dcc
 share/irssi/help/dehilight
 share/irssi/help/deop
@@ -157,7 +150,6 @@
 share/irssi/help/eval
 share/irssi/help/exec
 share/irssi/help/flushbuffer
-share/irssi/help/flushbuffers
 share/irssi/help/format
 share/irssi/help/hash
 share/irssi/help/help
@@ -245,7 +237,6 @@
 share/irssi/help/voice
 share/irssi/help/wait
 share/irssi/help/wall
-share/irssi/help/wallchops
 share/irssi/help/wallops
 share/irssi/help/watch
 share/irssi/help/who
@@ -266,6 +257,7 @@
 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
diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi/distinfo
--- a/chat/irssi/distinfo       Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi/distinfo       Mon Jul 27 12:59:44 2009 +0000
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.28 2008/12/04 12:53:55 tonnerre Exp $
+$NetBSD: distinfo,v 1.29 2009/07/27 12:59:44 obache Exp $
 
-SHA1 (irssi-0.8.12.tar.bz2) = 00ecca04766c51feef057b2327f67166be473fa3
-RMD160 (irssi-0.8.12.tar.bz2) = 0588e6c2df0425c4f36bd84c1621d9ad170b6a81
-Size (irssi-0.8.12.tar.bz2) = 935918 bytes
-SHA1 (patch-aa) = 3333b23ae2b2c3f8f3ef246502badf1b263103c6
-SHA1 (patch-ab) = 287fd013349b3b6761d08f69ff8aeb8820d65b8c
-SHA1 (patch-ac) = c1bb6ae10be8b52a844f3d7c1c725cd4cc6db246
-SHA1 (patch-ad) = 278e45b6cb28966f1bf1a5dfea329b164cd6ebed
-SHA1 (patch-ae) = 975777ae62374aa50ad76e83ed857927e8f3cbe8
-SHA1 (patch-af) = 47b399f9549ef9772f40bd5e7d27344bffe1cebe
-SHA1 (patch-ag) = 4716b80fa1db0edb3e68b527396fcce03de06f47
+SHA1 (irssi-0.8.13.tar.bz2) = 8ad6e5de345e64a2aad372ae237fd59a7b43f47b
+RMD160 (irssi-0.8.13.tar.bz2) = d09b76fcb6cbdacea510cefd63ad5638b623f5a3
+Size (irssi-0.8.13.tar.bz2) = 946203 bytes
+SHA1 (patch-aa) = 83a0f6def09cb283aa55b63a249a81121748232b
+SHA1 (patch-ab) = 94d44084c6b89e59e2e454a43cf8bc0e0fb34695
+SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7
+SHA1 (patch-ae) = b5475edc01da7b8778522a77155b2b76b2a7b738
diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi/patches/patch-aa
--- a/chat/irssi/patches/patch-aa       Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi/patches/patch-aa       Mon Jul 27 12:59:44 2009 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2007/10/13 16:27:15 adrianp Exp $
+$NetBSD: patch-aa,v 1.6 2009/07/27 12:59:44 obache Exp $
+
+Check if sp is a null pointer before parsing it.
 
 --- src/fe-text/tparm.c.orig   2007-10-06 10:40:39.000000000 +0100
 +++ src/fe-text/tparm.c
@@ -7,7 +9,7 @@
        pos = 0;
        termcap = 1;
 -      while (*sp != '\0') {
-+      while ((*sp != '\0') && (sp != NULL)) {
++      while ((sp != NULL) && (*sp != '\0')) {
                switch(*sp) {
                case '\\':
                        if (scan_for) {
diff -r 61d9410bacf6 -r 06b3578c1b66 chat/irssi/patches/patch-ab
--- a/chat/irssi/patches/patch-ab       Mon Jul 27 12:56:00 2009 +0000
+++ b/chat/irssi/patches/patch-ab       Mon Jul 27 12:59:44 2009 +0000
@@ -1,51 +1,19 @@
-$NetBSD: patch-ab,v 1.8 2007/10/13 16:27:15 adrianp Exp $
+$NetBSD: patch-ab,v 1.9 2009/07/27 12:59:44 obache Exp $
+
+Fix out of bounds access in event_wallops().
+
+This fixes irssi bug #662 (also known as CVE-2009-1959).
+
+http://svn.irssi.org/cgi-bin/viewvc.cgi?view=rev&root=irssi&revision=5068
 
---- Makefile.in.orig   2007-10-06 10:41:44.000000000 +0100
-+++ Makefile.in
-@@ -40,8 +40,8 @@ host_triplet = @host@
- DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
-       $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/config.h.in \
--      $(srcdir)/irssi-version.h.in $(srcdir)/irssi.spec.in \
--      $(top_srcdir)/configure \
-+      $(srcdir)/irssi-config.in $(srcdir)/irssi-version.h.in \
-+      $(srcdir)/irssi.spec.in $(top_srcdir)/configure \
-       $(top_srcdir)/src/perl/common/Makefile.PL.in \
-       $(top_srcdir)/src/perl/irc/Makefile.PL.in \
-       $(top_srcdir)/src/perl/textui/Makefile.PL.in \
-@@ -60,7 +60,8 @@ mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = src/perl/common/Makefile.PL \
-       src/perl/irc/Makefile.PL src/perl/ui/Makefile.PL \
--      src/perl/textui/Makefile.PL irssi-version.h irssi.spec
-+      src/perl/textui/Makefile.PL irssi-version.h irssi-config \
-+      irssi.spec
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \