Mon Aug 13 06:38:50 2012 UTC ()
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

Bump PKGREVISION.


(wiz)
diff -r1.3 -r1.4 pkgsrc/editors/emacs24/Makefile
diff -r1.3 -r1.4 pkgsrc/editors/emacs24/distinfo
diff -r1.2 -r1.3 pkgsrc/editors/emacs24-nox11/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/editors/emacs24/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/Makefile 2012/06/29 06:31:35 1.3
+++ pkgsrc/editors/emacs24/Attic/Makefile 2012/08/13 06:38:50 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2012/06/29 06:31:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2012/08/13 06:38:50 wiz Exp $
2 2
3CONFLICTS+= emacs-nox11-[0-9]* 3CONFLICTS+= emacs-nox11-[0-9]*
4 4
5.include "../../editors/emacs24/Makefile.common" 5.include "../../editors/emacs24/Makefile.common"
6PKGREVISION= 1 6PKGREVISION= 2
7 7
8.include "options.mk" 8.include "options.mk"
9 9
10SUBST_CLASSES+= prefix 10SUBST_CLASSES+= prefix
11SUBST_STAGE.prefix= pre-configure 11SUBST_STAGE.prefix= pre-configure
12SUBST_VARS.prefix= PREFIX 12SUBST_VARS.prefix= PREFIX
13SUBST_FILES.prefix= src/s/netbsd.h 13SUBST_FILES.prefix= src/s/netbsd.h
14 14
15.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 15.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
16.include "../../sysutils/desktop-file-utils/desktopdb.mk" 16.include "../../sysutils/desktop-file-utils/desktopdb.mk"
17.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/editors/emacs24/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/distinfo 2012/08/10 10:08:14 1.3
+++ pkgsrc/editors/emacs24/Attic/distinfo 2012/08/13 06:38:50 1.4
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.3 2012/08/10 10:08:14 marino Exp $ 1$NetBSD: distinfo,v 1.4 2012/08/13 06:38:50 wiz Exp $
2 2
3SHA1 (emacs-24.1.tar.gz) = f064396724a27c83b79b2d890d188abebaa5975e 3SHA1 (emacs-24.1.tar.gz) = f064396724a27c83b79b2d890d188abebaa5975e
4RMD160 (emacs-24.1.tar.gz) = 0fed00042339f46b29449bd561d2f881d13d8d38 4RMD160 (emacs-24.1.tar.gz) = 0fed00042339f46b29449bd561d2f881d13d8d38
5Size (emacs-24.1.tar.gz) = 51473111 bytes 5Size (emacs-24.1.tar.gz) = 51473111 bytes
6SHA1 (patch-aa) = dc41270debcdeba46056590ff99e72e79bd04729 6SHA1 (patch-aa) = dc41270debcdeba46056590ff99e72e79bd04729
7SHA1 (patch-ab) = 3021afead5011aa864a2734eeb72136c36580fb2 7SHA1 (patch-ab) = 3021afead5011aa864a2734eeb72136c36580fb2
8SHA1 (patch-ad) = adc347ccd6edeb6e7ad96eeb98d6ee64176fb143 8SHA1 (patch-ad) = adc347ccd6edeb6e7ad96eeb98d6ee64176fb143
9SHA1 (patch-ag) = 3e6ee4774189185af10eada9c935120491318313 9SHA1 (patch-ag) = 3e6ee4774189185af10eada9c935120491318313
 10SHA1 (patch-lisp_files.el) = 9963e3b6485ae569818f64ab878c3eb46895333d
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs24-nox11/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs24-nox11/Attic/Makefile 2012/06/26 17:02:31 1.2
+++ pkgsrc/editors/emacs24-nox11/Attic/Makefile 2012/08/13 06:38:50 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.2 2012/06/26 17:02:31 asau Exp $ 1# $NetBSD: Makefile,v 1.3 2012/08/13 06:38:50 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-nox11-/} 3PKGNAME= ${DISTNAME:S/-/-nox11-/}
4PKGREVISION= 1 4PKGREVISION= 2
5 5
6CONFLICTS+= emacs-[0-9]* 6CONFLICTS+= emacs-[0-9]*
7 7
8FILESDIR= ${.CURDIR}/../../editors/emacs24/files 8FILESDIR= ${.CURDIR}/../../editors/emacs24/files
9PATCHDIR= ${.CURDIR}/../../editors/emacs24/patches 9PATCHDIR= ${.CURDIR}/../../editors/emacs24/patches
10PKGDIR= ${.CURDIR}/../../editors/emacs24 10PKGDIR= ${.CURDIR}/../../editors/emacs24
11 11
12.include "../../editors/emacs24/Makefile.common" 12.include "../../editors/emacs24/Makefile.common"
13 13
14CONFIGURE_ARGS+= --without-dbus --without-m17n-flt --without-otf \ 14CONFIGURE_ARGS+= --without-dbus --without-m17n-flt --without-otf \
15 --without-rsvg --without-x --without-xft \ 15 --without-rsvg --without-x --without-xft \
16 --without-gif --without-jpeg --without-png \ 16 --without-gif --without-jpeg --without-png \
17 --without-tiff --without-xpm 17 --without-tiff --without-xpm