From 39f5133305bb1756b2d292743e3b1992b46b4421 Mon Sep 17 00:00:00 2001 From: jakob Date: Thu, 17 Apr 2003 08:06:29 +0000 Subject: [PATCH] update to imap-uw release 2002c. --- mail/imap-uw/Makefile | 6 +++--- mail/imap-uw/distinfo | 6 +++--- mail/imap-uw/patches/patch-Makefile | 8 +++---- .../patches/patch-src_c-client_auth_gss.c | 19 ----------------- .../patches/patch-src_osdep_unix_Makefile.gss | 8 +++---- .../patches/patch-src_osdep_unix_env_unix.c | 21 ++++++------------- .../patches/patch-src_osdep_unix_kerb_mit_c | 17 +++++++++++++++ 7 files changed, 37 insertions(+), 48 deletions(-) delete mode 100644 mail/imap-uw/patches/patch-src_c-client_auth_gss.c create mode 100644 mail/imap-uw/patches/patch-src_osdep_unix_kerb_mit_c diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index c0cba33e716..e8b4ba89ba6 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.37 2003/01/10 08:36:10 jakob Exp $ +# $OpenBSD: Makefile,v 1.38 2003/04/17 08:06:29 jakob Exp $ COMMENT= "University of Washington IMAP4rev1/POP2/POP3 mail servers" COMMENT-mailutil= "University of Washington IMAP4rev1/POP2/POP3 mail utility" -VERSION= 2002.336 -DISTNAME= imap-2002b +VERSION= 2002.337 +DISTNAME= imap-2002c PKGNAME= imap-uw-${VERSION} PKGNAME-mailutil= mailutil-uw-${VERSION} CATEGORIES= mail diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo index 02292f9afb4..1d2ce60c65a 100644 --- a/mail/imap-uw/distinfo +++ b/mail/imap-uw/distinfo @@ -1,3 +1,3 @@ -MD5 (imap-2002b.tar.Z) = 0da8616dec7d49cba860aeae43d966b4 -RMD160 (imap-2002b.tar.Z) = 3ffe41de66c6ed33c679e934fd9b5e677087756e -SHA1 (imap-2002b.tar.Z) = c9ab145a8559670a6a994393d2b9614a5a1fde67 +MD5 (imap-2002c.tar.Z) = 54c87dc874f6564a303fc60b14513a74 +RMD160 (imap-2002c.tar.Z) = f48b86ac264ca55b3502043be869db5ced1545a8 +SHA1 (imap-2002c.tar.Z) = 131fad01890c856070479efac05bf088415ece78 diff --git a/mail/imap-uw/patches/patch-Makefile b/mail/imap-uw/patches/patch-Makefile index 079730441d2..9614e4d73d2 100644 --- a/mail/imap-uw/patches/patch-Makefile +++ b/mail/imap-uw/patches/patch-Makefile @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile,v 1.3 2002/10/05 15:22:27 jakob Exp $ ---- Makefile.orig Sat Oct 5 17:13:08 2002 -+++ Makefile Sat Oct 5 17:14:04 2002 -@@ -393,8 +393,6 @@ sslunix sslsco: +$OpenBSD: patch-Makefile,v 1.4 2003/04/17 08:06:30 jakob Exp $ +--- Makefile.orig Tue Nov 5 01:19:13 2002 ++++ Makefile Thu Apr 17 09:14:05 2003 +@@ -397,8 +397,6 @@ sslunix sslsco: @echo ++ SSLTYPE=$(SSLTYPE).nopwd @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @echo diff --git a/mail/imap-uw/patches/patch-src_c-client_auth_gss.c b/mail/imap-uw/patches/patch-src_c-client_auth_gss.c deleted file mode 100644 index e8581e743ca..00000000000 --- a/mail/imap-uw/patches/patch-src_c-client_auth_gss.c +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_c-client_auth_gss.c,v 1.3 2002/09/18 08:19:06 jakob Exp $ - ---- src/c-client/auth_gss.c.orig Thu Nov 22 05:03:10 2001 -+++ src/c-client/auth_gss.c Sun Sep 8 20:49:46 2002 -@@ -19,8 +19,14 @@ - */ - - #define PROTOTYPE(x) x -+ -+#ifdef HEIMDAL -+#include -+#include -+#else - #include - #include -+#endif - - long auth_gssapi_valid (void); - long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder, diff --git a/mail/imap-uw/patches/patch-src_osdep_unix_Makefile.gss b/mail/imap-uw/patches/patch-src_osdep_unix_Makefile.gss index 77abb28ab87..5d3c327ed14 100644 --- a/mail/imap-uw/patches/patch-src_osdep_unix_Makefile.gss +++ b/mail/imap-uw/patches/patch-src_osdep_unix_Makefile.gss @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.3 2002/09/18 08:19:06 jakob Exp $ +$OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.4 2003/04/17 08:06:30 jakob Exp $ ---- src/osdep/unix/Makefile.gss.orig Wed Nov 21 19:13:49 2001 -+++ src/osdep/unix/Makefile.gss Sun Sep 8 20:48:15 2002 +--- src/osdep/unix/Makefile.gss.orig Wed Mar 5 06:26:40 2003 ++++ src/osdep/unix/Makefile.gss Thu Apr 17 09:14:06 2003 @@ -21,11 +21,10 @@ # Extended flags needed for additional authenticators. You may need to modify. @@ -16,4 +16,4 @@ $OpenBSD: patch-src_osdep_unix_Makefile.gss,v 1.3 2002/09/18 08:19:06 jakob Exp echo $(GSSCFLAGS) >> OSCFLAGS - sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS + echo $(GSSLDFLAGS) >> LDFLAGS - + echo "#include \"kerb_mit.c\"" >> auths.c diff --git a/mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c b/mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c index d846c681431..50714f67dc6 100644 --- a/mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c +++ b/mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c @@ -1,12 +1,13 @@ -$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.3 2002/09/18 08:19:06 jakob Exp $ +$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.4 2003/04/17 08:06:30 jakob Exp $ ---- src/osdep/unix/env_unix.c.orig Tue Sep 3 08:39:10 2002 -+++ src/osdep/unix/env_unix.c Sun Sep 8 14:55:34 2002 -@@ -773,14 +773,12 @@ char *myhomedir () +--- src/osdep/unix/env_unix.c.orig Wed Apr 16 23:03:26 2003 ++++ src/osdep/unix/env_unix.c Thu Apr 17 09:21:27 2003 +@@ -783,15 +783,12 @@ char *myhomedir () static char *mymailboxdir () { char *home = myhomedir (); -- if (!myMailboxDir && home) { /* initialize if first time */ +- /* initialize if first time */ +- if (!myMailboxDir && myHomeDir) { if (mailsubdir) { char tmp[MAILTMPLEN]; sprintf (tmp,"%s/%s",home,mailsubdir); @@ -17,13 +18,3 @@ $OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.3 2002/09/18 08:19:06 jakob Exp $ return myMailboxDir ? myMailboxDir : ""; } -@@ -1036,7 +1034,8 @@ long dotlock_lock (char *file,DOTLOCK *b - } - close (pi[0]); close (pi[1]); - } -- if (lockEaccesError) { /* punt silently if paranoid site */ -+ if (strncmp(base->lock,"/var/mail/",10) && lockEaccesError) { -+ /* punt silently if paranoid site */ - sprintf (tmp,"Mailbox vulnerable - directory %.80s",base->lock); - if (s = strrchr (tmp,'/')) *s = '\0'; - strcat (tmp," must have 1777 protection"); diff --git a/mail/imap-uw/patches/patch-src_osdep_unix_kerb_mit_c b/mail/imap-uw/patches/patch-src_osdep_unix_kerb_mit_c new file mode 100644 index 00000000000..cd28dbe4e33 --- /dev/null +++ b/mail/imap-uw/patches/patch-src_osdep_unix_kerb_mit_c @@ -0,0 +1,17 @@ +$OpenBSD: patch-src_osdep_unix_kerb_mit_c,v 1.1 2003/04/17 08:06:30 jakob Exp $ +--- src/osdep/unix/kerb_mit.c.orig Thu Apr 17 09:29:01 2003 ++++ src/osdep/unix/kerb_mit.c Thu Apr 17 09:29:19 2003 +@@ -19,8 +19,13 @@ + */ + + #define PROTOTYPE(x) x ++#ifdef HEIMDAL ++#include ++#include ++#else + #include + #include ++#endif + + + long kerberos_server_valid (void);