Update "imap-uw" package to imap-2007d. Changes since version 2006j2:

- security fix for users of tmail or dmail.
- bug fixes and reliability improvements.
- A new function, utf8_csvalidmap(), has been added for the benefit of
  Alpine to use in examining UTF-8 text and determining efficiently
  whether it can be downgraded to a legacy charset.  If you develop an
  MUA, this may be useful for you too, although you'll have to read the
  source code to see how to use it.  The purpose of the "not-CJK" bit is
  to prevent messages being downgraded to a CJK charset if all they have
  in that charset are some special punctuation.

This update address the security vulnerability reported in SA32483.

7 files changed, 46 insertions, 95 deletions

diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index cc19d9a744e..1f296a4a4ab 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.19 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-aa,v 1.20 2008/11/06 15:27:00 tron Exp $
 
---- Makefile.orig	2007-05-08 22:50:45.000000000 +0000
-+++ Makefile
-@@ -307,7 +307,7 @@ SPECIALS:
- 
- # Note on SCO you may have to set LN to "ln".
- 
--a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt neb nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
-+a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul h11 hpp hpx lnp lyn mct mnt neb nec nep nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an
- 	$(BUILD) BUILDTYPE=$@
- 
- # If you use sv4, you may find that it works to move it to use the an process.
-@@ -559,9 +559,6 @@ sslunix sslsco:
+--- Makefile.orig	2008-06-04 19:43:35.000000000 +0100
++++ Makefile	2008-11-06 11:43:50.000000000 +0000
+@@ -577,9 +577,6 @@
  	@echo + In order to rectify this problem, you MUST build with:
  	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -21,7 +12,7 @@ $NetBSD: patch-aa,v 1.19 2007/08/03 17:03:30 obache Exp $
  
  nounenc:
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -582,9 +579,6 @@ sslnone:
+@@ -600,9 +597,6 @@
  	@echo ++ SSLTYPE=nopwd
  	@echo + You must also have OpenSSL or equivalent installed.
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -31,7 +22,7 @@ $NetBSD: patch-aa,v 1.19 2007/08/03 17:03:30 obache Exp $
  
  nonossl:
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -618,9 +612,6 @@ ip6:
+@@ -636,9 +630,6 @@
  	@echo + cancelled and you must rebuild.  If you did not specify IPv6
  	@echo + yourself, try adding IP6=4 to the make command line.
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index 9c7d85b7fff..c2a58ddaa37 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-ab,v 1.23 2008/11/06 15:27:00 tron Exp $
 
---- src/osdep/unix/Makefile.orig	2007-06-17 15:37:44.000000000 +0000
-+++ src/osdep/unix/Makefile
-@@ -48,7 +48,7 @@ GCCOPTLEVEL= -O2
+--- src/osdep/unix/Makefile.orig	2008-06-04 19:18:34.000000000 +0100
++++ src/osdep/unix/Makefile	2008-11-06 13:57:35.000000000 +0000
+@@ -48,7 +48,7 @@
  # Try to have some consistency in GCC builds.  We want optimization, but we
  # also want to be able to debug.
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $
  GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign
  
  
-@@ -144,7 +144,7 @@ CHUNKSIZE=65536
+@@ -149,7 +149,7 @@
  
  # Normally no need to change any of these
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $
  BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o \
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-@@ -425,7 +425,7 @@ gso:	os_sol.h	# GCC Solaris
+@@ -430,7 +430,7 @@
  	 RSHPATH=/usr/bin/rsh \
  	 BASECFLAGS="$(GCCCFLAGS)" \
  	 BASELDFLAGS="-lsocket -lnsl -lgen" \
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $
  
  gsu:	# GCC SUN-OS
  	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -524,7 +524,7 @@ neb:	# NetBSD
+@@ -529,7 +529,7 @@
  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
@@ -38,24 +38,7 @@ $NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $
  	 RSHPATH=/usr/bin/rsh \
  	 BASECFLAGS="$(GCCCFLAGS)" \
  	 BASELDFLAGS="-lcrypt"
