[pkgsrc/pkgsrc-2003Q4]: pkgsrc/misc/screen Pullup security fixes to the pkgsr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c64f19f86821
branches:  pkgsrc-2003Q4
changeset: 463696:c64f19f86821
user:      agc <agc%pkgsrc.org@localhost>
date:      Sun Dec 07 16:52:47 2003 +0000

description:
Pullup security fixes to the pkgsrc-2003Q4 branch, requested by
Alistair Crooks.

        Date: 2003/11/27 20:29:48
        Author: wiz
        Log:
        Fix
                http://www.securityfocus.com/archive/1/345844
        with the patches supplied there.
        Bump PKGREVISION to 1.

diffstat:

 misc/screen/Makefile         |   3 ++-
 misc/screen/distinfo         |   4 +++-
 misc/screen/patches/patch-ab |  13 +++++++++++++
 misc/screen/patches/patch-ac |  22 ++++++++++++++++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)

diffs (70 lines):

diff -r a389d4f579a4 -r c64f19f86821 misc/screen/Makefile
--- a/misc/screen/Makefile      Sun Dec 07 16:36:49 2003 +0000
+++ b/misc/screen/Makefile      Sun Dec 07 16:52:47 2003 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2003/09/22 21:00:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.48.2.1 2003/12/07 16:52:47 agc Exp $
 
 DISTNAME=      screen-4.0.1
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
                ${MASTER_SITE_GNU:=screen/}
diff -r a389d4f579a4 -r c64f19f86821 misc/screen/distinfo
--- a/misc/screen/distinfo      Sun Dec 07 16:36:49 2003 +0000
+++ b/misc/screen/distinfo      Sun Dec 07 16:52:47 2003 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.14 2003/09/22 21:00:43 hubertf Exp $
+$NetBSD: distinfo,v 1.14.2.1 2003/12/07 16:52:47 agc Exp $
 
 SHA1 (screen-4.0.1.tar.gz) = 61f24b18c56b5862c769345d204f57b1e7f222ab
 Size (screen-4.0.1.tar.gz) = 837445 bytes
 SHA1 (patch-aa) = 57a7800823cf46c42011f7703fd9949bc614736d
+SHA1 (patch-ab) = d62818fcf5a0b56f904ac22dc074e312617b3f2c
+SHA1 (patch-ac) = 259fa60ecfe98bfde09a11bc54ad7270c8ecba60
 SHA1 (patch-ae) = dcdbb1ca08e36308f5659a90a5b6f31fb3a45691
 SHA1 (patch-ai) = a3d2c7d2ef3db9deb7a5e70ed7f906efd3196af6
 SHA1 (patch-aj) = 8aa5c79e483e500ca9b3ed978835bbf1a866a5dc
diff -r a389d4f579a4 -r c64f19f86821 misc/screen/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/screen/patches/patch-ab      Sun Dec 07 16:52:47 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7.2.1 2003/12/07 16:52:47 agc Exp $
+
+--- ansi.c.orig        Mon Sep  8 16:24:44 2003
++++ ansi.c
+@@ -559,7 +559,7 @@ register int len;
+           {
+           case '0': case '1': case '2': case '3': case '4':
+           case '5': case '6': case '7': case '8': case '9':
+-            if (curr->w_NumArgs < MAXARGS)
++            if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
+               {
+                 if (curr->w_args[curr->w_NumArgs] < 100000000)
+                   curr->w_args[curr->w_NumArgs] =
diff -r a389d4f579a4 -r c64f19f86821 misc/screen/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/screen/patches/patch-ac      Sun Dec 07 16:52:47 2003 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.5.2.1 2003/12/07 16:52:47 agc Exp $
+
+--- resize.c.orig      Mon Sep  8 16:26:31 2003
++++ resize.c
+@@ -682,6 +682,17 @@ int wi, he, hi;
+   if (wi == 0)
+     he = hi = 0;
+ 
++  if (wi > 1000)
++    {
++      Msg(0, "Window width too large, truncated");
++      wi = 1000;
++    }
++  if (he > 1000)
++    {
++      Msg(0, "Window height too large, truncated");
++      he = 1000;
++    }
++
+   if (p->w_width == wi && p->w_height == he && p->w_histheight == hi)
+     {
+       debug("ChangeWindowSize: No change.\n");