Changes:

imap-2002c is a minor release, released concurrently with Pine 4.55, and
contains primarily bugfixes.  Programs written for imap-2002 will build
with this version without modification

imap-2002d is a minor release, released concurrently with Pine 4.56, and
contains primarily bugfixes.  Programs written for imap-2002 should build
with this version without modification, with one exception.  That exception
is the ngbogus envelope flag, which stopped being used in imap-2002c and is
now gone for good.

See RELNOTES for additional information

4 files changed, 20 insertions, 67 deletions

diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index d004576cef9..89c8b992756 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2002/12/11 12:21:23 tron Exp $
+$NetBSD: patch-aa,v 1.12 2003/07/28 14:38:05 adam Exp $
 
---- Makefile.orig	Tue Nov  5 01:19:13 2002
-+++ Makefile	Wed Dec 11 12:21:53 2002
-@@ -396,9 +396,9 @@
+--- Makefile.orig	2003-07-28 14:34:21.000000000 +0200
++++ Makefile	2003-07-28 14:34:21.000000000 +0200
+@@ -419,9 +419,9 @@
  	@echo + In order to rectify this problem, you MUST build with:
  	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index 7cd6b5c7a72..a1ff56096e8 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.10 2003/01/23 01:25:11 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.11 2003/07/28 14:38:06 adam Exp $
 
---- src/osdep/unix/Makefile.orig	Wed Dec 11 12:15:02 2002
-+++ src/osdep/unix/Makefile	Wed Dec 11 12:18:05 2002
+--- src/osdep/unix/Makefile.orig	2003-07-28 14:34:04.000000000 +0200
++++ src/osdep/unix/Makefile	2003-07-28 14:34:38.000000000 +0200
 @@ -28,8 +28,6 @@
  
  # Extended flags needed for SSL.  You may need to modify.
@@ -61,7 +61,7 @@ $NetBSD: patch-ab,v 1.10 2003/01/23 01:25:11 dmcmahill Exp $
  	 BASELDFLAGS="-lcrypt"
  
  nec:	# NEC UX
-@@ -876,7 +874,7 @@
+@@ -877,7 +875,7 @@
  	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
  	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj
index 46d45349e8f..66179ef4477 100644
--- a/mail/imap-uw/patches/patch-aj
+++ b/mail/imap-uw/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.10 2003/04/10 14:56:21 fredb Exp $
+$NetBSD: patch-aj,v 1.11 2003/07/28 14:38:06 adam Exp $
 
---- src/osdep/unix/Makefile.gss.orig	Wed Oct 23 17:23:36 2002
-+++ src/osdep/unix/Makefile.gss	Wed Oct 23 17:41:19 2002
+--- src/osdep/unix/Makefile.gss.orig	2003-07-28 15:34:51.000000000 +0200
++++ src/osdep/unix/Makefile.gss	2003-07-28 15:37:26.000000000 +0200
 @@ -20,12 +20,16 @@
  
  # Extended flags needed for additional authenticators.  You may need to modify.
@@ -10,10 +10,6 @@ $NetBSD: patch-aj,v 1.10 2003/04/10 14:56:21 fredb Exp $
 -GSSCFLAGS= -I$(GSSDIR)/include -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name
 -GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
 -GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
--
--gss:	# GSSAPI Kerberos V flags
--	echo $(GSSCFLAGS) >> OSCFLAGS
--	sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
 +#GSSDIR=/usr/local
 +#GSSCFLAGS= -I$(GSSDIR)/include
 +#GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err
@@ -22,8 +18,11 @@ $NetBSD: patch-aj,v 1.10 2003/04/10 14:56:21 fredb Exp $
 +#gss:	# GSSAPI Kerberos V flags
 +#	echo $(GSSCFLAGS) >> OSCFLAGS
 +#	sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
-+#
  
+-gss:	# GSSAPI Kerberos V flags
+-	echo $(GSSCFLAGS) >> OSCFLAGS
+-	sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS
 +gss:
+ 	echo "#include \"kerb_mit.c\"" >> auths.c
 +	echo "-I/usr/include/krb5" >> OSCFLAGS
 +	echo "-lgssapi -lkrb5 -lasn1 -lcrypto ${GSS_EXTRA_LDFLAGS} -lcom_err -lroken" >> LDFLAGS
diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al
index 3c646f7c469..669f06f20d4 100644
--- a/mail/imap-uw/patches/patch-al
+++ b/mail/imap-uw/patches/patch-al
@@ -1,60 +1,14 @@
-$NetBSD: patch-al,v 1.2 2002/12/11 12:21:25 tron Exp $
+$NetBSD: patch-al,v 1.3 2003/07/28 14:38:06 adam Exp $
 
---- src/c-client/auth_gss.c.orig	Thu Nov 22 05:03:10 2001
-+++ src/c-client/auth_gss.c	Wed Dec 11 12:13:50 2002
-@@ -18,9 +18,17 @@
+--- src/c-client/auth_gss.c.orig	2003-03-05 06:24:17.000000000 +0100
++++ src/c-client/auth_gss.c	2003-07-28 15:40:16.000000000 +0200
+@@ -18,6 +18,9 @@
   * CPYRIGHT, included with this Distribution.
   */
- 
+ 
 +#ifdef __NetBSD__
-+/* This is really Heimdal specific, but . . . */
 +#include <gssapi/gssapi.h>
-+#include <krb5/krb5.h>
-+
-+#define gss_nt_service_name	GSS_C_NT_HOSTBASED_SERVICE
-+#else
- #define PROTOTYPE(x) x
- #include <gssapi/gssapi_generic.h>
- #include <gssapi/gssapi_krb5.h>
 +#endif
  
  long auth_gssapi_valid (void);
  long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
-@@ -58,24 +66,28 @@
-   krb5_context ctx;
-   krb5_keytab kt;
-   krb5_kt_cursor csr;
-+
-+				/* make a context */
-+  if (krb5_init_context (&ctx))
-+   return NIL;
- 				/* make service name */
-   sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL),
- 	   mylocalhost ());
-   buf.length = strlen (buf.value = tmp);
- 				/* see if can build a name */
-   if (gss_import_name (&smn,&buf,GSS_C_NT_HOSTBASED_SERVICE,&name) !=
--      GSS_S_COMPLETE) return NIL;
--				/* make a context */
--  if (!krb5_init_context (&ctx)) {
-+      GSS_S_COMPLETE) {
-+    krb5_free_context (ctx);	/* finished with context */
-+    return NIL;
-+  }
- 				/* get default keytab */
--    if (!krb5_kt_default (ctx,&kt)) {
--				/* can do server if have good keytab */
--      if (!krb5_kt_start_seq_get (ctx,kt,&csr))
-+  if (!krb5_kt_default (ctx,&kt)) {
-+			/* can do server if have good keytab */
-+    if (!krb5_kt_start_seq_get (ctx,kt,&csr))
- 	auth_gss.server = auth_gssapi_server;
--      krb5_kt_close (ctx,kt);	/* finished with keytab */
--    }
--    krb5_free_context (ctx);	/* finished with context */
-+    krb5_kt_close (ctx,kt);	/* finished with keytab */
-   }
-+  krb5_free_context (ctx);	/* finished with context */
-   gss_release_name (&smn,&name);/* finished with name */
-   return LONGT;
- }