diff options
| author | dholland <dholland> | 2008-07-13 18:03:01 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2008-07-13 18:03:01 +0000 |
| commit | 0a2226a59c7384416687fe4ae063520f21145bef (patch) | |
| tree | 7b360426daec1e8fc00b81242f9e038028b8b2a7 /editors | |
| parent | 8d3daf40b300ba78c5de386e02a7c726b3c6f9c5 (diff) | |
| download | pkgsrc-0a2226a59c7384416687fe4ae063520f21145bef.tar.gz | |
Add patch for CVE-2008-1694 (insecure temp files in SCCS vc handling)
PKGREVISION -> 13.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs21/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs21/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs21/patches/patch-al | 38 |
3 files changed, 42 insertions, 3 deletions
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile index 761f77b6428..b7a9f67b847 100644 --- a/editors/emacs21/Makefile +++ b/editors/emacs21/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2008/06/03 22:17:00 markd Exp $ +# $NetBSD: Makefile,v 1.10 2008/07/13 18:03:01 dholland Exp $ -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= editors COMMENT= GNU editing macros (editor) diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo index f2c7c27aa42..b1fc10ebb30 100644 --- a/editors/emacs21/distinfo +++ b/editors/emacs21/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2008/06/03 22:17:00 markd Exp $ +$NetBSD: distinfo,v 1.7 2008/07/13 18:03:01 dholland Exp $ SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a @@ -14,6 +14,7 @@ SHA1 (patch-ah) = 6cd1b122b370ee7110e096088a132cd420356714 SHA1 (patch-ai) = 20fb931d649a55ae7ee6eb27ec5ba7cc938db0f7 SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7 SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b +SHA1 (patch-al) = 124356413e49d056d513d905b9e6afda28817be6 SHA1 (patch-am) = 7109d3a5cf1470e11e33abe97297cde24cf0ec91 SHA1 (patch-an) = b541a2e78398aba03a43bf5b38140661dd959e76 SHA1 (patch-ao) = 6e57a5a12742a09c2365933f580717ded232cf51 diff --git a/editors/emacs21/patches/patch-al b/editors/emacs21/patches/patch-al new file mode 100644 index 00000000000..8b6da38c172 --- /dev/null +++ b/editors/emacs21/patches/patch-al @@ -0,0 +1,38 @@ +$NetBSD: patch-al,v 1.1 2008/07/13 18:03:01 dholland Exp $ + +--- lib-src/vcdiff.orig 2001-02-20 07:36:28.000000000 -0500 ++++ lib-src/vcdiff 2008-07-13 14:05:46.000000000 -0400 +@@ -3,14 +3,14 @@ + # Enhanced sccs diff utility for use with vc mode. + # This version is more compatible with rcsdiff(1). + # +-# Copyright (C) 1992, 1993, 1995, 1997, 2001 ++# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2008 + # Free Software Foundation, Inc. + # + # This file is part of GNU Emacs. + # + # GNU Emacs is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) ++# the Free Software Foundation; either version 3, or (at your option) + # any later version. + # + # GNU Emacs is distributed in the hope that it will be useful, +@@ -86,14 +86,14 @@ + case $f in + s.* | */s.*) + if +- rev1=/tmp/geta$$ ++ rev1=`mktemp /tmp/geta.XXXXXXXX` + get -s -p -k $sid1 "$f" > $rev1 && + case $sid2 in + '') + workfile=`expr " /$f" : '.*/s.\(.*\)'` + ;; + *) +- rev2=/tmp/getb$$ ++ rev2=`mktemp /tmp/getb.XXXXXXXX` + get -s -p -k $sid2 "$f" > $rev2 + workfile=$rev2 + esac |