-@@ -539,6 +539,16 @@ nec:	# NEC UX
- 	 BASELDFLAGS="-lsocket -lnsl -lgen" \
- 	 RANLIB=true CC=/usr/abiccs/bin/cc
- 
-+nep:	# NetBSD with PAM
-+	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
-+	 CHECKPW=pam \
-+	 CRXTYPE=nfs \
-+	 SPOOLDIR=/var \
-+	 ACTIVEFILE=/var/news/db/active \
-+	 RSHPATH=/usr/bin/rsh \
-+	 BASECFLAGS="$(GCCCFLAGS)" \
-+	 BASELDFLAGS="-lpam"
-+
- nto:	# QNX Neutrino RTP
- 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
- 	 CRXTYPE=nfs \
-@@ -850,7 +860,7 @@ $(ARCHIVE): $(BINARIES)
+@@ -855,7 +855,7 @@
  	@$(SH) ARCHIVE
  
  .c.o:
@@ -64,7 +47,7 @@ $NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $
  
  
  # Cleanup
-@@ -910,7 +920,7 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
+@@ -915,7 +915,7 @@
  	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
  	@echo is not installed on your system.  Either install OpenSSL first
  	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
@@ -73,9 +56,9 @@ $NetBSD: patch-ab,v 1.22 2007/08/03 17:03:30 obache Exp $
  
  osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
  	$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
