Fix for CVE-2008-2142, automatically loading and executing .flc files.

5 files changed, 54 insertions, 5 deletions

diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 30f3e275e30..761f77b6428 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2007/10/29 12:38:02 uebayasi Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/03 22:17:00 markd Exp $
 
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	editors
 COMMENT=	GNU editing macros (editor)
 
diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common
index 3403ed83a79..e716f92784f 100644
--- a/editors/emacs21/Makefile.common
+++ b/editors/emacs21/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2008/04/25 20:41:49 markd Exp $
+# $NetBSD: Makefile.common,v 1.5 2008/06/03 22:17:00 markd Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
 
@@ -83,7 +83,8 @@ post-extract:
 post-build:
 	cd ${WRKSRC}/lisp && \
 	   rm sort.elc && ${MAKE_PROGRAM} sort.elc && \
-	   rm mail/smtpmail.elc && ${MAKE_PROGRAM} mail/smtpmail.elc
+	   rm mail/smtpmail.elc && ${MAKE_PROGRAM} mail/smtpmail.elc && \
+	   rm fast-lock.elc && ${MAKE_PROGRAM} fast-lock.elc
 
 pre-install:
 	@${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo
index bc611ca2b41..f2c7c27aa42 100644
--- a/editors/emacs21/distinfo
+++ b/editors/emacs21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/06/11 13:38:30 markd Exp $
+$NetBSD: distinfo,v 1.6 2008/06/03 22:17:00 markd Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
@@ -24,6 +24,8 @@ SHA1 (patch-as) = 15ab1dcc2d6a445b119b7f2bb8a8331b4aa1fbd0
 SHA1 (patch-at) = bdd1bf7eea72a0b81677817d9b36cddaa07a189c
 SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb
 SHA1 (patch-av) = 9b6ea439df406a55310e2ca1af45ed56f1663263
+SHA1 (patch-aw) = d7d9013734853a9542fd657f1b532d3c108f88e0
+SHA1 (patch-ay) = 82e4eb371be4dff891878973888c38ca53e9f326
 SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b
 SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25
 SHA1 (patch-bb) = bf748292c57459b1240da01f9d3df16e4dc40fa2
diff --git a/editors/emacs21/patches/patch-aw b/editors/emacs21/patches/patch-aw
new file mode 100644
index 00000000000..3c66538831b
--- /dev/null
+++ b/editors/emacs21/patches/patch-aw
@@ -0,0 +1,33 @@
+$NetBSD: patch-aw,v 1.1 2008/06/03 22:17:00 markd Exp $
+
+--- lisp/fast-lock.el.orig	2001-07-16 04:15:34.000000000 +1200
++++ lisp/fast-lock.el
+@@ -278,7 +278,7 @@ for buffers in Rmail mode, and size is i
+ 				      (integer :tag "size")))))
+   :group 'fast-lock)
+ 
+-(defcustom fast-lock-cache-directories '("." "~/.emacs-flc")
++(defcustom fast-lock-cache-directories '("~/.emacs-flc")
+ ; - `internal', keep each file's Font Lock cache file in the same file.
+ ; - `external', keep each file's Font Lock cache file in the same directory.
+   "*Directories in which Font Lock cache files are saved and read.
+@@ -296,13 +296,18 @@ For example:
+  ((\"^/your/true/home/directory/\" . \".\") \"~/.emacs-flc\")
+ 
+ would cause a file's current directory to be used if the file is under your
+-home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'."
++home directory hierarchy, or otherwise the absolute directory `~/.emacs-flc'.
++For security reasons, it is not advisable to use the file's current directory
++to avoid the possibility of using the cache of another user."
+   :type '(repeat (radio (directory :tag "directory")
+ 			(cons :tag "Matching"
+ 			      (regexp :tag "regexp")
+ 			      (directory :tag "directory"))))
+   :group 'fast-lock)
+ 
++;;;###autoload
++(put 'fast-lock-cache-directories 'risky-local-variable t)
++
+ (defcustom fast-lock-save-events '(kill-buffer kill-emacs)
+   "*Events under which caches will be saved.
+ Valid events are `save-buffer', `kill-buffer' and `kill-emacs'.
diff --git a/editors/emacs21/patches/patch-ay b/editors/emacs21/patches/patch-ay
new file mode 100644
index 00000000000..887e4d92538
--- /dev/null
+++ b/editors/emacs21/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1 2008/06/03 22:17:00 markd Exp $
+
+--- lisp/loaddefs.el.orig	2003-03-19 02:36:18.000000000 +1200
++++ lisp/loaddefs.el
+@@ -6963,6 +6963,8 @@ of colors that the current display can h
+ ;;;;;;  "fast-lock.el" (15611 31344))
+ ;;; Generated autoloads from fast-lock.el
+ 
++(put (quote fast-lock-cache-directories) (quote risky-local-variable) t)
++
+ (autoload (quote fast-lock-mode) "fast-lock" "\
+ Toggle Fast Lock mode.
+ With arg, turn Fast Lock mode on if and only if arg is positive and the buffer