[pkgsrc/trunk]: pkgsrc/editors/emacs20 Add patches for CVE-2008-1694 and CVE-...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b2ec899e8d3
branches:  trunk
changeset: 544162:9b2ec899e8d3
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Jul 13 17:28:33 2008 +0000

description:
Add patches for CVE-2008-1694 and CVE-2008-2142.
PKGREVISION -> 11.

diffstat:

 editors/emacs20/Makefile         |   4 ++--
 editors/emacs20/distinfo         |   5 ++++-
 editors/emacs20/patches/patch-cc |  33 +++++++++++++++++++++++++++++++++
 editors/emacs20/patches/patch-cd |  13 +++++++++++++
 editors/emacs20/patches/patch-ce |  21 +++++++++++++++++++++
 5 files changed, 73 insertions(+), 3 deletions(-)

diffs (108 lines):

diff -r 85914f6af6d2 -r 9b2ec899e8d3 editors/emacs20/Makefile
--- a/editors/emacs20/Makefile  Sun Jul 13 16:27:12 2008 +0000
+++ b/editors/emacs20/Makefile  Sun Jul 13 17:28:33 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2008/04/05 21:29:14 kristerw Exp $
+# $NetBSD: Makefile,v 1.35 2008/07/13 17:28:33 dholland Exp $
 
 DISTNAME=      emacs-20.7
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    editors
 MASTER_SITES=  http://ftp.gnu.org/pub/old-gnu/emacs/   \
                ftp://ftp.gnu.org/pub/old-gnu/emacs
diff -r 85914f6af6d2 -r 9b2ec899e8d3 editors/emacs20/distinfo
--- a/editors/emacs20/distinfo  Sun Jul 13 16:27:12 2008 +0000
+++ b/editors/emacs20/distinfo  Sun Jul 13 17:28:33 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2008/04/05 21:29:14 kristerw Exp $
+$NetBSD: distinfo,v 1.13 2008/07/13 17:28:33 dholland Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
@@ -62,3 +62,6 @@
 SHA1 (patch-bz) = c395a2acb2aa1e2c1582f6bb46a32bcfa4661b85
 SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d
 SHA1 (patch-cb) = a7e3926f4b8a107e004b731f2064493e7d436cd4
+SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b
+SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb
+SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2
diff -r 85914f6af6d2 -r 9b2ec899e8d3 editors/emacs20/patches/patch-cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs20/patches/patch-cc  Sun Jul 13 17:28:33 2008 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-cc,v 1.1 2008/07/13 17:28:34 dholland Exp $
+
+--- lisp/fast-lock.el.orig     1999-05-14 04:45:54.000000000 -0400
++++ lisp/fast-lock.el  2008-07-13 12:32:19.000000000 -0400
+@@ -277,7 +277,7 @@
+                                     (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.
+@@ -295,13 +295,18 @@
+  ((\"^/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 -r 85914f6af6d2 -r 9b2ec899e8d3 editors/emacs20/patches/patch-cd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs20/patches/patch-cd  Sun Jul 13 17:28:33 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-cd,v 1.1 2008/07/13 17:28:34 dholland Exp $
+
+--- lisp/loaddefs.el.orig      2008-07-13 12:31:55.000000000 -0400
++++ lisp/loaddefs.el   2008-07-13 12:32:23.000000000 -0400
+@@ -5345,6 +5345,8 @@
+ ;;;;;;  "fast-lock.el" (14139 58050))
+ ;;; 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
diff -r 85914f6af6d2 -r 9b2ec899e8d3 editors/emacs20/patches/patch-ce
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs20/patches/patch-ce  Sun Jul 13 17:28:33 2008 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ce,v 1.1 2008/07/13 17:28:34 dholland Exp $
+
+--- lib-src/vcdiff.orig        1997-01-01 00:33:42.000000000 -0500
++++ lib-src/vcdiff     2008-07-13 13:31:27.000000000 -0400
+@@ -66,14 +66,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