[98021] trunk/dports/editors/emacs23

[blair at macports.org]

Revision: 98021
          http://trac.macports.org//changeset/98021
Author:   blair at macports.org
Date:     2012-09-22 13:12:10 -0700 (Sat, 22 Sep 2012)
Log Message:
-----------
emacs23: apply patch to fix CVE-2012-3479.

Patch downloaded from:

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

Modified Paths:
--------------
    trunk/dports/editors/emacs23/Portfile

Added Paths:
-----------
    trunk/dports/editors/emacs23/files/patch-lisp_files.el.diff

Modified: trunk/dports/editors/emacs23/Portfile
===================================================================
--- trunk/dports/editors/emacs23/Portfile	2012-09-22 15:40:14 UTC (rev 98020)
+++ trunk/dports/editors/emacs23/Portfile	2012-09-22 20:12:10 UTC (rev 98021)
@@ -6,7 +6,7 @@
 
 name            emacs23
 version         23.4
-revision        1
+revision        2
 
 categories      editors
 license         GPL-3+
@@ -30,7 +30,8 @@
                 sha256  b9a2b8434052771f797d2032772eba862ff9aa143029efc72295170607289c18
 
 patchfiles      patch-configure.diff \
-                patch-src_xgselect.c.diff
+                patch-src_xgselect.c.diff \
+                patch-lisp_files.el.diff
 
 set major       [lindex [split ${version} .] 0]
 set suffix      ".${name}"

Added: trunk/dports/editors/emacs23/files/patch-lisp_files.el.diff
===================================================================
--- trunk/dports/editors/emacs23/files/patch-lisp_files.el.diff	                        (rev 0)
+++ trunk/dports/editors/emacs23/files/patch-lisp_files.el.diff	2012-09-22 20:12:10 UTC (rev 98021)
@@ -0,0 +1,32 @@
+*** lisp/files.el	2012-07-01 16:38:53 +0000
+--- lisp/files.el	2012-08-07 18:41:39 +0000
+***************
+*** 3107,3117 ****
+  	      ;; Obey `enable-local-eval'.
+  	      ((eq var 'eval)
+  	       (when enable-local-eval
+! 		 (push elt all-vars)
+! 		 (or (eq enable-local-eval t)
+! 		     (hack-one-local-variable-eval-safep (eval (quote val)))
+! 		     (safe-local-variable-p var val)
+! 		     (push elt unsafe-vars))))
+  	      ;; Ignore duplicates (except `mode') in the present list.
+  	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
+  	      ;; Accept known-safe variables.
+--- 3107,3122 ----
+  	      ;; Obey `enable-local-eval'.
+  	      ((eq var 'eval)
+  	       (when enable-local-eval
+! 		 (let ((safe (or (hack-one-local-variable-eval-safep
+! 				  (eval (quote val)))
+! 				 ;; In case previously marked safe (bug#5636).
+! 				 (safe-local-variable-p var val))))
+! 		   ;; If not safe and e-l-v = :safe, ignore totally.
+! 		   (when (or safe (not (eq enable-local-variables :safe)))
+! 		     (push elt all-vars)
+! 		     (or (eq enable-local-eval t)
+! 			 safe
+! 			 (push elt unsafe-vars))))))
+  	      ;; Ignore duplicates (except `mode') in the present list.
+  	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
+  	      ;; Accept known-safe variables.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120922/c1539a7e/attachment.html>