diff options
| author | rtr <rtr@pkgsrc.org> | 2008-06-29 10:25:43 +0000 |
|---|---|---|
| committer | rtr <rtr@pkgsrc.org> | 2008-06-29 10:25:43 +0000 |
| commit | 87965a655d93d3ececa890ad3647ad910d7c17ce (patch) | |
| tree | e87dd130683a7ba120dce0b49a854152977df0e3 | |
| parent | e28a28ff12876b377dc3f0905d0cd5d1a4808456 (diff) | |
| download | pkgsrc-87965a655d93d3ececa890ad3647ad910d7c17ce.tar.gz | |
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).
| -rw-r--r-- | devel/nasm/Makefile | 3 | ||||
| -rw-r--r-- | devel/nasm/distinfo | 3 | ||||
| -rw-r--r-- | devel/nasm/patches/patch-ad | 13 |
3 files changed, 17 insertions, 2 deletions
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile index 5476b98410b..0e59bc4edc0 100644 --- a/devel/nasm/Makefile +++ b/devel/nasm/Makefile @@ -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 --git a/devel/nasm/distinfo b/devel/nasm/distinfo index b59ec80bd31..79c28e41971 100644 --- a/devel/nasm/distinfo +++ b/devel/nasm/distinfo @@ -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 @@ Size (nasm-2.02.tar.bz2) = 729602 bytes SHA1 (patch-aa) = 3f05734250b81898f15fc4323d95ec5606c91cb1 SHA1 (patch-ab) = c38aa7866a741906c6cee34a99b4cc502abdcbb0 SHA1 (patch-ac) = 35b69553570023019193c9de915913b1994dcd5b +SHA1 (patch-ad) = a6298aea005cbac946a6e7585d11fdb98a8446cb diff --git a/devel/nasm/patches/patch-ad b/devel/nasm/patches/patch-ad new file mode 100644 index 00000000000..888b5010aeb --- /dev/null +++ b/devel/nasm/patches/patch-ad @@ -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); + } |