Pullup ticket 307 - requested by Matthias Drochner

security fix for emacs

Revisions pulled up:
- pkgsrc/editors/emacs/Makefile           1.76
- pkgsrc/editors/emacs/distinfo           1.17
- pkgsrc/editors/emacs/patches/patch-al   1.5
- pkgsrc/editors/emacs-nox11/Makefile     1.11
- pkgsrc/editors/emacs20/Makefile         1.15
- pkgsrc/editors/emacs20/distinfo         1.6
- pkgsrc/editors/emacs20/patches/patch-ca 1.1

   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Wed Feb  9 16:09:43 UTC 2005

   Modified Files:
           pkgsrc/editors/emacs: Makefile distinfo
           pkgsrc/editors/emacs-nox11: Makefile
           pkgsrc/editors/emacs20: Makefile distinfo
   Added Files:
           pkgsrc/editors/emacs/patches: patch-al
           pkgsrc/editors/emacs20/patches: patch-ca

   Log Message:
   fix format string vulnerability (CAN-2005-0100), bump PKGREVISION

7 files changed, 36 insertions, 8 deletions

diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 899df253131..1a3e13b0f3d 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/04/12 10:53:07 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10.6.1 2005/02/24 23:51:41 salo Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 
 DISTNAME=	emacs-21.3
 PKGNAME=	emacs-nox11-21.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index ff08b92ffc5..980b3b1d158 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2004/10/03 00:14:38 tv Exp $
+# $NetBSD: Makefile,v 1.74.2.1 2005/02/24 23:51:41 salo Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 
 DISTNAME=	emacs-21.3
-PKGREVISION=	5
+PKGREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 678207c8016..089f08aa7b0 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2004/07/31 21:01:54 kristerw Exp $
+$NetBSD: distinfo,v 1.16.4.1 2005/02/24 23:51:41 salo Exp $
 
 SHA1 (emacs-21.3.tar.gz) = a8aae1b619e50ed6fed5b1351b54b38ed98c61b8
 Size (emacs-21.3.tar.gz) = 20399831 bytes
@@ -8,5 +8,6 @@ SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
 SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620
 SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b
+SHA1 (patch-al) = 38cdc0b2611ea6f437d76abbc213139ade8c88f8
 SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb
 SHA1 (patch-xx) = a818041b6c851f8a675b17d4c7372ddb5f468c53
diff --git a/editors/emacs/patches/patch-al b/editors/emacs/patches/patch-al
new file mode 100644
index 00000000000..5b49c478992
--- /dev/null
+++ b/editors/emacs/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.4.10.1 2005/02/24 23:51:41 salo Exp $
+
+--- lib-src/movemail.c.orig	2005-02-09 16:31:55.000000000 +0100
++++ lib-src/movemail.c
+@@ -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/emacs20/Makefile b/editors/emacs20/Makefile
index 2f72328b46d..4448c7ae959 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:14:38 tv Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2005/02/24 23:51:42 salo Exp $
 
 DISTNAME=	emacs-20.7
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/} \
 		${MASTER_SITE_LOCAL}
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index 03c585bf28f..70941822285 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/03/25 22:13:34 kristerw Exp $
+$NetBSD: distinfo,v 1.5.8.1 2005/02/24 23:51:42 salo Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 Size (emacs-20.7.tar.gz) = 15043428 bytes
@@ -47,3 +47,4 @@ SHA1 (patch-bw) = 5de9f12d129b2f13a1d9c1702c7a889cd6b922f4
 SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b
 SHA1 (patch-by) = a383206a32e902c448a1b529cf1eefc485f5beab
 SHA1 (patch-bz) = ef28314afc69c37da92ec208252e477bbb522458
+SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d
diff --git a/editors/emacs20/patches/patch-ca b/editors/emacs20/patches/patch-ca
new file mode 100644
index 00000000000..a5b2ad3669e
--- /dev/null
+++ b/editors/emacs20/patches/patch-ca
@@ -0,0 +1,13 @@
+$NetBSD: patch-ca,v 1.1.2.2 2005/02/24 23:51:42 salo Exp $
+
+--- lib-src/movemail.c.orig	2005-02-09 16:55:15.000000000 +0100
++++ lib-src/movemail.c
+@@ -765,7 +765,7 @@ popmail (user, outfile, preserve, passwo
+       mbx_delimit_begin (mbf);
+       if (pop_retr (server, i, mbf) != OK)
+ 	{
+-	  error (Errmsg);
++	  error ("%s", Errmsg);
+ 	  close (mbfi);
+ 	  return (1);
+ 	}