From 90c94122e6ff1b22f3da9fd4af682af81942d259 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Tue, 30 Jun 1998 19:14:17 +0000 Subject: Upgrade to 2.5 --- mail/popper/Makefile | 6 +-- mail/popper/distinfo | 2 +- mail/popper/files/patch-ai | 131 +++++++++++++-------------------------------- mail/popper/files/patch-aj | 95 -------------------------------- 4 files changed, 42 insertions(+), 192 deletions(-) delete mode 100644 mail/popper/files/patch-aj (limited to 'mail/popper') diff --git a/mail/popper/Makefile b/mail/popper/Makefile index 04f278aa2716..8a0f2583f16c 100644 --- a/mail/popper/Makefile +++ b/mail/popper/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: popper -# Version required: 2.41beta1 +# Version required: 2.5 # Date created: 1 April 1995 # Whom: pst # # $Id: Makefile,v 1.21 1997/12/24 01:21:35 alex Exp $ # -DISTNAME= qpopper2.41beta1 -PKGNAME= qpopper-2.41b1 +DISTNAME= qpopper2.5 +PKGNAME= qpopper-2.5 CATEGORIES= mail MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ EXTRACT_SUFX= .tar.Z diff --git a/mail/popper/distinfo b/mail/popper/distinfo index 626be990849e..47dc1ad23cab 100644 --- a/mail/popper/distinfo +++ b/mail/popper/distinfo @@ -1 +1 @@ -MD5 (qpopper2.41beta1.tar.Z) = 65c098eb03ac88745353f72b16a3e3a2 +MD5 (qpopper2.5.tar.Z) = fd39b30df9aaebf893d8c85a2629c7b1 diff --git a/mail/popper/files/patch-ai b/mail/popper/files/patch-ai index 965ad3075cf2..7af091a1e764 100644 --- a/mail/popper/files/patch-ai +++ b/mail/popper/files/patch-ai @@ -1,7 +1,7 @@ -*** pop_dropcopy.c.orig Tue Jun 30 10:27:00 1998 ---- pop_dropcopy.c Tue Jun 30 10:27:04 1998 +*** pop_dropcopy.c.orig Tue Jun 30 21:54:41 1998 +--- pop_dropcopy.c Tue Jun 30 21:59:22 1998 *************** -*** 463,470 **** +*** 471,478 **** *cp++ = '\n'; *cp = '\0'; @@ -10,7 +10,7 @@ /* New UIDs do not dirty the mailspool if NO_STATUS is set. They are just recalculated each time the popper is run or LMOS is ---- 463,472 ---- +--- 471,480 ---- *cp++ = '\n'; *cp = '\0'; @@ -22,54 +22,28 @@ /* New UIDs do not dirty the mailspool if NO_STATUS is set. They are just recalculated each time the popper is run or LMOS is *************** -*** 488,506 **** - } else if (!strncasecmp("X-UIDL:", buffer, 7)) { - if (!uidl_found) { - char *cp; - - uidl_found++; - /* Skip over header string */ - cp = &buffer[7]; - while (*cp && (*cp == ' ' || *cp == '\t')) cp++; -! if(strlen(cp) < DIG_SIZE) /* To account for the empty UIDL string */ - { - uidl_found--; /*roll over as though it hasn't seen anything*/ - continue; - } - mp->uidl_str = (char *)strdup(cp); -! mp->length += nchar + 1; -! p->drop_size += nchar + 1; +*** 504,511 **** + if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) { + uidl_found++; + mp->uidl_str = (char *)strdup(cp); +! mp->length += nchar + 1; +! p->drop_size += nchar + 1; + } } continue; /* Do not include this value in the message size */ - } else if ((strncasecmp(buffer,"Status:",7) == 0)) { ---- 490,514 ---- - } else if (!strncasecmp("X-UIDL:", buffer, 7)) { - if (!uidl_found) { - char *cp; -+ int i; - - uidl_found++; - /* Skip over header string */ - cp = &buffer[7]; - while (*cp && (*cp == ' ' || *cp == '\t')) cp++; -! i = strlen(cp); -! /* UIDLs: >=DIG_SIZE-1 (pop_bull.c), DIG_SIZE*2 */ -! if (i < DIG_SIZE || i > (DIG_SIZE * 2) + 1) - { - uidl_found--; /*roll over as though it hasn't seen anything*/ - continue; - } -+ - mp->uidl_str = (char *)strdup(cp); -! i += strlen("X-UIDL: ") + 1; -! mp->length += i; -! p->drop_size += i; -! mp->lines++; +--- 506,515 ---- + if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) { + uidl_found++; + mp->uidl_str = (char *)strdup(cp); +! len += strlen("X-UIDL: ") + 1; +! mp->length += len; +! p->drop_size += len; +! mp->lines++; + } } continue; /* Do not include this value in the message size */ - } else if ((strncasecmp(buffer,"Status:",7) == 0)) { *************** -*** 711,718 **** +*** 717,724 **** *cp++ = '\n'; *cp = '\0'; @@ -78,7 +52,7 @@ /* New UIDs do not dirty the mailspool if NO_STATUS is set. They are just recalculated each time the popper is run or LMOS is ---- 719,728 ---- +--- 721,730 ---- *cp++ = '\n'; *cp = '\0'; @@ -90,52 +64,23 @@ /* New UIDs do not dirty the mailspool if NO_STATUS is set. They are just recalculated each time the popper is run or LMOS is *************** -*** 737,757 **** - } else if (!strncasecmp("X-UIDL:", buffer, 7)) { - if (!uidl_found) { - char *cp; - - uidl_found++; - - /* Skip over header */ - cp = &buffer[7]; - while (*cp && (*cp == ' ' || *cp == '\t')) cp++; -! if(strlen(cp) < DIG_SIZE) /* To account for the empty UIDL string */ - { - uidl_found--; /*roll over as though it hasn't seen anything*/ - continue; - } - - mp->uidl_str = (char *)strdup(cp); -! mp->length += nchar + 1; -! p->drop_size += nchar + 1; +*** 753,760 **** + if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) { + uidl_found++; + mp->uidl_str = (char *)strdup(cp); +! mp->length += nchar + 1; +! p->drop_size += nchar + 1; + } } continue; /* Do not include this value in the message size */ - } else if (!strncasecmp(buffer,"Status:",7)) { ---- 747,772 ---- - } else if (!strncasecmp("X-UIDL:", buffer, 7)) { - if (!uidl_found) { - char *cp; -+ int i; - - uidl_found++; - - /* Skip over header */ - cp = &buffer[7]; - while (*cp && (*cp == ' ' || *cp == '\t')) cp++; -! i = strlen(cp); -! /* UIDLs: >=DIG_SIZE-1 (pop_bull.c), DIG_SIZE*2 */ -! if (i < DIG_SIZE || i > (DIG_SIZE * 2) + 1) - { - uidl_found--; /*roll over as though it hasn't seen anything*/ - continue; - } - - mp->uidl_str = (char *)strdup(cp); -! i += strlen("X-UIDL: ") + 1; -! mp->length += i; -! p->drop_size += i; -! mp->lines++; +--- 759,768 ---- + if( (len = strlen(cp)) > MIN_UIDL_LENGTH && len < MAX_UIDL_LENGTH ) { + uidl_found++; + mp->uidl_str = (char *)strdup(cp); +! len += strlen("X-UIDL: ") + 1; +! mp->length += len; +! p->drop_size += len; +! mp->lines++; + } } continue; /* Do not include this value in the message size */ - } else if (!strncasecmp(buffer,"Status:",7)) { diff --git a/mail/popper/files/patch-aj b/mail/popper/files/patch-aj deleted file mode 100644 index 41839cb1a057..000000000000 --- a/mail/popper/files/patch-aj +++ /dev/null @@ -1,95 +0,0 @@ -*** pop_uidl.c.orig Thu Nov 20 00:20:38 1997 ---- pop_uidl.c Mon Jun 29 02:13:18 1998 -*************** -*** 57,63 **** - "Message %d has been marked for deletion.",msg_id)); - } else { - -! sprintf(buffer, "%d %s", msg_id, mp->uidl_str); - if (nl = index(buffer, NEWLINE)) *nl = 0; - return (pop_msg (p,POP_SUCCESS, buffer)); - } ---- 57,63 ---- - "Message %d has been marked for deletion.",msg_id)); - } else { - -! snprintf(buffer, sizeof(buffer), "%d %s", msg_id, mp->uidl_str); - if (nl = index(buffer, NEWLINE)) *nl = 0; - return (pop_msg (p,POP_SUCCESS, buffer)); - } -*************** -*** 73,79 **** - /* Is the message flagged for deletion? */ - if (mp->del_flag) continue; - -! sprintf(buffer, "%d %s", x, mp->uidl_str); - /* nl = index(mp->uidl_str, NEWLINE); */ - pop_sendline(p, buffer); - /* ---- 73,79 ---- - /* Is the message flagged for deletion? */ - if (mp->del_flag) continue; - -! snprintf(buffer, sizeof(buffer), "%d %s", x, mp->uidl_str); - /* nl = index(mp->uidl_str, NEWLINE); */ - pop_sendline(p, buffer); - /* -*************** -*** 101,107 **** - POP *p; - MsgInfoList *mp; - { -! char buf[MAXLINELEN], *cp; - - fseek(p->drop, mp->offset, 0); - while (fgets(buf, sizeof(buf), p->drop) != NULL) { ---- 101,107 ---- - POP *p; - MsgInfoList *mp; - { -! static char buf[MAXLINELEN], *cp; - - fseek(p->drop, mp->offset, 0); - while (fgets(buf, sizeof(buf), p->drop) != NULL) { -*************** -*** 150,158 **** - "Message %d has been marked for deletion.",msg_id)); - } else { - -! sprintf(buffer, "%d %s", msg_id, mp->uidl_str); - if (nl = index(buffer, NEWLINE)) *nl = 0; -! sprintf(buffer, "%s %d %s", buffer, mp->length, from_hdr(p, mp)); - return (pop_msg (p,POP_SUCCESS, buffer)); - } - } else { ---- 150,158 ---- - "Message %d has been marked for deletion.",msg_id)); - } else { - -! snprintf(buffer, sizeof(buffer), "%d %s", msg_id, mp->uidl_str); - if (nl = index(buffer, NEWLINE)) *nl = 0; -! snprintf(buffer, sizeof(buffer), "%s %d %s", buffer, mp->length, from_hdr(p, mp)); - return (pop_msg (p,POP_SUCCESS, buffer)); - } - } else { -*************** -*** 167,175 **** - /* Is the message flagged for deletion? */ - if (mp->del_flag) continue; - -! sprintf(buffer, "%d %s", x, mp->uidl_str); - if (nl = index(buffer, NEWLINE)) *nl = 0; -! sprintf(buffer, "%s %d %s", buffer, mp->length, from_hdr(p, mp)); - pop_sendline(p, buffer); - } - } ---- 167,175 ---- - /* Is the message flagged for deletion? */ - if (mp->del_flag) continue; - -! snprintf(buffer, sizeof(buffer), "%d %s", x, mp->uidl_str); - if (nl = index(buffer, NEWLINE)) *nl = 0; -! snprintf(buffer, sizeof(buffer), "%s %d %s", buffer, mp->length, from_hdr(p, mp)); - pop_sendline(p, buffer); - } - } -- cgit v1.2.3