Update "mutt-devel" package to version 1.3.25i. Changes since 1.3.23i

include a fix for a remotely exploitable security hole, many bug fixes
and new threading code.

5 files changed, 16 insertions, 35 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 31f919a23bb..5d9e0b1fde7 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2001/11/29 19:46:12 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2002/01/02 09:07:45 tron Exp $
 
-DISTNAME=		mutt-1.3.23i
+DISTNAME=		mutt-1.3.25i
 PKGNAME=		${DISTNAME:C/i$//}
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index 0818e4dd174..0f70ae0d50c 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/01 16:10:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/01/02 09:07:45 tron Exp $
 bin/flea
 bin/mutt
 bin/muttbug
@@ -31,6 +31,7 @@ share/doc/mutt/html/manual-6.html
 share/doc/mutt/html/manual-7.html
 share/doc/mutt/html/manual.html
 share/doc/mutt/manual.txt
+share/doc/mutt/patch-notes.txt
 share/doc/mutt/samples/Mush.rc
 share/doc/mutt/samples/Muttrc
 share/doc/mutt/samples/Pine.rc
@@ -61,6 +62,7 @@ share/doc/mutt/samples/pgp6.rc
 share/doc/mutt/samples/sample.mailcap
 share/doc/mutt/samples/sample.muttrc
 share/doc/mutt/samples/sample.muttrc-tlr
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 7c64c92ff24..7e4a4edcfdd 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2001/11/07 09:19:04 tron Exp $
+$NetBSD: distinfo,v 1.9 2002/01/02 09:07:45 tron Exp $
 
-SHA1 (mutt-1.3.23i.tar.gz) = fe4a7ac8d215eab6ef8e4ee37c37b23c5176359d
-Size (mutt-1.3.23i.tar.gz) = 2482662 bytes
+SHA1 (mutt-1.3.25i.tar.gz) = 2f89eed0d1fb8a34eb371bce3dc5c403d6b3f161
+Size (mutt-1.3.25i.tar.gz) = 2527168 bytes
 SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c
 SHA1 (patch-ab) = 24984804280b5db991a2a471eba39506369add70
-SHA1 (patch-ac) = 19225ed3e60de9772de5e7092f2cc67b804f0f86
-SHA1 (patch-ad) = 6516789c92fcbf11a8cb0da17cc67d4698e5f3ad
+SHA1 (patch-ac) = 4aa38ccf5454e4d3e79b8ddc8aad610b1c1bd6c2
diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac
index d056033b399..9110d76dfc3 100644
--- a/mail/mutt-devel/patches/patch-ac
+++ b/mail/mutt-devel/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2001/07/22 15:24:10 tron Exp $
+$NetBSD: patch-ac,v 1.2 2002/01/02 09:07:46 tron Exp $
 
---- po/Makefile.in.in.orig	Mon Aug  7 10:31:36 2000
-+++ po/Makefile.in.in	Sun Jul 22 17:17:57 2001
-@@ -21,8 +21,8 @@
+--- po/Makefile.in.in.orig	Tue Jan  1 21:17:15 2002
++++ po/Makefile.in.in	Wed Jan  2 09:54:40 2002
+@@ -23,7 +23,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
+ datadir = @datadir@
 -localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
 +localedir = $(prefix)/$(PKGLOCALEDIR)/locale
-+gnulocaledir = $(localedir)
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
+ gettextsrcdir = $(datadir)/gettext/po
  
+ INSTALL = @INSTALL@
diff --git a/mail/mutt-devel/patches/patch-ad b/mail/mutt-devel/patches/patch-ad
deleted file mode 100644
index d4a054abd2e..00000000000
--- a/mail/mutt-devel/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2001/11/07 09:19:04 tron Exp $
-
---- sendlib.c	2001/10/11 07:58:26	2.88
-+++ sendlib.c	2001/10/17 16:22:48	2.89
-@@ -1831,6 +1831,13 @@
- 	if (dup (1) < 0)
- 	  _exit (S_ERR);
-       }
-+      else 
-+      {
-+	if (open ("/dev/null", O_WRONLY | O_APPEND) < 0)	/* stdout */
-+	  _exit (S_ERR);
-+	if (open ("/dev/null", O_RDWR | O_APPEND) < 0)		/* stderr */
-+	  _exit (S_ERR);
-+      }
- 
-       execv (path, args);
-       _exit (S_ERR);