diff options
Diffstat (limited to 'mail/alpine')
-rw-r--r-- | mail/alpine/Makefile | 5 | ||||
-rw-r--r-- | mail/alpine/distinfo | 14 | ||||
-rw-r--r-- | mail/alpine/patches/patch-aa | 25 | ||||
-rw-r--r-- | mail/alpine/patches/patch-ab | 23 | ||||
-rw-r--r-- | mail/alpine/patches/patch-imap_src_mtest_mtest.c | 137 |
5 files changed, 33 insertions, 171 deletions
diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile index 54a87a0a0e6..f70cdc641f7 100644 --- a/mail/alpine/Makefile +++ b/mail/alpine/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2016/03/05 11:28:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.40 2016/05/14 16:13:10 bsiegert Exp $ # -DISTNAME= alpine-2.11 -PKGREVISION= 5 +DISTNAME= alpine-2.20 CATEGORIES= mail MASTER_SITES= http://patches.freeiz.com/alpine/release/src/ EXTRACT_SUFX= .tar.xz diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo index 3e18f07b313..c0a58740beb 100644 --- a/mail/alpine/distinfo +++ b/mail/alpine/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.21 2015/11/08 20:13:24 dholland Exp $ +$NetBSD: distinfo,v 1.22 2016/05/14 16:13:10 bsiegert Exp $ -SHA1 (alpine-2.11.tar.xz) = 656556f5d2e5ec7e3680d1760cd02aa3a0072c46 -RMD160 (alpine-2.11.tar.xz) = ea4b2d87500d1aa1b424033ec3263e3cf3c53814 -SHA512 (alpine-2.11.tar.xz) = 0bc0c163d57a92619315e386ff5b77bfa3c69d6721bcd33572fecf837f6c186fb8ea7a7e396036c853e41e8b7a2c7ec763bce3bd666a4c69868491c5bfd5776f -Size (alpine-2.11.tar.xz) = 4403188 bytes -SHA1 (patch-aa) = c306613a297d61591d577b6968a31fc85b03f852 -SHA1 (patch-ab) = f0983d8c0123b06a2970eb2736b04afad1502450 +SHA1 (alpine-2.20.tar.xz) = 05f4908a347969b77b684cc8b995d4aaa1506155 +RMD160 (alpine-2.20.tar.xz) = c6aed347725cc62f32e23017cf192335513dbd55 +SHA512 (alpine-2.20.tar.xz) = 1c3947669f5d17428e404e1106188bc2efb541cb78eb1f87092c0388bf360ca03073530e7b5fde86085c99b198c817756cc7e007a9db6a5de60f883275a7e72c +Size (alpine-2.20.tar.xz) = 4841816 bytes SHA1 (patch-imap_src_c-client_auth_gss.c) = 622b18f03074f87036f5469323125b4c855d9ce5 -SHA1 (patch-imap_src_mtest_mtest.c) = a08084e1ea656385b267049bb2465b1af6c2949b +SHA1 (patch-imap_src_mtest_mtest.c) = 089837ea9482e6cdcbde4c774cc71f96071171c9 SHA1 (patch-imap_src_osdep_unix_Makefile.gss) = ca09bc26a139c68afe8ac1f99be54bd1fc0e77f0 SHA1 (patch-imap_src_osdep_unix_kerb_mit.c) = c77d5ee1e8aee30811c2df0562caa375ed270c0e diff --git a/mail/alpine/patches/patch-aa b/mail/alpine/patches/patch-aa deleted file mode 100644 index 4d75d6626c4..00000000000 --- a/mail/alpine/patches/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2009/05/17 17:34:01 plunky Exp $ - -include <time.h> and <utime.h> so that where time_t has been changed to 64-bit -values on NetBSD, we we get correctly referred to __utime50() which can handle -64-bit values. This fixes a problem where mailbox mtimes were being reset to 0 - -Note that this actually causes some build warnings as the code uses -"time_t tp[2]" instead of "struct utimbuf tp" (contains two time_t values) - -Although the <os_bsi.h> file says it is used for BSDI, it seems to be used by -NetBSD and OpenBSD, both of which have the <utime.h> and <time.h> - - - plunky - ---- imap/src/osdep/unix/os_bsi.h.orig 2008-06-04 19:18:34.000000000 +0100 -+++ imap/src/osdep/unix/os_bsi.h 2009-05-17 18:00:44.000000000 +0100 -@@ -34,6 +34,8 @@ - #include <fcntl.h> - #include <syslog.h> - #include <sys/file.h> -+#include <time.h> -+#include <utime.h> - - - #include "env_unix.h" diff --git a/mail/alpine/patches/patch-ab b/mail/alpine/patches/patch-ab deleted file mode 100644 index 2085d474802..00000000000 --- a/mail/alpine/patches/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2009/08/06 20:01:50 plunky Exp $ - -OpenSSL provides a version of STRING that conflicts with the Alpine -internal version. Since we don't use it, just define it away for now.. - ---- imap/src/osdep/unix/ssl_unix.c.orig 2009-08-06 20:45:06.000000000 +0100 -+++ imap/src/osdep/unix/ssl_unix.c -@@ -27,6 +27,7 @@ - */ - - #define crypt ssl_private_crypt -+#define STRING ssl_private_STRING - #include <x509v3.h> - #include <ssl.h> - #include <err.h> -@@ -36,6 +37,7 @@ - #include <crypto.h> - #include <rand.h> - #undef crypt -+#undef STRING - - #define SSLBUFLEN 8192 - #define SSLCIPHERLIST "ALL:!LOW" diff --git a/mail/alpine/patches/patch-imap_src_mtest_mtest.c b/mail/alpine/patches/patch-imap_src_mtest_mtest.c index c3002cbe339..6c328525b49 100644 --- a/mail/alpine/patches/patch-imap_src_mtest_mtest.c +++ b/mail/alpine/patches/patch-imap_src_mtest_mtest.c @@ -1,70 +1,29 @@ -$NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ +$NetBSD: patch-imap_src_mtest_mtest.c,v 1.2 2016/05/14 16:13:10 bsiegert Exp $ - patch up buffer handling (required to build on openbsd) ---- imap/src/mtest/mtest.c.orig 2013-08-15 04:36:01.000000000 +0000 +--- imap/src/mtest/mtest.c.orig 2015-01-12 05:12:25.000000000 +0000 +++ imap/src/mtest/mtest.c -@@ -81,9 +81,23 @@ void overview_header (MAILSTREAM *stream - void header (MAILSTREAM *stream,long msgno); - void display_body (BODY *body,char *pfx,long i); - void status (MAILSTREAM *stream); --void prompt (char *msg,char *txt); -+void prompt (char *msg,char *txt,size_t len); - void smtptest (long debug); - -+static char *dogets(char *buf, size_t max) { -+ char *ret; -+ size_t len; -+ -+ ret = fgets(buf, max, stdin); -+ if (ret != NULL) { -+ len = strlen(buf); -+ if (len > 0 && buf[len-1] == '\n') { -+ buf[len-1] = '\0'; -+ } -+ } -+ return ret; -+} -+ - /* Main program - initialization */ - - int main () -@@ -118,13 +132,13 @@ int main () - #endif - curhst = cpystr (mylocalhost ()); - puts ("MTest -- C client test program"); -- if (!*personalname) prompt ("Personal name: ",personalname); -+ if (!*personalname) prompt ("Personal name: ",personalname, sizeof(personalname)); - /* user wants protocol telemetry? */ -- prompt ("Debug protocol (y/n)?",tmp); -+ prompt ("Debug protocol (y/n)?",tmp, sizeof(tmp)); - ucase (tmp); - debug = (tmp[0] == 'Y') ? T : NIL; - do { -- prompt ("Mailbox ('?' for help): ",tmp); -+ prompt ("Mailbox ('?' for help): ",tmp, sizeof(tmp)); - if (!strcmp (tmp,"?")) { - puts ("Enter INBOX, mailbox name, or IMAP mailbox as {host}mailbox"); - puts ("Known local mailboxes:"); -@@ -155,14 +169,16 @@ void mm (MAILSTREAM *stream,long debug) +@@ -151,6 +151,7 @@ void mm (MAILSTREAM *stream,long debug) void *sdb = NIL; - char cmd[MAILTMPLEN]; - char *s,*arg; + char cmd[MAILTMPLEN],tmp[MAILTMPLEN]; + char *s, *arg; + size_t argmax; unsigned long i; unsigned long last = 0; BODY *body; - status (stream); /* first report message status */ +@@ -158,7 +159,9 @@ void mm (MAILSTREAM *stream,long debug) while (stream) { -- prompt ("MTest>",cmd); /* prompt user, get command */ -+ prompt ("MTest>",cmd, sizeof(cmd)); /* prompt user, get command */ + prompt ("MTest> ",cmd, sizeof(cmd)); /* prompt user, get command */ /* get argument */ - if (arg = strchr (cmd,' ')) *arg++ = '\0'; -+ if (arg) argmax = sizeof(cmd) - (arg - cmd); +- if (arg = strchr (cmd,' ')) *arg++ = '\0'; ++ if (arg) ++ argmax = sizeof(cmd) - (arg - cmd); ++ switch (*ucase (cmd)) { /* dispatch based on command */ case 'B': /* Body command */ if (arg) last = atoi (arg); -@@ -189,7 +205,8 @@ void mm (MAILSTREAM *stream,long debug) +@@ -185,7 +188,8 @@ void mm (MAILSTREAM *stream,long debug) break; } arg = cmd; @@ -74,24 +33,24 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ } if (last && (last <= stream->nmsgs)) mail_setflag (stream,arg,"\\DELETED"); -@@ -202,6 +219,7 @@ void mm (MAILSTREAM *stream,long debug) +@@ -198,6 +202,7 @@ void mm (MAILSTREAM *stream,long debug) case 'F': /* Find command */ if (!arg) { arg = "%"; + argmax = 0; - if (s = sm_read (&sdb)) { + if (s = sm_read (tmp,&sdb)) { puts ("Local network subscribed mailboxes:"); do if (*s == '{') (mm_lsub (NIL,NIL,s,NIL)); -@@ -255,7 +273,7 @@ void mm (MAILSTREAM *stream,long debug) +@@ -251,7 +256,7 @@ void mm (MAILSTREAM *stream,long debug) } /* get the new mailbox */ while (!(stream = mail_open (stream,arg,debug))) { -- prompt ("Mailbox: ",arg); +- prompt ("Mailbox: ",arg, sizeof(arg)); + prompt ("Mailbox: ",arg, argmax); if (!arg[0]) break; } last = 0; -@@ -327,7 +345,8 @@ void mm (MAILSTREAM *stream,long debug) +@@ -323,7 +328,8 @@ void mm (MAILSTREAM *stream,long debug) break; } arg = cmd; @@ -101,7 +60,7 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ } if (last > 0 && last <= stream->nmsgs) mail_clearflag (stream,arg,"\\DELETED"); -@@ -376,7 +395,7 @@ void overview_header (MAILSTREAM *stream +@@ -384,7 +390,7 @@ void overview_header (MAILSTREAM *stream tmp[3] = elt->answered ? 'A' : ' '; tmp[4] = elt->deleted ? 'D' : ' '; mail_parse_date (&selt,ov->date); @@ -110,7 +69,7 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ mail_date (tmp+11,&selt); tmp[17] = ' '; tmp[18] = '\0'; -@@ -386,19 +405,20 @@ void overview_header (MAILSTREAM *stream +@@ -394,19 +400,20 @@ void overview_header (MAILSTREAM *stream for (adr = ov->from; adr && !adr->host; adr = adr->next); if (adr) { /* if a personal name exists use it */ if (!(t = adr->personal)) @@ -133,7 +92,7 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ ov->subject ? ov->subject : " ",ov->optional.octets); puts (tmp); } -@@ -415,6 +435,7 @@ void header (MAILSTREAM *stream,long msg +@@ -423,6 +430,7 @@ void header (MAILSTREAM *stream,long msg unsigned long i; char tmp[MAILTMPLEN]; char *t; @@ -141,7 +100,7 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ MESSAGECACHE *cache = mail_elt (stream,msgno); mail_fetchstructure (stream,msgno,NIL); tmp[0] = cache->recent ? (cache->seen ? 'R': 'N') : ' '; -@@ -422,7 +443,7 @@ void header (MAILSTREAM *stream,long msg +@@ -430,7 +438,7 @@ void header (MAILSTREAM *stream,long msg tmp[2] = cache->flagged ? 'F' : ' '; tmp[3] = cache->answered ? 'A' : ' '; tmp[4] = cache->deleted ? 'D' : ' '; @@ -150,7 +109,7 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ mail_date (tmp+11,cache); tmp[17] = ' '; tmp[18] = '\0'; -@@ -437,7 +458,9 @@ void header (MAILSTREAM *stream,long msg +@@ -445,7 +453,9 @@ void header (MAILSTREAM *stream,long msg strcat (tmp,"} "); } mail_fetchsubject (t = tmp + strlen (tmp),stream,msgno,(long) 25); @@ -161,7 +120,7 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ puts (tmp); } -@@ -451,31 +474,57 @@ void display_body (BODY *body,char *pfx, +@@ -459,31 +469,57 @@ void display_body (BODY *body,char *pfx, { char tmp[MAILTMPLEN]; char *s = tmp; @@ -228,7 +187,7 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ break; } puts (tmp); /* output this line */ -@@ -484,7 +533,7 @@ void display_body (BODY *body,char *pfx, +@@ -492,7 +528,7 @@ void display_body (BODY *body,char *pfx, (body = body->nested.msg->body)) { if (body->type == TYPEMULTIPART) display_body (body,pfx,i-1); else { /* build encapsulation prefix */ @@ -237,20 +196,7 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ display_body (body,tmp,(long) 0); } } -@@ -592,10 +641,10 @@ void status (MAILSTREAM *stream) - * pointer to input buffer - */ - --void prompt (char *msg,char *txt) -+void prompt (char *msg,char *txt, size_t max) - { - printf ("%s",msg); -- gets (txt); -+ dogets (txt, max); - } - - /* Interfaces to C-client */ -@@ -699,10 +748,13 @@ void mm_login (NETMBX *mb,char *user,cha +@@ -711,10 +747,13 @@ void mm_login (NETMBX *mb,char *user,cha if (curhst) fs_give ((void **) &curhst); curhst = (char *) fs_get (1+strlen (mb->host)); strcpy (curhst,mb->host); @@ -268,36 +214,3 @@ $NetBSD: patch-imap_src_mtest_mtest.c,v 1.1 2015/11/08 20:13:24 dholland Exp $ else { printf ("%s} username: ",tmp); fgets (user,NETMAXUSER-1,stdin); -@@ -758,14 +810,14 @@ void smtptest (long debug) - msg->return_path = mail_newaddr (); - msg->return_path->mailbox = cpystr (curusr); - msg->return_path->host = cpystr (curhst); -- prompt ("To: ",line); -+ prompt ("To: ",line, sizeof(line)); - rfc822_parse_adrlist (&msg->to,line,curhst); - if (msg->to) { -- prompt ("cc: ",line); -+ prompt ("cc: ",line, sizeof(line)); - rfc822_parse_adrlist (&msg->cc,line,curhst); - } - else { -- prompt ("Newsgroups: ",line); -+ prompt ("Newsgroups: ",line, sizeof(line)); - if (*line) msg->newsgroups = cpystr (line); - else { - mail_free_body (&body); -@@ -774,12 +826,12 @@ void smtptest (long debug) - return; - } - } -- prompt ("Subject: ",line); -+ prompt ("Subject: ",line, sizeof(line)); - msg->subject = cpystr (line); - puts (" Msg (end with a line with only a '.'):"); - body->type = TYPETEXT; - *text = '\0'; -- while (gets (line)) { -+ while (dogets (line, sizeof(line))) { - if (line[0] == '.') { - if (line[1] == '\0') break; - else strcat (text,"."); |