From 18ce1086f5072beae453630ccb67b84d02f5e975 Mon Sep 17 00:00:00 2001 From: jakob Date: Thu, 17 Apr 2003 08:17:03 +0000 Subject: [PATCH] pine v4.55. among other things, improved pop3 performance and experimental "mail drop" setup for pop3. a list of all changes can be found at http://www.washington.edu/pine/changes/4.53-to-4.55.html --- mail/pine/Makefile | 6 ++--- mail/pine/distinfo | 6 ++--- .../patch-imap_src_c-client_auth_gss_c | 18 --------------- .../patch-imap_src_osdep_unix_env_unix_c | 22 ++++++------------- .../patch-imap_src_osdep_unix_kerb_mit_c | 17 ++++++++++++++ 5 files changed, 30 insertions(+), 39 deletions(-) delete mode 100644 mail/pine/patches/patch-imap_src_c-client_auth_gss_c create mode 100644 mail/pine/patches/patch-imap_src_osdep_unix_kerb_mit_c diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 01732002ec7..f168fea084c 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2003/01/16 07:22:40 jakob Exp $ +# $OpenBSD: Makefile,v 1.53 2003/04/17 08:17:03 jakob Exp $ COMMENT= "program for Internet E-mail and News" COMMENT-pico= "small text editor" @@ -6,8 +6,8 @@ COMMENT-pilot= "file system browser" CATEGORIES= mail news -VERSION= 4.53 -PICO_VERSION= 4.4 +VERSION= 4.55 +PICO_VERSION= 4.5 PILOT_VERSION= 2.0 DISTNAME= pine${VERSION} diff --git a/mail/pine/distinfo b/mail/pine/distinfo index d46fb740f54..dff545d3594 100644 --- a/mail/pine/distinfo +++ b/mail/pine/distinfo @@ -1,3 +1,3 @@ -MD5 (pine4.53.tar.gz) = 17d2ae323d6012e69c33cf0168dff59b -RMD160 (pine4.53.tar.gz) = 7ca5a1ec8491103bbd18b46a49d6b99be60b6d9c -SHA1 (pine4.53.tar.gz) = 2cf0ab8268a2294c608e099ef0caad7c915e2d5e +MD5 (pine4.55.tar.gz) = 730e69981d2034d9e031ac665b20f6eb +RMD160 (pine4.55.tar.gz) = fc6ad74f641a79d1445cff9ddc3179b69699176b +SHA1 (pine4.55.tar.gz) = 3e44fcea9e553bc571acdd60a0f73fcc3807efdc diff --git a/mail/pine/patches/patch-imap_src_c-client_auth_gss_c b/mail/pine/patches/patch-imap_src_c-client_auth_gss_c deleted file mode 100644 index 7cbbf3408a8..00000000000 --- a/mail/pine/patches/patch-imap_src_c-client_auth_gss_c +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-imap_src_c-client_auth_gss_c,v 1.1 2002/12/01 20:57:10 jakob Exp $ ---- imap/src/c-client/auth_gss.c.orig Thu Nov 22 05:07:04 2001 -+++ imap/src/c-client/auth_gss.c Sun Dec 1 15:17:47 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/pine/patches/patch-imap_src_osdep_unix_env_unix_c b/mail/pine/patches/patch-imap_src_osdep_unix_env_unix_c index 2234ad0fc21..796681e68d0 100644 --- a/mail/pine/patches/patch-imap_src_osdep_unix_env_unix_c +++ b/mail/pine/patches/patch-imap_src_osdep_unix_env_unix_c @@ -1,11 +1,13 @@ -$OpenBSD: patch-imap_src_osdep_unix_env_unix_c,v 1.1 2002/12/01 20:57:10 jakob Exp $ ---- imap/src/osdep/unix/env_unix.c.orig Wed Oct 30 19:06:34 2002 -+++ imap/src/osdep/unix/env_unix.c Sun Dec 1 15:17:47 2002 -@@ -773,14 +773,12 @@ char *myhomedir () +$OpenBSD: patch-imap_src_osdep_unix_env_unix_c,v 1.2 2003/04/17 08:17:04 jakob Exp $ + +--- imap/src/osdep/unix/env_unix.c.orig Wed Apr 16 23:03:26 2003 ++++ imap/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); @@ -16,13 +18,3 @@ $OpenBSD: patch-imap_src_osdep_unix_env_unix_c,v 1.1 2002/12/01 20:57:10 jakob E 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/pine/patches/patch-imap_src_osdep_unix_kerb_mit_c b/mail/pine/patches/patch-imap_src_osdep_unix_kerb_mit_c new file mode 100644 index 00000000000..b50746d1c42 --- /dev/null +++ b/mail/pine/patches/patch-imap_src_osdep_unix_kerb_mit_c @@ -0,0 +1,17 @@ +$OpenBSD: patch-imap_src_osdep_unix_kerb_mit_c,v 1.1 2003/04/17 08:17:04 jakob Exp $ +--- imap/src/osdep/unix/kerb_mit.c.orig Thu Apr 17 09:29:01 2003 ++++ imap/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);