[pkgsrc/pkgsrc-2011Q1]: pkgsrc/x11/vte Pullup ticket #3457 - requested by dro...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5cd258e13474
branches:  pkgsrc-2011Q1
changeset: 587316:5cd258e13474
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jun 15 18:14:43 2011 +0000

description:
Pullup ticket #3457 - requested by drochner
x11/vte: security patch

Revisions pulled up:
- x11/vte/Makefile                                              1.85
- x11/vte/distinfo                                              1.48
- x11/vte/patches/patch-aj                                      1.3

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Fri Jun 10 17:07:16 UTC 2011

   Modified Files:
           pkgsrc/x11/vte: Makefile distinfo
   Added Files:
           pkgsrc/x11/vte/patches: patch-aj

   Log Message:
   add a patch from Gnome bugzille to fix a bug where the terminal could
   be sent into an endless loop allocating memory by a simple escape sequence
   bump PKGREV

diffstat:

 x11/vte/Makefile         |   4 +-
 x11/vte/distinfo         |   3 +-
 x11/vte/patches/patch-aj |  60 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 3 deletions(-)

diffs (93 lines):

diff -r b039d760e480 -r 5cd258e13474 x11/vte/Makefile
--- a/x11/vte/Makefile  Tue Jun 14 11:52:41 2011 +0000
+++ b/x11/vte/Makefile  Wed Jun 15 18:14:43 2011 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.83 2011/03/03 12:05:22 obache Exp $
+# $NetBSD: Makefile,v 1.83.2.1 2011/06/15 18:14:43 tron Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   3
 CATEGORIES=    x11
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r b039d760e480 -r 5cd258e13474 x11/vte/distinfo
--- a/x11/vte/distinfo  Tue Jun 14 11:52:41 2011 +0000
+++ b/x11/vte/distinfo  Wed Jun 15 18:14:43 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2010/11/16 13:53:06 drochner Exp $
+$NetBSD: distinfo,v 1.47.4.1 2011/06/15 18:14:43 tron Exp $
 
 SHA1 (vte-0.26.2.tar.bz2) = 4c8fb07403538b7f743ec1d7af7b127683c7b9c2
 RMD160 (vte-0.26.2.tar.bz2) = 22a2217f69c2f64090a9d45105047fb1a440b07f
@@ -9,3 +9,4 @@
 SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
 SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764
 SHA1 (patch-ai) = 986dd7c2a5778c9c35100901cfaa25acd0cbdc32
+SHA1 (patch-aj) = 7d4d272bd86948f93b9218d6268332e0ece677f0
diff -r b039d760e480 -r 5cd258e13474 x11/vte/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/vte/patches/patch-aj  Wed Jun 15 18:14:43 2011 +0000
@@ -0,0 +1,60 @@
+$NetBSD: patch-aj,v 1.4.2.2 2011/06/15 18:14:44 tron Exp $
+
+gnome bug #652124
+
+--- src/vteseq.c.orig  2010-08-09 11:38:44.000000000 +0000
++++ src/vteseq.c
+@@ -532,9 +532,10 @@ vte_sequence_handler_offset(VteTerminal 
+ 
+ /* Call another function a given number of times, or once. */
+ static void
+-vte_sequence_handler_multiple(VteTerminal *terminal,
+-                            GValueArray *params,
+-                            VteTerminalSequenceHandler handler)
++vte_sequence_handler_multiple_limited(VteTerminal *terminal,
++                                      GValueArray *params,
++                                      VteTerminalSequenceHandler handler,
++                                      glong max)
+ {
+       long val = 1;
+       int i;
+@@ -544,13 +545,29 @@ vte_sequence_handler_multiple(VteTermina
+               value = g_value_array_get_nth(params, 0);
+               if (G_VALUE_HOLDS_LONG(value)) {
+                       val = g_value_get_long(value);
+-                      val = MAX(val, 1);      /* FIXME: vttest. */
++                      val = CLAMP(val, 1, max);       /* FIXME: vttest. */
+               }
+       }
+       for (i = 0; i < val; i++)
+               handler (terminal, NULL);
+ }
+ 
++static void
++vte_sequence_handler_multiple(VteTerminal *terminal,
++                              GValueArray *params,
++                              VteTerminalSequenceHandler handler)
++{
++        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
++}
++
++static void
++vte_sequence_handler_multiple_r(VteTerminal *terminal,
++                                GValueArray *params,
++                                VteTerminalSequenceHandler handler)
++{
++        vte_sequence_handler_multiple_limited(terminal, params, handler,
++                                              terminal->column_count - terminal->pvt->screen->cursor_current.col);
++}
+ 
+ /* Manipulate certain terminal attributes. */
+ static void
+@@ -1570,7 +1587,7 @@ vte_sequence_handler_ic (VteTerminal *te
+ static void
+ vte_sequence_handler_IC (VteTerminal *terminal, GValueArray *params)
+ {
+-      vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_ic);
++      vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_ic);
+ }
+ 
+ /* Begin insert mode. */