upgrade to c-client 4.41
This commit is contained in:
brad
parent
0d5809d84f
commit
477752bdba
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2001/09/27 23:37:30 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2001/11/19 01:56:13 brad Exp $
|
||||
|
||||
COMMENT= "University of Washington's c-client mail access routines"
|
||||
|
||||
VERSION= 4.40
|
||||
VERSION= 4.41
|
||||
DISTNAME= pine${VERSION}
|
||||
PKGNAME= c-client-${VERSION}p1
|
||||
PKGNAME= c-client-${VERSION}
|
||||
CATEGORIES= mail devel
|
||||
NEED_VERSION= 1.460
|
||||
NEED_VERSION= 1.489
|
||||
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
|
||||
ftp://ftp.sunet.se/pub/unix/mail/pine/ \
|
||||
|
||||
@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= No
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
SHLIB= libc-client.so.3.0
|
||||
SHLIB= libc-client.so.4.0
|
||||
SUBST_VARS= SHLIB
|
||||
|
||||
MAKE_FLAGS= EXTRACFLAGS="${CFLAGS}" SHLIB="${SHLIB}" \
|
||||
|
||||
3
mail/c-client/distinfo
Normal file
3
mail/c-client/distinfo
Normal file
@ -0,0 +1,3 @@
|
||||
MD5 (pine4.41.tar.gz) = 35c136420c75cd50bba198e106bf02ee
|
||||
RMD160 (pine4.41.tar.gz) = 58ee637905e9339b381ae47702e00e4133595bd0
|
||||
SHA1 (pine4.41.tar.gz) = 959a591cc98a46eae17bc68076642b6924a86e8a
|
||||
@ -1,3 +0,0 @@
|
||||
MD5 (pine4.40.tar.gz) = 5173fecdd0cc7c3b7da7394817ae869f
|
||||
RMD160 (pine4.40.tar.gz) = 5a5a8e1c2e86b2a9dcabb5591a8795d6b47526c4
|
||||
SHA1 (pine4.40.tar.gz) = 90ed30803e6b25add43bf53ec260cdf313cfb77b
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-Makefile,v 1.6 2001/09/27 16:28:09 brad Exp $
|
||||
--- Makefile.orig Tue Jul 3 02:25:17 2001
|
||||
+++ Makefile Wed Sep 26 23:49:56 2001
|
||||
@@ -256,7 +256,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
|
||||
$OpenBSD: patch-Makefile,v 1.7 2001/11/19 01:56:13 brad Exp $
|
||||
--- Makefile.orig Tue Oct 23 00:48:10 2001
|
||||
+++ Makefile Sat Nov 17 19:11:39 2001
|
||||
@@ -253,7 +253,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
|
||||
|
||||
# Make the IMAP Toolkit
|
||||
|
||||
-all: c-client rebuild bundled
|
||||
+all: c-client rebuild
|
||||
-all: SPECIALS c-client rebuild bundled
|
||||
+all: SPECIALS c-client rebuild
|
||||
|
||||
c-client:
|
||||
@echo Not processed yet. In a first-time build, you must specify
|
||||
@@ -367,7 +367,7 @@ an ua:
|
||||
@@ -374,7 +374,7 @@ an ua:
|
||||
$(TOOLS)/$@ "$(LN)" src/imapd imapd
|
||||
$(LN) $(TOOLS)/$@ .
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_c-client_auth_gss.c,v 1.1 2001/09/27 16:28:09 brad Exp $
|
||||
--- src/c-client/auth_gss.c.orig Wed Sep 26 23:42:46 2001
|
||||
+++ src/c-client/auth_gss.c Wed Sep 26 23:47:20 2001
|
||||
$OpenBSD: patch-src_c-client_auth_gss.c,v 1.2 2001/11/19 01:56:13 brad Exp $
|
||||
--- src/c-client/auth_gss.c.orig Fri Sep 28 21:16:11 2001
|
||||
+++ src/c-client/auth_gss.c Sat Nov 17 19:15:56 2001
|
||||
@@ -19,8 +19,19 @@
|
||||
*/
|
||||
|
||||
@ -21,60 +21,3 @@ $OpenBSD: patch-src_c-client_auth_gss.c,v 1.1 2001/09/27 16:28:09 brad Exp $
|
||||
|
||||
long auth_gssapi_valid (void);
|
||||
long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder,
|
||||
@@ -28,6 +39,8 @@ long auth_gssapi_client (authchallenge_t
|
||||
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 @@ AUTHENTICATOR auth_gss = {
|
||||
|
||||
#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 @@ long auth_gssapi_valid (void)
|
||||
/* 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
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.3 2001/09/27 16:28:09 brad Exp $
|
||||
--- src/osdep/unix/env_unix.c.orig Mon Jun 25 23:10:04 2001
|
||||
+++ src/osdep/unix/env_unix.c Wed Sep 26 23:49:57 2001
|
||||
@@ -992,7 +992,8 @@ long dotlock_lock (char *file,DOTLOCK *b
|
||||
$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.4 2001/11/19 01:56:13 brad Exp $
|
||||
--- src/osdep/unix/env_unix.c.orig Wed Oct 17 23:35:20 2001
|
||||
+++ src/osdep/unix/env_unix.c Sat Nov 17 19:06:47 2001
|
||||
@@ -1001,7 +1001,8 @@ long dotlock_lock (char *file,DOTLOCK *b
|
||||
}
|
||||
close (pi[0]); close (pi[1]);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user