-@@ -961,7 +971,7 @@ onceenv:
- 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
- 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+@@ -968,7 +968,7 @@
+ 	 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
+ 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
 -	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
 +	echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`$(CAT) LDFLAGS\`" > ARCHIVE
diff --git a/mail/imap-uw/patches/patch-ad b/mail/imap-uw/patches/patch-ad
index d23ca1b5809..f533e8156dd 100644
--- a/mail/imap-uw/patches/patch-ad
+++ b/mail/imap-uw/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.7 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-ad,v 1.8 2008/11/06 15:27:00 tron Exp $
 
---- src/dmail/Makefile.orig	2006-08-31 00:09:38.000000000 +0000
-+++ src/dmail/Makefile
+--- src/dmail/Makefile.orig	2008-06-04 19:18:34.000000000 +0100
++++ src/dmail/Makefile	2008-11-06 13:29:54.000000000 +0000
 @@ -26,7 +26,7 @@
  
  
@@ -11,12 +11,12 @@ $NetBSD: patch-ad,v 1.7 2007/08/03 17:03:30 obache Exp $
  SHELL = /bin/sh
  
  # Get local definitions from c-client directory
-@@ -36,7 +36,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
+@@ -36,7 +36,7 @@
  LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
  
- dmail: $(CCLIENTLIB) dmail.o
--	$(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS)
-+	$(LTLINK) $(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS)
+ dmail: $(CCLIENTLIB) dmail.o dquota.o
+-	$(CC) $(CFLAGS) -o dmail dmail.o dquota.o $(LDFLAGS)
++	$(LTLINK) $(CC) $(CFLAGS) -o dmail dmail.o dquota.o $(LDFLAGS)
  
- dmail.o: $C/mail.h $C/misc.h $C/osdep.h
+ dmail.o: $C/mail.h $C/misc.h $C/osdep.h dquota.h
  
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
index 2e5dc3b640f..68b3e24e60c 100644
--- a/mail/imap-uw/patches/patch-ae
+++ b/mail/imap-uw/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.17 2007/08/03 17:03:30 obache Exp $
+$NetBSD: patch-ae,v 1.18 2008/11/06 15:27:00 tron Exp $
 
---- src/tmail/Makefile.orig	2006-08-31 00:27:38.000000000 +0000
-+++ src/tmail/Makefile
+--- src/tmail/Makefile.orig	2008-06-04 19:18:34.000000000 +0100
++++ src/tmail/Makefile	2008-11-06 13:32:39.000000000 +0000
 @@ -26,7 +26,7 @@
  
  
@@ -11,12 +11,12 @@ $NetBSD: patch-ae,v 1.17 2007/08/03 17:03:30 obache Exp $
  SHELL = /bin/sh
  
  # Get local definitions from c-client directory
-@@ -36,7 +36,7 @@ CFLAGS = -I$C `cat $C/CFLAGS`
+@@ -36,7 +36,7 @@
  LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
  
- tmail: $(CCLIENTLIB) tmail.o
--	$(CC) $(CFLAGS) -o tmail tmail.o $(LDFLAGS)
-+	$(LTLINK) $(CC) $(CFLAGS) -o tmail tmail.o $(LDFLAGS)
+ tmail: $(CCLIENTLIB) tmail.o tquota.o
+-	$(CC) $(CFLAGS) -o tmail tmail.o tquota.o $(LDFLAGS)
++	$(LTLINK) $(CC) $(CFLAGS) -o tmail tmail.o tquota.o $(LDFLAGS)
  
- tmail.o: $C/mail.h $C/misc.h $C/osdep.h
+ tmail.o: $C/mail.h $C/misc.h $C/osdep.h tquota.h
  
diff --git a/mail/imap-uw/patches/patch-ak b/mail/imap-uw/patches/patch-ak
deleted file mode 100644
index 4f3dcb1e65e..00000000000
--- a/mail/imap-uw/patches/patch-ak
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2007/08/03 17:03:30 obache Exp $
-
---- src/osdep/unix/ckp_gss.c.orig	2007-01-16 23:26:49.000000000 +0000
-+++ src/osdep/unix/ckp_gss.c
-@@ -38,6 +38,7 @@ struct passwd *checkpw (struct passwd *p
- {
-   char svrnam[MAILTMPLEN],cltnam[MAILTMPLEN];
-   krb5_context ctx;
-+  krb5_error error;
-   krb5_timestamp now;
-   krb5_principal service;
-   krb5_ccache ccache;
-@@ -54,7 +55,9 @@ struct passwd *checkpw (struct passwd *p
- 				/* make client name with principal */
-     sprintf (cltnam,"%.80s/%.80s",pw->pw_name,
- 	     (char *) mail_parameters (NIL,GET_SERVICENAME,NIL));
--    krb5_init_context (&ctx);	/* get a context */
-+    error = krb5_init_context (&ctx);	/* get a context */
-+    if (error)
-+      return NIL;
- 				/* get time, client and server principals */
-     if (!krb5_timeofday (ctx,&now) &&
- 	/* Normally, kerb_cp_svr_name (defined/set in env_unix.c) is NIL, so
diff --git a/mail/imap-uw/patches/patch-bb b/mail/imap-uw/patches/patch-bb
index 503f902135d..54b297b423b 100644
--- a/mail/imap-uw/patches/patch-bb
+++ b/mail/imap-uw/patches/patch-bb
@@ -1,12 +1,12 @@
-$NetBSD: patch-bb,v 1.2 2007/08/03 17:03:32 obache Exp $
+$NetBSD: patch-bb,v 1.3 2008/11/06 15:27:00 tron Exp $
 
---- src/mailutil/mailutil.c.orig	2007-05-21 23:24:47.000000000 +0000
-+++ src/mailutil/mailutil.c
-@@ -29,7 +29,6 @@
+--- src/mailutil/mailutil.c.orig	2008-06-04 19:18:34.000000000 +0100
++++ src/mailutil/mailutil.c	2008-11-06 13:35:58.000000000 +0000
+@@ -27,7 +27,6 @@
  
  #include <stdio.h>
  #include <errno.h>
 -extern int errno;		/* just in case */
- #include "mail.h"
- #include "osdep.h"
- #include "misc.h"
+ #include "c-client.h"
+ #ifdef SYSCONFIG		/* defined in env_unix.h */
+ #include <pwd.h>
diff --git a/mail/imap-uw/patches/patch-bc b/mail/imap-uw/patches/patch-bc
index 223b052ff07..4f9bc888560 100644
--- a/mail/imap-uw/patches/patch-bc
+++ b/mail/imap-uw/patches/patch-bc
@@ -1,12 +1,12 @@
-$NetBSD: patch-bc,v 1.2 2007/08/03 17:03:32 obache Exp $
+$NetBSD: patch-bc,v 1.3 2008/11/06 15:27:00 tron Exp $
 
---- src/imapd/imapd.c.orig	2007-07-11 20:08:16.000000000 +0000
-+++ src/imapd/imapd.c
-@@ -31,7 +31,6 @@
+--- src/imapd/imapd.c.orig	2008-06-04 19:39:54.000000000 +0100
++++ src/imapd/imapd.c	2008-11-06 13:37:04.000000000 +0000
+@@ -29,7 +29,6 @@
  #include <stdio.h>
  #include <ctype.h>
  #include <errno.h>
 -extern int errno;		/* just in case */
  #include <signal.h>
+ #include <setjmp.h>
  #include <time.h>
- #include "c-client.h"