From owner-svn-ports-head@FreeBSD.ORG  Sun Sep 23 00:31:34 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 802A7106566C;
	Sun, 23 Sep 2012 00:31:34 +0000 (UTC)
	(envelope-from ashish@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 51AD08FC15;
	Sun, 23 Sep 2012 00:31:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8N0VYW3075281;
	Sun, 23 Sep 2012 00:31:34 GMT (envelope-from ashish@svn.freebsd.org)
Received: (from ashish@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8N0VYxs075278;
	Sun, 23 Sep 2012 00:31:34 GMT (envelope-from ashish@svn.freebsd.org)
Message-Id: <201209230031.q8N0VYxs075278@svn.freebsd.org>
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Sun, 23 Sep 2012 00:31:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304727 - in head/editors/emacs23: . files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Sep 2012 00:31:34 -0000

Author: ashish
Date: Sun Sep 23 00:31:33 2012
New Revision: 304727
URL: http://svn.freebsd.org/changeset/ports/304727

Log:
  - Fix remote code execution vulnerability
  - Bump PORTEPOCH
  
  Security:	http://www.vuxml.org/freebsd/c1e5f35e-f93d-11e1-b07f-00235a5f2c9a.html

Added:
  head/editors/emacs23/files/patch-lisp_files.el   (contents, props changed)
Modified:
  head/editors/emacs23/Makefile

Modified: head/editors/emacs23/Makefile
==============================================================================
--- head/editors/emacs23/Makefile	Sat Sep 22 23:26:57 2012	(r304726)
+++ head/editors/emacs23/Makefile	Sun Sep 23 00:31:33 2012	(r304727)
@@ -8,6 +8,7 @@
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
 PORTREVISION?=	2
+PORTEPOCH=	1
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}

Added: head/editors/emacs23/files/patch-lisp_files.el
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/emacs23/files/patch-lisp_files.el	Sun Sep 23 00:31:33 2012	(r304727)
@@ -0,0 +1,27 @@
+
+$FreeBSD$
+
+--- lisp/files.el.orig
++++ lisp/files.el
+@@ -2986,11 +2986,16 @@
+ 	      ;; 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))))
++		 (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.