Pullup ticket 333 - requested by Adrian Portelli

security fix for imap-uw

Revisions pulled up:
- pkgsrc/mail/imap-uw/Makefile		1.88-1.90
- pkgsrc/mail/imap-uw/PLIST		1.9
- pkgsrc/mail/imap-uw/distinfo		1.19
- pkgsrc/mail/imap-uw-utils/DESCR	1.2
- pkgsrc/mail/imap-uw-utils/Makefile	1.20
- pkgsrc/mail/imap-uw-utils/PLIST	1.2
- pkgsrc/mail/imap-uw-utils/distinfo	1.5

   Module Name:	pkgsrc
   Committed By:	abs
   Date:		Mon Jan 24 09:03:48 UTC 2005

   Modified Files:
   	pkgsrc/mail/imap-uw: Makefile distinfo

   Log Message:
   Update imap-uw to 2004c1

   imap-2004c:
       fixes to quoted-printable encoding and CRAM-MD5 authentication.
       NNTP proxy in imapd now supports the LIST and LSUB commands.

   imap-2004b:
       There are new ports for Solaris with Blastwave Community Open
       Source Software (gcs) and Mandrake Linux (lmd).

       SET_SNARFINTERVAL now controls how frequently local drivers
       will move new mail from the mail spool as well as from a
       maildrop.  Maildrops are still tied to a minimum interval of
       1 minute, but there is now no minimum for the spool file.

       Character set conversions now map non-breaking space to space
       if the destination character set doesn't have nbsp.  JIS Roman
       yen sign is now mapped to Unicode yen sign.
---
   Module Name:	pkgsrc
   Committed By:	abs
   Date:		Mon Jan 31 11:38:22 UTC 2005

   Modified Files:
   	pkgsrc/mail/imap-uw: Makefile

   Log Message:
   fix my previous attempt to clarify a comment at the start
---
   Module Name:	pkgsrc
   Committed By:	adrianp
   Date:		Sat Mar  5 22:01:47 UTC 2005

   Modified Files:
   	pkgsrc/mail/imap-uw: Makefile PLIST

   Log Message:
   - Fix builds on NetBSD 1.6 due to Kerberos/OpenSSL 0.9.7 issues
   - Included some utilities in the install that were once a part of the
     imap-uw-utils package but are now a part of this package
   - ok'ed kim@
---
   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sun Mar  6 14:37:16 UTC 2005

   Modified Files:
   	pkgsrc/mail/imap-uw-utils: DESCR Makefile PLIST distinfo

   Log Message:
   - Update to 20050108 to avoid conflicts with imap-uw package
   - Issue spotted by diro (at) nixsys.bz in PR #28966

   This distribution now contains two unsupported programs, icat and ifrom,
   which may be of use to some sites.

   The old chkmail, imapcopy, imapxfer, mbxcopy, mbxcreat, and mbxcvt
   programs have been replaced with the mailutil program, which is
   included in the mail/imap-uw package.

   The dmail, mlock, and tmail programs are also bundled in the mail/imap-uw
   package.

7 files changed, 56 insertions, 56 deletions

diff --git a/mail/imap-uw-utils/DESCR b/mail/imap-uw-utils/DESCR
index ad2ce6fb46d..2d87d9c0e80 100644
--- a/mail/imap-uw-utils/DESCR
+++ b/mail/imap-uw-utils/DESCR
@@ -1,13 +1,14 @@
-UW IMAP mailbox utilities:
-
-	chkmail			check for new mail
-	dmail			procmail Mail Delivery Module
-	icat			"cat" a mailbox from an IMAP source
-	ifrom			one line per message summary of IMAP mailbox
-	imapcopy, imapmove	copy or move messages from an IMAP inbox to a
-				local mailbox
-	mbxcopy, mbxmove	copy or move messages to a new mailbox
-	mbxcreat		create a new mailbox
-	mbxcvt			copy or move messages to a new mailbox,
-				converting mailbox format
-	tmail			Mail Delivery Module
+This distribution contains two unsupported programs, icat and ifrom,
+which may be of use to some sites.
+
+	icat		"cat" a mailbox from an IMAP source
+	ifrom		one line per message summary of IMAP mailbox
+
+There were once other programs in this distribution as well:
+
+The old chkmail, imapcopy, imapxfer, mbxcopy, mbxcreat, and mbxcvt
+programs have been replaced with the mailutil program, which is
+included in the mail/imap-uw package.
+
+The dmail, mlock, and tmail programs are also bundled in the mail/imap-uw
+package.
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
index fc918d43bba..9c0abbc1b96 100644
--- a/mail/imap-uw-utils/Makefile
+++ b/mail/imap-uw-utils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/10/03 00:12:53 tv Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2005/03/10 13:22:37 salo Exp $
 
 DISTNAME=	imap-utils
