Update to imap-uw-2004e (downwards ABI compatible; shlib teeny version bumped).

Changes (note that relnotes say -2004d, but it is indeed -2004e):

=====
imap-2004d is a maintenance release, released concurrently with Pine
4.63, and consists primarily of bugfixes

There is now a workaround for RedHat breaking flock().  However, since
RedHat has said that they don't support flock(), there is no guarantee
that they won't break it in the future.  So you may want to consider some
other Linux distribution or BSD instead.  See:
        https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=123415
for the gruesome details.

There are no user-visible functional enhancements in this version.
=====

OTHER CHANGE: Multiple newsrc and MSA support needed by Pine 4.63.

2 files changed, 27 insertions, 22 deletions

diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index 0467dbfffe1..9645e5e3d37 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.16 2005/06/17 14:49:47 hira Exp $
+$NetBSD: patch-ab,v 1.17 2005/08/12 19:47:17 tv Exp $
 
---- src/osdep/unix/Makefile.orig	2005-03-06 08:53:53.000000000 -0800
-+++ src/osdep/unix/Makefile	2005-03-06 08:56:06.000000000 -0800
-@@ -29,9 +29,6 @@
+--- src/osdep/unix/Makefile.orig	2005-08-12 15:09:59.000000000 -0400
++++ src/osdep/unix/Makefile	2005-08-12 15:11:21.000000000 -0400
+@@ -41,9 +41,6 @@
  
  # Extended flags needed for SSL.  You may need to modify.
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.16 2005/06/17 14:49:47 hira Exp $
  SSLINCLUDE=$(SSLDIR)/include
  SSLLIB=$(SSLDIR)/lib
  
-@@ -48,7 +45,7 @@
+@@ -60,7 +57,7 @@
  
  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
   -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
@@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.16 2005/06/17 14:49:47 hira Exp $
  
  
  # Extended flags needed for non-standard passwd types.  You may need to modify.
-@@ -92,14 +89,14 @@
+@@ -104,14 +101,14 @@
  # set certain other formats (e.g. mbx and mx) as the EMPTYPROTO since these
  # formats can never be empty files.
  
@@ -38,11 +38,11 @@ $NetBSD: patch-ab,v 1.16 2005/06/17 14:49:47 hira Exp $
  LN=ln -s
  RANLIB=ranlib
  
-@@ -391,9 +388,9 @@
+@@ -403,9 +400,9 @@
  	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
  	 ACTIVEFILE=/usr/share/news/active \
  	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-g -O2" \
+-	 BASECFLAGS="-g $(GCCOPTLEVEL)" \
 +	 BASECFLAGS="" \
  	 BASELDFLAGS="-lsocket -lnsl -lgen" \
 -	 RANLIB=true CC=gcc
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.16 2005/06/17 14:49:47 hira Exp $
  
  gsu:	# GCC SUN-OS
  	$(BUILD) `$(CAT) SPECIALS` OS=sun \
-@@ -483,9 +480,9 @@
+@@ -495,9 +492,9 @@
  	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
  	 CRXTYPE=nfs \
  	 SPOOLDIR=/var \
@@ -62,7 +62,7 @@ $NetBSD: patch-ab,v 1.16 2005/06/17 14:49:47 hira Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -911,7 +908,7 @@
+@@ -924,7 +921,7 @@
  	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
diff --git a/mail/imap-uw/patches/patch-ak b/mail/imap-uw/patches/patch-ak
index 761aaa94531..5c6dfc4a4e0 100644
--- a/mail/imap-uw/patches/patch-ak
+++ b/mail/imap-uw/patches/patch-ak
@@ -1,18 +1,23 @@
-$NetBSD: patch-ak,v 1.1 2002/10/30 02:13:47 elric Exp $
+$NetBSD: patch-ak,v 1.2 2005/08/12 19:47:17 tv Exp $
 
---- src/osdep/unix/ckp_gss.c.orig	Tue Oct 29 13:20:28 2002
-+++ src/osdep/unix/ckp_gss.c	Tue Oct 29 13:20:51 2002
-@@ -32,9 +32,12 @@
-   krb5_timestamp now;
-   krb5_principal client,server;
-   krb5_creds crd;
+--- src/osdep/unix/ckp_gss.c.orig	2005-06-05 19:43:50.000000000 -0400
++++ src/osdep/unix/ckp_gss.c	2005-08-12 15:08:39.000000000 -0400
+@@ -30,6 +30,7 @@
+ {
+   char tmp[MAILTMPLEN];
+   krb5_context ctx;
 +  krb5_error error;
-   struct passwd *ret = NIL;
-   if (*pass) {			/* only if password non-empty */
--    krb5_init_context (&ctx);	/* get a context context */
-+    erorr = krb5_init_context (&ctx);	/* get a context context */
+   krb5_timestamp now;
+   krb5_principal service;
+   krb5_creds *crd = (krb5_creds *) memset (fs_get (sizeof (krb5_creds)),0,
+@@ -39,7 +40,9 @@
+ 				/* make service name */
+     sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL),
+ 	     tcp_serverhost ());
+-    krb5_init_context (&ctx);	/* get a context */
++    error = krb5_init_context (&ctx);	/* get a context */
 +    if (error)
 +      return NIL;
-     krb5_init_ets (ctx);
  				/* get time, client and server principals */
      if (!krb5_timeofday (ctx,&now) &&
+ 	!krb5_parse_name (ctx,pw->pw_name,&crd->client) &&