[pkgsrc/pkgsrc-2008Q1]: pkgsrc/devel/nasm pullup ticket #2429 - requested by ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61302ab42977
branches:  pkgsrc-2008Q1
changeset: 540440:61302ab42977
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Sun Jun 29 10:25:43 2008 +0000

description:
pullup ticket #2429 - requested by tron
nasm:  fixes bug in nasm which is a "possible" security issue

revisions pulled up:
pkgsrc/devel/nasm/Makefile              1.36
pkgsrc/devel/nasm/distinfo              1.16
pkgsrc/devel/nasm/patches/patch-ad      1.8

   Module Name: pkgsrc
   Committed By:        tron
   Date:                Tue Jun 17 14:06:25 UTC 2008

   Modified Files:
        pkgsrc/devel/nasm: Makefile distinfo
   Added Files:
        pkgsrc/devel/nasm/patches: patch-ad

   Log Message:
   Add a patch from the "nasm" GIT repository to fix a crash triggered by
   certain assembler files. This closes the security hole reported in SA30594
   (which is IMHO highly debatable).

diffstat:

 devel/nasm/Makefile         |   3 ++-
 devel/nasm/distinfo         |   3 ++-
 devel/nasm/patches/patch-ad |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r a4032bf29898 -r 61302ab42977 devel/nasm/Makefile
--- a/devel/nasm/Makefile       Sat Jun 28 12:02:32 2008 +0000
+++ b/devel/nasm/Makefile       Sun Jun 29 10:25:43 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2008/03/12 21:16:12 drochner Exp $
+# $NetBSD: Makefile,v 1.35.2.1 2008/06/29 10:25:43 rtr Exp $
 
 DISTNAME=      nasm-2.02
+PKGREVISION=   1
 CATEGORIES=    devel lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nasm/}
 EXTRACT_SUFX=  .tar.bz2
diff -r a4032bf29898 -r 61302ab42977 devel/nasm/distinfo
--- a/devel/nasm/distinfo       Sat Jun 28 12:02:32 2008 +0000
+++ b/devel/nasm/distinfo       Sun Jun 29 10:25:43 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2008/03/12 21:16:12 drochner Exp $
+$NetBSD: distinfo,v 1.15.2.1 2008/06/29 10:25:43 rtr Exp $
 
 SHA1 (nasm-2.02.tar.bz2) = 40c5b7bd73fa3f6cdf1712388ef43962185871e8
 RMD160 (nasm-2.02.tar.bz2) = 3205b97be60f05704f4b102496bfd4e331cf9116
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 3f05734250b81898f15fc4323d95ec5606c91cb1
 SHA1 (patch-ab) = c38aa7866a741906c6cee34a99b4cc502abdcbb0
 SHA1 (patch-ac) = 35b69553570023019193c9de915913b1994dcd5b
+SHA1 (patch-ad) = a6298aea005cbac946a6e7585d11fdb98a8446cb
diff -r a4032bf29898 -r 61302ab42977 devel/nasm/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nasm/patches/patch-ad       Sun Jun 29 10:25:43 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.7.2.1 2008/06/29 10:25:43 rtr Exp $
+
+--- preproc.c.orig     2008-02-19 19:08:57.000000000 +0000
++++ preproc.c  2008-06-17 15:01:56.000000000 +0100
+@@ -1074,7 +1074,7 @@
+         }
+ 
+         for (r = p, s = ourcopy; *r; r++) {
+-          if (r > p+MAX_KEYWORD)
++          if (r >= p+MAX_KEYWORD)
+               return tokval->t_type = TOKEN_ID; /* Not a keyword */
+             *s++ = tolower(*r);
+       }