Sun Feb 19 17:44:35 2012 UTC ()
Update emacs to 23.4.

Emacs 23.4 mainly fixes a security flaw in EDE (CVE-2012-0035), which
was already fixed in emacs-23.3nb1 in pkgsrc.


(minskim)
diff -r1.141 -r1.142 pkgsrc/editors/emacs/Makefile
diff -r1.33 -r1.34 pkgsrc/editors/emacs/Makefile.common
diff -r1.27 -r1.28 pkgsrc/editors/emacs/PLIST
diff -r1.55 -r1.56 pkgsrc/editors/emacs/distinfo
diff -r1.7 -r1.8 pkgsrc/editors/emacs/version.mk
diff -r1.1 -r0 pkgsrc/editors/emacs/patches/patch-CVE-2012-0035
diff -r1.1 -r0 pkgsrc/editors/emacs/patches/patch-src_unexmacosx.c
diff -r1.22 -r0 pkgsrc/editors/emacs/patches/patch-ac
cvs diff -r1.141 -r1.142 pkgsrc/editors/emacs/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Makefile 2012/02/06 12:39:59 1.141
+++ pkgsrc/editors/emacs/Makefile 2012/02/19 17:44:35 1.142
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1# $NetBSD: Makefile,v 1.141 2012/02/06 12:39:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.142 2012/02/19 17:44:35 minskim Exp $
2 
3PKGREVISION= 2 
4 2
5CONFLICTS+= emacs-nox11-[0-9]* 3CONFLICTS+= emacs-nox11-[0-9]*
6 4
7.include "../../editors/emacs/Makefile.common" 5.include "../../editors/emacs/Makefile.common"
8 6
9.include "options.mk" 7.include "options.mk"
10 8
11SUBST_CLASSES+= prefix 9SUBST_CLASSES+= prefix
12SUBST_STAGE.prefix= pre-configure 10SUBST_STAGE.prefix= pre-configure
13SUBST_VARS.prefix= PREFIX 11SUBST_VARS.prefix= PREFIX
14SUBST_FILES.prefix= src/s/netbsd.h 12SUBST_FILES.prefix= src/s/netbsd.h
15 13
16.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 14.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
cvs diff -r1.33 -r1.34 pkgsrc/editors/emacs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Makefile.common 2012/01/20 04:20:43 1.33
+++ pkgsrc/editors/emacs/Makefile.common 2012/02/19 17:44:35 1.34
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.33 2012/01/20 04:20:43 obache Exp $ 1# $NetBSD: Makefile.common,v 1.34 2012/02/19 17:44:35 minskim Exp $
2# 2#
3# used by editors/emacs/Makefile 3# used by editors/emacs/Makefile
4# used by editors/emacs-nox11/Makefile 4# used by editors/emacs-nox11/Makefile
5 5
6DISTNAME= emacs-${EMACS_VERSION}b 6DISTNAME= emacs-${EMACS_VERSION}
7CATEGORIES= editors 7CATEGORIES= editors
8MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 8MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
9 9
10MAINTAINER= minskim@NetBSD.org 10MAINTAINER= minskim@NetBSD.org
11HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 11HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
12COMMENT= GNU editing macros (editor) 12COMMENT= GNU editing macros (editor)
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//} 17WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//}
18MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
19 19
cvs diff -r1.27 -r1.28 pkgsrc/editors/emacs/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Attic/PLIST 2011/11/28 16:29:58 1.27
+++ pkgsrc/editors/emacs/Attic/PLIST 2012/02/19 17:44:35 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.27 2011/11/28 16:29:58 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.28 2012/02/19 17:44:35 minskim Exp $
2bin/b2m 2bin/b2m
3bin/ctags 3bin/ctags
4bin/ebrowse 4bin/ebrowse
5bin/emacs 5bin/emacs
6bin/emacs-${EMACS_VERSION} 6bin/emacs-${EMACS_VERSION}
7bin/emacsclient 7bin/emacsclient
8bin/etags 8bin/etags
9bin/grep-changelog 9bin/grep-changelog
10bin/rcs-checkin 10bin/rcs-checkin
11info/ada-mode 11info/ada-mode
12info/auth 12info/auth
13info/autotype 13info/autotype
14info/calc 14info/calc
@@ -75,27 +75,27 @@ man/man1/emacsclient.1 @@ -75,27 +75,27 @@ man/man1/emacsclient.1
75man/man1/etags.1 75man/man1/etags.1
76man/man1/grep-changelog.1 76man/man1/grep-changelog.1
77man/man1/rcs-checkin.1 77man/man1/rcs-checkin.1
78share/applications/emacs.desktop 78share/applications/emacs.desktop
79share/emacs/${EMACS_VERSION}/etc/AUTHORS 79share/emacs/${EMACS_VERSION}/etc/AUTHORS
80share/emacs/${EMACS_VERSION}/etc/BABYL 80share/emacs/${EMACS_VERSION}/etc/BABYL
81share/emacs/${EMACS_VERSION}/etc/CENSORSHIP 81share/emacs/${EMACS_VERSION}/etc/CENSORSHIP
82share/emacs/${EMACS_VERSION}/etc/CONTRIBUTE 82share/emacs/${EMACS_VERSION}/etc/CONTRIBUTE
83share/emacs/${EMACS_VERSION}/etc/COOKIES 83share/emacs/${EMACS_VERSION}/etc/COOKIES
84share/emacs/${EMACS_VERSION}/etc/COPYING 84share/emacs/${EMACS_VERSION}/etc/COPYING
85share/emacs/${EMACS_VERSION}/etc/DEBUG 85share/emacs/${EMACS_VERSION}/etc/DEBUG
86share/emacs/${EMACS_VERSION}/etc/DEVEL.HUMOR 86share/emacs/${EMACS_VERSION}/etc/DEVEL.HUMOR
87share/emacs/${EMACS_VERSION}/etc/DISTRIB 87share/emacs/${EMACS_VERSION}/etc/DISTRIB
88share/emacs/${EMACS_VERSION}/etc/DOC-23.3.1 88share/emacs/${EMACS_VERSION}/etc/DOC-${EMACS_VERSION}.1
89share/emacs/${EMACS_VERSION}/etc/ERC-NEWS 89share/emacs/${EMACS_VERSION}/etc/ERC-NEWS
90share/emacs/${EMACS_VERSION}/etc/ETAGS.EBNF 90share/emacs/${EMACS_VERSION}/etc/ETAGS.EBNF
91share/emacs/${EMACS_VERSION}/etc/ETAGS.README 91share/emacs/${EMACS_VERSION}/etc/ETAGS.README
92share/emacs/${EMACS_VERSION}/etc/FTP 92share/emacs/${EMACS_VERSION}/etc/FTP
93share/emacs/${EMACS_VERSION}/etc/GNU 93share/emacs/${EMACS_VERSION}/etc/GNU
94share/emacs/${EMACS_VERSION}/etc/GNUS-NEWS 94share/emacs/${EMACS_VERSION}/etc/GNUS-NEWS
95share/emacs/${EMACS_VERSION}/etc/HELLO 95share/emacs/${EMACS_VERSION}/etc/HELLO
96share/emacs/${EMACS_VERSION}/etc/INTERVIEW 96share/emacs/${EMACS_VERSION}/etc/INTERVIEW
97share/emacs/${EMACS_VERSION}/etc/JOKES 97share/emacs/${EMACS_VERSION}/etc/JOKES
98share/emacs/${EMACS_VERSION}/etc/LINUX-GNU 98share/emacs/${EMACS_VERSION}/etc/LINUX-GNU
99share/emacs/${EMACS_VERSION}/etc/MACHINES 99share/emacs/${EMACS_VERSION}/etc/MACHINES
100share/emacs/${EMACS_VERSION}/etc/MAILINGLISTS 100share/emacs/${EMACS_VERSION}/etc/MAILINGLISTS
101share/emacs/${EMACS_VERSION}/etc/MH-E-NEWS 101share/emacs/${EMACS_VERSION}/etc/MH-E-NEWS
cvs diff -r1.55 -r1.56 pkgsrc/editors/emacs/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Attic/distinfo 2012/01/19 20:50:00 1.55
+++ pkgsrc/editors/emacs/Attic/distinfo 2012/02/19 17:44:35 1.56
@@ -1,16 +1,13 @@ @@ -1,16 +1,13 @@
1$NetBSD: distinfo,v 1.55 2012/01/19 20:50:00 tez Exp $ 1$NetBSD: distinfo,v 1.56 2012/02/19 17:44:35 minskim Exp $
2 2
3SHA1 (emacs-23.3b.tar.gz) = 56503472e99bc7c875ec370dec7b40774cfa82da 3SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473
4RMD160 (emacs-23.3b.tar.gz) = d253874ecef5c09d35576cf508727f5863c80834 4RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7
5Size (emacs-23.3b.tar.gz) = 47930061 bytes 5Size (emacs-23.4.tar.gz) = 47721193 bytes
6SHA1 (patch-CVE-2012-0035) = 546dd488256268715e7434def91b42a3709daea2 
7SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50 6SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50
8SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e 7SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e
9SHA1 (patch-ac) = bcaff0bd9039c6326df900044a391e15f744af4a 
10SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9 8SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9
11SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9 9SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9
12SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5 10SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5
13SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3 11SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3
14SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9 12SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9
15SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507 13SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507
16SHA1 (patch-src_unexmacosx.c) = 5821eb65c1e10192a7b2679691e4651b8d9fb263 
cvs diff -r1.7 -r1.8 pkgsrc/editors/emacs/Attic/version.mk (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Attic/version.mk 2011/06/09 13:47:31 1.7
+++ pkgsrc/editors/emacs/Attic/version.mk 2012/02/19 17:44:35 1.8
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1# $NetBSD: version.mk,v 1.7 2011/06/09 13:47:31 drochner Exp $ 1# $NetBSD: version.mk,v 1.8 2012/02/19 17:44:35 minskim Exp $
2 2
3_EMACS_FLAVOR= emacs 3_EMACS_FLAVOR= emacs
4_EMACS_REQD= emacs>=23.2<24 4_EMACS_REQD= emacs>=23.2<24
5 5
6_EMACS_VERSION_MAJOR= 23 6_EMACS_VERSION_MAJOR= 23
7_EMACS_VERSION_MINOR= 3 7_EMACS_VERSION_MINOR= 4
File Deleted: pkgsrc/editors/emacs/patches/Attic/patch-CVE-2012-0035
File Deleted: pkgsrc/editors/emacs/patches/Attic/patch-src_unexmacosx.c
File Deleted: pkgsrc/editors/emacs/patches/Attic/patch-ac