From ed69853f2a3779e74f43092c7577a02357051397 Mon Sep 17 00:00:00 2001
From: aanriot <aanriot@openbsd.org>
Date: Sat, 10 Dec 2005 11:57:40 +0000
Subject: [PATCH] - update to 21.4 (format-string vulnerability patch merged).
 - fix a buffer size.

maintainer timeout; ok mbalmer@ alek@
---
 editors/emacs21/Makefile                         |  7 +++----
 editors/emacs21/distinfo                         | 16 ++++++++--------
 editors/emacs21/patches/patch-lib-src_cvtmail_c  | 12 ++++++++++++
 editors/emacs21/patches/patch-lib-src_movemail_c | 12 ------------
 editors/emacs21/pkg/PLIST                        |  3 +--
 editors/emacs21/pkg/PLIST-el                     |  4 +---
 6 files changed, 25 insertions(+), 29 deletions(-)
 create mode 100644 editors/emacs21/patches/patch-lib-src_cvtmail_c
 delete mode 100644 editors/emacs21/patches/patch-lib-src_movemail_c

diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 22e403dc6bd..69a27c111eb 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2005/10/04 16:43:29 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.29 2005/12/10 11:57:40 aanriot Exp $
 
 .if ${MACHINE_ARCH} == "hppa"
 BROKEN=			"hangs indefinitely until machine panics/hangs"
@@ -8,9 +8,8 @@ COMMENT=		"GNU editor: extensible, customizable, self documenting"
 COMMENT-el=		"elisp sources for those who want to read/modify them"
 COMMENT-leim=		"Library of Emacs Input Methods"
 
-VERSION=		21.3
+VERSION=		21.4
 DISTNAME=		emacs-${VERSION}
-PKGNAME=		${DISTNAME}p3
 FULLPKGNAME-el=		emacs-el-${VERSION}
 FULLPKGNAME-leim=	emacs-leim-${VERSION}
 
@@ -27,7 +26,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_GNU:=emacs/}
-DISTFILES=		emacs-${VERSION}.tar.gz leim-${VERSION}.tar.gz
+DISTFILES=		emacs-${VERSION}a.tar.gz leim-${VERSION}.tar.gz
 
 MULTI_PACKAGES=		-el -leim
 SUBPACKAGE?=
diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo
index ade913fea76..b9468e2091e 100644
--- a/editors/emacs21/distinfo
+++ b/editors/emacs21/distinfo
@@ -1,8 +1,8 @@
-MD5 (emacs-21.3.tar.gz) = a0bab457cbf5b4f8eb99d1d0a3ada420
-MD5 (leim-21.3.tar.gz) = 1c968c37e22be0f0d8f8cd57cebe5a5e
-RMD160 (emacs-21.3.tar.gz) = 07171ac4c7085904da70ceb097c39dc21983d9ca
-RMD160 (leim-21.3.tar.gz) = d55d41e506a6a40b6990dd9435d69aaba14513ac
-SHA1 (emacs-21.3.tar.gz) = a8aae1b619e50ed6fed5b1351b54b38ed98c61b8
-SHA1 (leim-21.3.tar.gz) = a540ba0cb8be99f3dcef904110ac381b07add744
-SIZE (emacs-21.3.tar.gz) = 20399831
-SIZE (leim-21.3.tar.gz) = 3291224
+MD5 (emacs-21.4a.tar.gz) = 8f9d97cbd126121bd5d97e5e31168a87
+MD5 (leim-21.4.tar.gz) = 32938cb5a7505d995a1e835639d19707
+RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
+RMD160 (leim-21.4.tar.gz) = 89e1108bfe06425a0d6b4d941f9c297551bafcca
+SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
+SHA1 (leim-21.4.tar.gz) = dd63f9aca1a58d40d9d426dd410fb627230974f7
+SIZE (emacs-21.4a.tar.gz) = 20403483
+SIZE (leim-21.4.tar.gz) = 3291433
diff --git a/editors/emacs21/patches/patch-lib-src_cvtmail_c b/editors/emacs21/patches/patch-lib-src_cvtmail_c
new file mode 100644
index 00000000000..44418c8ea26
--- /dev/null
+++ b/editors/emacs21/patches/patch-lib-src_cvtmail_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib-src_cvtmail_c,v 1.1 2005/12/10 11:57:40 aanriot Exp $
+--- lib-src/cvtmail.c.orig	Mon Oct 10 21:40:20 2005
++++ lib-src/cvtmail.c	Mon Oct 10 21:40:30 2005
+@@ -60,7 +60,7 @@ main (int argc, char *argv[])
+   FILE *mfilef;
+   FILE *cff;
+   char pre[10];
+-  char name[14];
++  char name[15];
+   int c;
+ 
+   hd = getenv ("HOME");
diff --git a/editors/emacs21/patches/patch-lib-src_movemail_c b/editors/emacs21/patches/patch-lib-src_movemail_c
deleted file mode 100644
index 6dbb3099abf..00000000000
--- a/editors/emacs21/patches/patch-lib-src_movemail_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib-src_movemail_c,v 1.1 2005/02/09 03:48:43 brad Exp $
---- lib-src/movemail.c.orig	Tue Feb  8 20:30:56 2005
-+++ lib-src/movemail.c	Tue Feb  8 20:32:28 2005
-@@ -787,7 +787,7 @@ popmail (mailbox, outfile, preserve, pas
-       mbx_delimit_begin (mbf);
-       if (pop_retr (server, i, mbf) != OK)
- 	{
--	  error (Errmsg, 0, 0);
-+	  error ("%s", Errmsg, 0);
- 	  close (mbfi);
- 	  return (1);
- 	}
diff --git a/editors/emacs21/pkg/PLIST b/editors/emacs21/pkg/PLIST
index bb36eef7bb4..20c32effa8b 100644
--- a/editors/emacs21/pkg/PLIST
+++ b/editors/emacs21/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2004/09/15 17:56:44 espie Exp $
+@comment $OpenBSD: PLIST,v 1.13 2005/12/10 11:57:40 aanriot Exp $
 bin/b2m
 bin/ctags
 bin/ebrowse
@@ -12,7 +12,6 @@ bin/rcs-checkin
 @info info/autotype
 @info info/ccmode
 @info info/cl
-@comment info/dir
 @info info/dired-x
 @info info/ebrowse
 @info info/ediff
diff --git a/editors/emacs21/pkg/PLIST-el b/editors/emacs21/pkg/PLIST-el
index 1ccc8f2f30c..1ba34e206df 100644
--- a/editors/emacs21/pkg/PLIST-el
+++ b/editors/emacs21/pkg/PLIST-el
@@ -1,7 +1,5 @@
-@comment $OpenBSD: PLIST-el,v 1.2 2005/08/13 18:19:32 espie Exp $
-share/emacs/${VERSION}/leim/ja-dic/
+@comment $OpenBSD: PLIST-el,v 1.3 2005/12/10 11:57:40 aanriot Exp $
 share/emacs/${VERSION}/leim/ja-dic/ja-dic.el
-share/emacs/${VERSION}/leim/quail/
 share/emacs/${VERSION}/leim/quail/4Corner.el
 share/emacs/${VERSION}/leim/quail/ARRAY30.el
 share/emacs/${VERSION}/leim/quail/CCDOSPY.el