update to v2001.315

mail/imap-uw/Makefile

@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.20 2001/09/24 22:01:49 jakob Exp $
+# $OpenBSD: Makefile,v 1.21 2001/11/17 11:12:08 jakob Exp $
 
 COMMENT=	University of Washington IMAP4rev1/POP2/POP3 mail servers
 
-VERSION=	2001.313
-DISTNAME=	pine4.40
+VERSION=	2001.315
+DISTNAME=	pine4.41
 PKGNAME=	imap-uw-${VERSION}
 CATEGORIES=	mail
-NEED_VERSION=	1.460
+NEED_VERSION=	1.491
 
 HOMEPAGE=	http://www.washington.edu/imap/
 

mail/imap-uw/distinfo

@@ -0,0 +1,3 @@
+MD5 (pine4.41.tar.gz) = 35c136420c75cd50bba198e106bf02ee
+RMD160 (pine4.41.tar.gz) = 58ee637905e9339b381ae47702e00e4133595bd0
+SHA1 (pine4.41.tar.gz) = 959a591cc98a46eae17bc68076642b6924a86e8a

mail/imap-uw/files/md5

@@ -1,3 +0,0 @@
-MD5 (pine4.40.tar.gz) = 5173fecdd0cc7c3b7da7394817ae869f
-RMD160 (pine4.40.tar.gz) = 5a5a8e1c2e86b2a9dcabb5591a8795d6b47526c4
-SHA1 (pine4.40.tar.gz) = 90ed30803e6b25add43bf53ec260cdf313cfb77b

mail/imap-uw/patches/patch-src_c-client_auth_gss.c

@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_c-client_auth_gss.c,v 1.1 2001/09/24 22:01:49 jakob Exp $
+$OpenBSD: patch-src_c-client_auth_gss.c,v 1.2 2001/11/17 11:12:10 jakob Exp $
 
 --- src/c-client/auth_gss.c.orig	Wed Aug  8 23:24:07 2001
 +++ src/c-client/auth_gss.c	Tue Sep 11 12:05:07 2001
@@ -22,60 +22,4 @@ $OpenBSD: patch-src_c-client_auth_gss.c,v 1.1 2001/09/24 22:01:49 jakob Exp $
  
  long auth_gssapi_valid (void);
  long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
-@@ -28,6 +39,8 @@
- 			 unsigned long *trial,char *user);
- char *auth_gssapi_server (authresponse_t responder,int argc,char *argv[]);
- 
-+static long has_keytab (void);
-+
- AUTHENTICATOR auth_gss = {
-   AU_SECURE | AU_AUTHUSER,	/* secure authenticator */
-   "GSSAPI",			/* authenticator name */
-@@ -45,7 +58,6 @@
- 
- #define SERVER_LOG(x,y) syslog (LOG_ALERT,x,y)
- 
--extern char *krb5_defkeyname;	/* sneaky way to get this name */
- 
- /* Check if GSSAPI valid on this system
-  * Returns: T if valid, NIL otherwise
-@@ -63,10 +75,38 @@
- 				/* see if can build a name */
-   if (gss_import_name (&smn,&buf,gss_nt_service_name,&name) != GSS_S_COMPLETE)
-     return NIL;			/* failed */
--  if ((s = strchr (krb5_defkeyname,':')) && stat (++s,&sbuf))
-+  if (!has_keytab ())
-     auth_gss.server = NIL;	/* can't do server if no keytab */
-   gss_release_name (&smn,&name);/* finished with name */
-   return LONGT;
-+}
-+
-+/* Check if there is a keytab.
-+ * Returns: T if it exists, NIL otherwise
-+ */
-+
-+static long has_keytab (void)
-+{
-+  krb5_context context;
-+  krb5_error_code ret;    
-+  krb5_keytab kt;
-+  krb5_kt_cursor cursor;
-+
-+  ret = krb5_init_context (&context);
-+  if (ret)
-+    return NIL;
-+  ret = krb5_kt_default (context, &kt);
-+  if (ret) {
-+      krb5_free_context (context);
-+      return NIL;
-+  }
-+  ret = krb5_kt_start_seq_get (context, kt, &cursor);
-+  krb5_kt_close (context, kt);
-+  krb5_free_context (context);
-+  if (ret)
-+      return NIL;
-+  else
-+      return T;
- }
- 
- /* Client authenticator
+