diff options
Diffstat (limited to 'mail/popper')
-rw-r--r-- | mail/popper/Makefile | 8 | ||||
-rw-r--r-- | mail/popper/distinfo | 2 | ||||
-rw-r--r-- | mail/popper/files/patch-ag | 50 | ||||
-rw-r--r-- | mail/popper/files/patch-ah | 46 | ||||
-rw-r--r-- | mail/popper/files/patch-ai | 18 |
5 files changed, 68 insertions, 56 deletions
diff --git a/mail/popper/Makefile b/mail/popper/Makefile index fa20d8ac5cec..42b3a82c1286 100644 --- a/mail/popper/Makefile +++ b/mail/popper/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: popper -# Version required: 2.5 +# Version required: 2.5* # Date created: 1 April 1995 # Whom: pst # -# $Id: Makefile,v 1.24 1998/06/30 22:38:32 ache Exp $ +# $Id: Makefile,v 1.25 1998/07/01 02:13:58 ache Exp $ # -DISTNAME= qpopper2.5 -PKGNAME= qpopper-2.5 +DISTNAME= qpopper2.52 +PKGNAME= qpopper-2.52 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 47dc1ad23cab..85d356b3d598 100644 --- a/mail/popper/distinfo +++ b/mail/popper/distinfo @@ -1 +1 @@ -MD5 (qpopper2.5.tar.Z) = fd39b30df9aaebf893d8c85a2629c7b1 +MD5 (qpopper2.52.tar.Z) = 47a79ea876f4c9a43ccafe3869a7d85a diff --git a/mail/popper/files/patch-ag b/mail/popper/files/patch-ag index bf573ea7937a..e8af268d625a 100644 --- a/mail/popper/files/patch-ag +++ b/mail/popper/files/patch-ag @@ -1,19 +1,31 @@ ---- pop_log.c.orig Wed Nov 19 13:20:38 1997 -+++ pop_log.c Sat Jun 27 14:46:17 1998 -@@ -47,12 +47,12 @@ - #endif - - #ifdef HAVE_VPRINTF -- vsprintf(msgbuf,format,ap); -+ vsnprintf(msgbuf,sizeof msgbuf,format,ap); - #else - # ifdef PYRAMID -- (void)sprintf(msgbuf,format, arg1, arg2, arg3, arg4, arg5, arg6); -+ (void)snprintf(msgbuf,sizeof msgbuf,format, arg1, arg2, arg3, arg4, arg5, arg6); - # else -- (void)sprintf (msgbuf,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2], -+ (void)snprintf (msgbuf,sizeof msgbuf,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2], - ((int *)ap)[3],((int *)ap)[4],((int *)ap)[5]); - # endif - va_end(ap); - +*** pop_log.c.bak Thu Jul 2 06:45:52 1998 +--- pop_log.c Thu Jul 2 06:51:21 1998 +*************** +*** 55,61 **** + format = va_arg(ap,char *); + #endif + #ifdef HAVE_VPRINTF +! vsprintf(msgbuf,format,ap); + #else + arg1 = va_arg(ap, char *); + arg2 = va_arg(ap, char *); +--- 55,61 ---- + format = va_arg(ap,char *); + #endif + #ifdef HAVE_VPRINTF +! vsnprintf(msgbuf,sizeof(msgbuf),format,ap); + #else + arg1 = va_arg(ap, char *); + arg2 = va_arg(ap, char *); +*************** +*** 77,83 **** +--- 77,85 ---- + date_time = (char *)ctime(&clock); + date_time[strlen(date_time) - 1] = '\0'; + (void)fprintf(p->trace,"%s [%d] %s\n",date_time, getpid(), msgbuf); ++ #if 0 + (void)fprintf(p->trace,"%s \n", date_time); ++ #endif + (void)fflush(p->trace); + } + else { diff --git a/mail/popper/files/patch-ah b/mail/popper/files/patch-ah index 4d839c7d22ea..6933ec6e3867 100644 --- a/mail/popper/files/patch-ah +++ b/mail/popper/files/patch-ah @@ -1,19 +1,19 @@ -*** pop_msg.c.orig Thu Nov 20 00:20:38 1997 ---- pop_msg.c Sun Jun 28 21:39:56 1998 +*** pop_msg.c.orig Wed Jul 1 23:54:51 1998 +--- pop_msg.c Thu Jul 2 07:12:46 1998 *************** -*** 27,32 **** ---- 27,33 ---- - { - POP * p; - int stat; /* POP status indicator */ -+ int l, len; /* remaining buffer length */ - char * format; /* Format string for the message */ +*** 43,48 **** +--- 43,49 ---- + #endif va_list ap; register char * mp; ++ int l, len; /* remaining buffer length */ + #ifdef PYRAMID + char * arg1, *arg2, *arg3, *arg4, *arg5, *arg6; + #endif *************** -*** 50,55 **** ---- 51,57 ---- - +*** 67,72 **** +--- 68,74 ---- + #endif /* Point to the message buffer */ mp = message; + len = sizeof(message); @@ -21,25 +21,20 @@ /* Format the POP status code at the beginning of the message */ if (stat == POP_SUCCESS) *************** -*** 58,74 **** +*** 75,86 **** (void)sprintf (mp,"%s ",POP_ERR); /* Point past the POP status indicator in the message message */ ! mp += strlen(mp); /* Append the message (formatted, if necessary) */ - if (format) + if (format) { #ifdef HAVE_VPRINTF ! vsprintf(mp,format,ap); #else # ifdef PYRAMID -! (void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6); - # else -! (void)sprintf(mp,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2], - ((int *)ap)[3],((int *)ap)[4]); - # endif - #endif ---- 60,77 ---- + (void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6); +--- 77,89 ---- (void)sprintf (mp,"%s ",POP_ERR); /* Point past the POP status indicator in the message message */ @@ -47,14 +42,9 @@ ! len -= l, mp += l; /* Append the message (formatted, if necessary) */ - if (format) + if (format) { #ifdef HAVE_VPRINTF ! vsnprintf(mp,len-3,format,ap); #else # ifdef PYRAMID -! (void)snprintf(mp,len-3,format, arg1, arg2, arg3, arg4, arg5, arg6); - # else -! (void)snprintf(mp,len-3,format,((int *)ap)[0],((int *)ap)[1],((int *)ap)[2], - ((int *)ap)[3],((int *)ap)[4]); - # endif - #endif + (void)sprintf(mp,format, arg1, arg2, arg3, arg4, arg5, arg6); diff --git a/mail/popper/files/patch-ai b/mail/popper/files/patch-ai index 259db5ecda16..f42c7293de2e 100644 --- a/mail/popper/files/patch-ai +++ b/mail/popper/files/patch-ai @@ -1,5 +1,5 @@ -*** pop_dropcopy.c.orig Wed Jul 1 00:06:43 1998 ---- pop_dropcopy.c Wed Jul 1 00:16:07 1998 +*** pop_dropcopy.c.orig Thu Jul 2 07:56:52 1998 +--- pop_dropcopy.c Thu Jul 2 07:58:24 1998 *************** *** 471,478 **** *cp++ = '\n'; @@ -36,7 +36,7 @@ #endif } -! } else if (!strncmp(buffer, "Content-Length:", 15)) { +! } else if (!strncasecmp(buffer, "Content-Length:", 15)) { ! if (CONTENT_LENGTH) { ! cont_len = atoi(buffer + 15); ! MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer)); @@ -103,7 +103,7 @@ #endif } -! } else if (!strncmp(buffer, "Content-Length:", 15)) { +! } else if (!strncasecmp(buffer, "Content-Length:", 15)) { ! if (CONTENT_LENGTH) { ! cont_len = atoi(buffer + 15); ! MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer)); @@ -133,3 +133,13 @@ } } continue; /* Do not include this value in the message size */ +*************** +*** 1031,1036 **** +--- 1042,1048 ---- + (void)ftruncate(dfd, (OFF_T)offset); + } + #ifdef BULLDB ++ if (p->bulldir != NULL) + #ifdef GDBM + gdbm_close(p->bull_db); + #else |