diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2012-09-23 00:31:33 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2012-09-23 00:31:33 +0000 |
| commit | bc2170134f420d27d94002ec19e2b924bad1cdac (patch) | |
| tree | afd815b888b22b6be62243fb2dfb30840c23087a /editors/emacs23 | |
| parent | This port can't be built with FORCE_MAKE_JOBS (diff) | |
- Fix remote code execution vulnerability
- Bump PORTEPOCH
Security: http://www.vuxml.org/freebsd/c1e5f35e-f93d-11e1-b07f-00235a5f2c9a.html
Notes
Notes:
svn path=/head/; revision=304727
Diffstat (limited to 'editors/emacs23')
| -rw-r--r-- | editors/emacs23/Makefile | 1 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-lisp_files.el | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index 8600c907813f..8737a9dd769f 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -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} diff --git a/editors/emacs23/files/patch-lisp_files.el b/editors/emacs23/files/patch-lisp_files.el new file mode 100644 index 000000000000..26b91ec6467d --- /dev/null +++ b/editors/emacs23/files/patch-lisp_files.el @@ -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. |