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.

10 files changed, 67 insertions, 115 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 3cb28bf64ad..9ee16f49bda 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2008/11/04 17:16:55 jwise Exp $
+# $NetBSD: Makefile,v 1.126 2008/11/06 15:27:00 tron Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -9,9 +9,8 @@
 # The most common reason to install this package is as a prerequisite for pine.
 # If you upgrade this package, you *must* test mail/pine with the new version.
 
-DISTNAME=	imap-2006j2
+DISTNAME=	imap-2007d
 PKGNAME=	${DISTNAME:S/-/-uw-/}
-PKGREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -56,9 +55,6 @@ BUILD_TARGET.IRIX=	sgi
 .endif
 BUILD_TARGET.OSF1=	osf
 BUILD_TARGET.OpenBSD=	bso
-.if ${OPSYS} == NetBSD && exists(/usr/include/security/pam_appl.h)
-BUILD_TARGET.NetBSD=	nep
-.endif
 BUILD_TARGET.*=		neb
 MESSAGE_SRC=		${PKGDIR}/MESSAGE
 
diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST
index 6a4348fd9c5..e5db54e5c34 100644
--- a/mail/imap-uw/PLIST
+++ b/mail/imap-uw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2007/08/05 04:51:34 obache Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/11/06 15:27:00 tron Exp $
 bin/dmail
 bin/mailutil
 bin/mlock
@@ -70,7 +70,6 @@ share/doc/imap-uw/rfc/rfc2087.txt
 share/doc/imap-uw/rfc/rfc2088.txt
 share/doc/imap-uw/rfc/rfc2177.txt
 share/doc/imap-uw/rfc/rfc2180.txt
-share/doc/imap-uw/rfc/rfc2192.txt
 share/doc/imap-uw/rfc/rfc2193.txt
 share/doc/imap-uw/rfc/rfc2195.txt
 share/doc/imap-uw/rfc/rfc2221.txt
@@ -84,7 +83,6 @@ share/doc/imap-uw/rfc/rfc3503.txt
 share/doc/imap-uw/rfc/rfc3516.txt
 share/doc/imap-uw/rfc/rfc3656.txt
 share/doc/imap-uw/rfc/rfc3691.txt
-share/doc/imap-uw/rfc/rfc4234.txt
 share/doc/imap-uw/rfc/rfc4314.txt
 share/doc/imap-uw/rfc/rfc4315.txt
 share/doc/imap-uw/rfc/rfc4422.txt
@@ -99,6 +97,14 @@ share/doc/imap-uw/rfc/rfc4616.txt
 share/doc/imap-uw/rfc/rfc4731.txt
 share/doc/imap-uw/rfc/rfc4752.txt
 share/doc/imap-uw/rfc/rfc4790.txt
+share/doc/imap-uw/rfc/rfc4959.txt
+share/doc/imap-uw/rfc/rfc4978.txt
+share/doc/imap-uw/rfc/rfc5032.txt
+share/doc/imap-uw/rfc/rfc5051.txt
+share/doc/imap-uw/rfc/rfc5092.txt
+share/doc/imap-uw/rfc/rfc5161.txt
+share/doc/imap-uw/rfc/rfc5162.txt
+share/doc/imap-uw/rfc/rfc5234.txt
 @dirrm share/doc/imap-uw/rfc
 @dirrm share/doc/imap-uw/draft
 @dirrm share/doc/imap-uw
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 10ff0941e61..d9fffc8dd9e 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,19 +1,18 @@
-$NetBSD: distinfo,v 1.33 2008/04/20 22:37:06 dbj Exp $
+$NetBSD: distinfo,v 1.34 2008/11/06 15:27:00 tron Exp $
 
-SHA1 (imap-2006j2.tar.Z) = 41fc3f8cf11f1931a9c046240bc04ceb9f1416c0
-RMD160 (imap-2006j2.tar.Z) = 9192720a527e8977ef6e3eb6bcf8f3b26680e4fc
-Size (imap-2006j2.tar.Z) = 2686745 bytes
-SHA1 (patch-aa) = 116009b1713eb78286343293e6e57fff8b1c0e2f
-SHA1 (patch-ab) = 4fbb5d1c917eb2887cd398eb5e8cb7ceeda06dbd
+SHA1 (imap-2007d.tar.Z) = 298efcd34d2d6349953b2c4f5a39ed91f3cc9f46
+RMD160 (imap-2007d.tar.Z) = 2371508655eb8dfd847a12162ddae4f4952bfdd5
+Size (imap-2007d.tar.Z) = 2794618 bytes
+SHA1 (patch-aa) = ac880c250dfee3d0d316063ace5b92cd2f190510
+SHA1 (patch-ab) = 2ab52cb74a9b4eb1565f5bcbfb03969c038f52f1
 SHA1 (patch-ac) = eab1435fdf7ab59ea8afbde949a92dd756e6aea3
-SHA1 (patch-ad) = 51d00ec69f4404536d6daf51d971c294884b23c5
-SHA1 (patch-ae) = c7befb1e0ec0184bbf076694ac7cd8df93902eaa
+SHA1 (patch-ad) = d817dca51413bb8d228c2fabadffa3b924dff11d
+SHA1 (patch-ae) = 85e0917ce1934f6789bbce45ad5321e28cf294d9
 SHA1 (patch-af) = 38d3d020109076403becf691a8eb288ccabd9f70
 SHA1 (patch-ag) = 4152c1c618bf78f63668070e26e8feb0f7df91ed
 SHA1 (patch-ah) = ca68ec33fbf8ac4138669588b32098eb4f156f75
 SHA1 (patch-ai) = 312d2bd29be2f8fc03c24a635afcb0ca4ae33832
 SHA1 (patch-aj) = d9edbd39d552b70561c8df8d1d34568cec528cf9
-SHA1 (patch-ak) = 97c61cc9fbe7edb0d1b12b85e256ec91624cfd76
 SHA1 (patch-al) = f85551692a8e7e6d7bbdba9aed4850e3a434058b
 SHA1 (patch-am) = f0c5d250d69976c85537c9b8080365e8c2391c9d
 SHA1 (patch-ao) = b23f356cdeaccd996fd2d11b23da265b6b0df49f
@@ -29,8 +28,8 @@ SHA1 (patch-ax) = 0edac03adc6f80102d6063170123b1d1b304cde9
 SHA1 (patch-ay) = a39cd708e2bfb2f03661cefb56249c7243b80c7f
 SHA1 (patch-az) = 706c9e8ae56b92f2ce148ff0fd08f002f8be4ae5
 SHA1 (patch-ba) = 9f4784050ad0cd61d9324517821077976485d41c
-SHA1 (patch-bb) = 2e942e3d37cae74f5ba85cc9a862df7e57598959
-SHA1 (patch-bc) = 59c938431f78d6f4c29d66f4bf77b9d416147694
+SHA1 (patch-bb) = b6b5a5294019c23376187b4ff324bf58fdbc113e
+SHA1 (patch-bc) = ae0119037fee2e94c6b60de3c9efc946ed4cfb68
 SHA1 (patch-bd) = 303a47372f9fdd6fd57fae9d3073e40620dc98f4
 SHA1 (patch-be) = 73afbc9f3c65d3adce37a3f1ee7f55e0ec665a54
 SHA1 (patch-bf) = 63c582e88bd6286295d5d9639bafec355278d537
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"