-PKGNAME=	imap-uw-utils-20020102
-PKGREVISION=	4
+PKGNAME=	imap-uw-utils-20050108
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -11,12 +10,12 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.washington.edu/imap/
 COMMENT=	UW IMAP mailbox utilities
 
-WRKSRC=			${WRKDIR}
-DIST_SUBDIR=		${PKGNAME_NOREV}
-USE_BUILDLINK3=		yes
+DIST_SUBDIR=	${PKGNAME_NOREV}
+USE_BUILDLINK3=	yes
 
-SRCDIRS=	chkmail dmail icat ifrom imapcopy imapxfer \
-		mbxcopy mbxcreat mbxcvt tmail
+BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004c1nb1
+
+SRCDIRS=	icat ifrom
 
 CFLAGS+=	-I${BUILDLINK_PREFIX.imap-uw}/include/c-client
 LIBS+=		-lc-client -lssl -lcrypto
@@ -35,8 +34,6 @@ do-install:
 		${INSTALL_PROGRAM} $${prog} ${PREFIX}/bin;		\
 		${INSTALL_MAN} $${prog}.1 ${PREFIX}/man/man1;		\
 	done
-	${LN} -sf imapcopy ${PREFIX}/bin/imapmove
-	${LN} -sf mbxcopy ${PREFIX}/bin/mbxmove
 
 .include "../../mail/imap-uw/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mail/imap-uw-utils/PLIST b/mail/imap-uw-utils/PLIST
index 22b9e2a2e82..cdb319a4322 100644
--- a/mail/imap-uw-utils/PLIST
+++ b/mail/imap-uw-utils/PLIST
@@ -1,23 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:14 zuntum Exp $
-bin/chkmail
-bin/dmail
+@comment $NetBSD: PLIST,v 1.1.18.1 2005/03/10 13:22:37 salo Exp $
 bin/icat
 bin/ifrom
-bin/imapcopy
-bin/imapmove
-bin/imapxfer
-bin/mbxcopy
-bin/mbxcreat
-bin/mbxcvt
-bin/mbxmove
-bin/tmail
-man/man1/chkmail.1
-man/man1/dmail.1
 man/man1/icat.1
 man/man1/ifrom.1
-man/man1/imapcopy.1
-man/man1/imapxfer.1
-man/man1/mbxcopy.1
-man/man1/mbxcreat.1
-man/man1/mbxcvt.1
-man/man1/tmail.1
diff --git a/mail/imap-uw-utils/distinfo b/mail/imap-uw-utils/distinfo
index 025d41b202b..f2e81a0b429 100644
--- a/mail/imap-uw-utils/distinfo
+++ b/mail/imap-uw-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/09/02 14:38:24 wiz Exp $
+$NetBSD: distinfo,v 1.3.12.1 2005/03/10 13:22:37 salo Exp $
 
-SHA1 (imap-uw-utils-20020102/imap-utils.tar.Z) = ebe4fa180c70ba11b35359e7543422cdee4f55c9
-Size (imap-uw-utils-20020102/imap-utils.tar.Z) = 61495 bytes
+SHA1 (imap-uw-utils-20050108/imap-utils.tar.Z) = 0453d669d4208b1c7a8101393654f551aee06b96
+Size (imap-uw-utils-20050108/imap-utils.tar.Z) = 14720 bytes
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index d81af2c4d0f..3b4e0675844 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.87 2004/12/18 16:17:12 grant Exp $
+# $NetBSD: Makefile,v 1.87.2.1 2005/03/10 13:22:37 salo Exp $
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
-# upgrade this package you *must* test it on a system *without* Kerberos
-# enabled before committing the changes.
+# upgrade this package you *must* test it on a system with Kerberos libraries
+# but not running Kerberos before committing the changes.
 
