Log Message:
Pullup ticket #3899 - requested by wiz
editors/emacs-nox11: security patch
editors/emacs: security patch

Revisions pulled up:
- editors/emacs-nox11/Makefile                                  1.36
- editors/emacs/Makefile                                        1.146
- editors/emacs/distinfo                                        1.58
- editors/emacs/patches/patch-lisp_files.el                     1.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Aug 13 06:53:07 UTC 2012

   Modified Files:
   	pkgsrc/editors/emacs: Makefile distinfo
   	pkgsrc/editors/emacs-nox11: Makefile
   Added Files:
   	pkgsrc/editors/emacs/patches: patch-lisp_files.el

   Log Message:
   Fix CVE-2012-3479:
   When the Emacs user option `enable-local-variables' is set to `:safe'
   (the default value is t), Emacs should automatically refuse to evaluate
   `eval' forms in file-local variable sections.  Due to the bug, Emacs
   instead automatically evaluates such `eval' forms.  Thus, if the user
   changes the value of `enable-local-variables' to `:safe', visiting a
   malicious file can cause automatic execution of arbitrary Emacs Lisp
   code with the permissions of the user.

   Bug tracker ref: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12155