-DISTNAME=       imap-2004a
-PKGNAME=        imap-uw-2004a
-PKGREVISION=	2
+DISTNAME=       imap-2004c1
+PKGNAME=        imap-uw-2004c1
+PKGREVISION=	1
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -39,7 +39,12 @@ BUILD_TARGET=	sg6
 BUILD_TARGET=	sgi
 .  endif
 .else
+# USE_KERBEROS=no is explicitly set on NetBSD 1.x due to interoperability
+# issues with later versions of OpenSSL (e.g. 0.9.7)
 BUILD_TARGET=	neb
+.  if !empty(MACHINE_PLATFORM:MNetBSD-1.*)
+USE_KERBEROS=	no
+.  endif
 .  if defined(USE_KERBEROS) && ${USE_KERBEROS} != "no"
 PKG_USE_KERBEROS=	# defined
 BUILD_TARGET+=	EXTRAAUTHENTICATORS="gss"
@@ -176,6 +181,14 @@ do-install:
 	${FIND} ${DOC_DIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${DOC_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
 
+	${INST_PROG} ${WRKSRC}/mailutil/mailutil ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/man/man1
+	${INST_PROG} ${WRKSRC}/dmail/dmail ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${PREFIX}/man/man1
+	${INST_PROG} ${WRKSRC}/mlock/mlock ${PREFIX}/bin
+	${INST_PROG} ${WRKSRC}/tmail/tmail ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/man/man1
+
 .if !defined(IMAP_UW_NO_SSL) || ${IMAP_UW_NO_SSL} != "YES"
 .include "../../security/openssl/buildlink3.mk"
 .endif
diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST
index 891aea31860..3dbc00c623d 100644
--- a/mail/imap-uw/PLIST
+++ b/mail/imap-uw/PLIST
@@ -1,4 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 07:38:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8.2.1 2005/03/10 13:22:37 salo Exp $
+bin/dmail
+bin/mailutil
+bin/mlock
+bin/tmail
 include/c-client/c-client.h
 include/c-client/env.h
 include/c-client/env_unix.h
@@ -25,6 +29,9 @@ lib/libc-client_pic.a
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d
+man/man1/dmail.1
+man/man1/mailutil.1
+man/man1/tmail.1
 man/man8/imapd.8
 man/man8/ipop2d.8
 man/man8/ipop3d.8
@@ -33,8 +40,8 @@ sbin/mtest
 sbin/rimapd
 share/doc/imap-uw/BUILD
 share/doc/imap-uw/CONFIG
-share/doc/imap-uw/FAQ.txt
 share/doc/imap-uw/FAQ.html
+share/doc/imap-uw/FAQ.txt
 share/doc/imap-uw/IPv6.txt
 share/doc/imap-uw/RELNOTES
 share/doc/imap-uw/SSLBUILD
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 8d8a9133819..d3a34a0ffc6 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2004/10/11 16:56:28 abs Exp $
+$NetBSD: distinfo,v 1.18.2.1 2005/03/10 13:22:37 salo Exp $
 
-SHA1 (imap-2004a.tar.Z) = e5df251f2b8c3f01e94195a2832b5ba5cd809fbb
-Size (imap-2004a.tar.Z) = 2224181 bytes
+SHA1 (imap-2004c1.tar.Z) = 47009504d409c41c5ea7f5e2e77178ef60282e3e
+Size (imap-2004c1.tar.Z) = 2227092 bytes
 SHA1 (patch-aa) = 2109d076b1f50ca461b2b2a00ee927207a64f766
 SHA1 (patch-ab) = 76af6b8772962e77925da19902285aabcebc7d76
 SHA1 (patch-ac) = 8b4ea8c15929c65eda1b3444c68fdbf70fa68b6a