1 files changed, 94 insertions, 135 deletions

diff --git a/mail/popper/files/patch-ai b/mail/popper/files/patch-ai
index f67f0a57ddb8..9ffe31905f9e 100644
--- a/mail/popper/files/patch-ai
+++ b/mail/popper/files/patch-ai
@@ -1,135 +1,94 @@
-*** 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';
-  		    *cp   = '\0';
-  
-! 		    mp->length += strlen("X-UIDL: ") + strlen(mp->uidl_str) + 1;
-! 		    p->drop_size += strlen("X-UIDL: ") + strlen(mp->uidl_str)+1;
-  
-  	/* 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
---- 471,480 ----
-  		    *cp++ = '\n';
-  		    *cp   = '\0';
-  
-! 		    i = strlen("X-UIDL: ") + (DIG_SIZE * 2) + 2;
-! 		    mp->length += i;
-! 		    p->drop_size += i;
-! 		    mp->lines++;
-  
-  	/* 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
-***************
-*** 483,491 ****
-  #endif
-  		}
-  
-! 	    } else if (CONTENT_LENGTH && !strncmp(buffer, "Content-Length:", 15)) {
-! 		cont_len = atoi(buffer + 15);
-! 		MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
-  		continue;	/* not part of the message size */
-  	    } else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
-  				       !strncasecmp("Date:", buffer, 5) ||
---- 485,495 ----
-  #endif
-  		}
-  
-! 	    } else if (!strncasecmp(buffer, "Content-Length:", 15)) {
-! 		if (CONTENT_LENGTH) {
-! 		    cont_len = atoi(buffer + 15);
-! 		    MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
-! 		}
-  		continue;	/* not part of the message size */
-  	    } else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
-  				       !strncasecmp("Date:", buffer, 5) ||
-***************
-*** 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 */
---- 508,517 ----
-  		    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 */
-***************
-*** 717,724 ****
-  		    *cp++ = '\n';
-  		    *cp   = '\0';
-  
-! 		    mp->length += strlen("X-UIDL: ") + strlen(mp->uidl_str) + 1;
-! 		    p->drop_size += strlen("X-UIDL: ") + strlen(mp->uidl_str)+1;
-  
-  	/* 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
---- 723,732 ----
-  		    *cp++ = '\n';
-  		    *cp   = '\0';
-  
-! 		    i = strlen("X-UIDL: ") + (DIG_SIZE * 2) + 2;
-! 		    mp->length += i;
-! 		    p->drop_size += i;
-! 		    mp->lines++;
-  
-  	/* 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
-***************
-*** 729,739 ****
-  #endif
-  		}
-  
-! 	    } else if (CONTENT_LENGTH && !strncmp(buffer, "Content-Length:", 15)) {
-! 		cont_len = atoi(buffer + 15);
-! 		MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
-  		continue;  /* Not included in message size */
-- 
-  	    } else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
-  				       !strncasecmp("Date:", buffer, 5) ||
-  				       !strncasecmp("Message-Id:",buffer, 11) ||
---- 737,748 ----
-  #endif
-  		}
-  
-! 	    } else if (!strncasecmp(buffer, "Content-Length:", 15)) {
-! 		if (CONTENT_LENGTH) {
-! 		    cont_len = atoi(buffer + 15);
-! 		    MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
-! 		}
-  		continue;  /* Not included in message size */
-  	    } else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
-  				       !strncasecmp("Date:", buffer, 5) ||
-  				       !strncasecmp("Message-Id:",buffer, 11) ||
-***************
-*** 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 */
---- 762,771 ----
-  		    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 */
+--- pop_dropcopy.c.orig	Sun Feb 18 12:27:19 2001
++++ pop_dropcopy.c	Sun Feb 18 12:29:39 2001
+@@ -471,8 +471,10 @@
+ 		    *cp++ = '\n';
+ 		    *cp   = '\0';
+ 
+-		    mp->length += strlen("X-UIDL: ") + strlen(mp->uidl_str) + 1;
+-		    p->drop_size += strlen("X-UIDL: ") + strlen(mp->uidl_str)+1;
++		    i = strlen("X-UIDL: ") + (DIG_SIZE * 2) + 2;
++		    mp->length += i;
++		    p->drop_size += i;
++		    mp->lines++;
+ 
+ 	/* 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
+@@ -483,9 +485,11 @@
+ #endif
+ 		}
+ 
+-	    } else if (CONTENT_LENGTH && !strncmp(buffer, "Content-Length:", 15)) {
+-		cont_len = atoi(buffer + 15);
+-		MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
++	    } else if (!strncasecmp(buffer, "Content-Length:", 15)) {
++		if (CONTENT_LENGTH) {
++		    cont_len = atoi(buffer + 15);
++		    MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
++		}
+ 		continue;	/* not part of the message size */
+ 	    } else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
+ 				       !strncasecmp("Date:", buffer, 5) ||
+@@ -504,8 +508,10 @@
+ 		    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;
++			len += strlen("X-UIDL: ") + 1;
++			mp->length += len;
++			p->drop_size += len;
++			mp->lines++;
+ 		    }
+ 		}
+ 		continue;  /* Do not include this value in the message size */
+@@ -717,8 +723,10 @@
+ 		    *cp++ = '\n';
+ 		    *cp   = '\0';
+ 
+-		    mp->length += strlen("X-UIDL: ") + strlen(mp->uidl_str) + 1;
+-		    p->drop_size += strlen("X-UIDL: ") + strlen(mp->uidl_str)+1;
++		    i = strlen("X-UIDL: ") + (DIG_SIZE * 2) + 2;
++		    mp->length += i;
++		    p->drop_size += i;
++		    mp->lines++;
+ 
+ 	/* 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
+@@ -729,11 +737,12 @@
+ #endif
+ 		}
+ 
+-	    } else if (CONTENT_LENGTH && !strncmp(buffer, "Content-Length:", 15)) {
+-		cont_len = atoi(buffer + 15);
+-		MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
++	    } else if (!strncasecmp(buffer, "Content-Length:", 15)) {
++		if (CONTENT_LENGTH) {
++		    cont_len = atoi(buffer + 15);
++		    MD5Update(&mdContext,(unsigned char *)buffer,strlen(buffer));
++		}
+ 		continue;  /* Not included in message size */
+-
+ 	    } else if (!uidl_found && (!strncasecmp("Received:", buffer, 9) ||
+ 				       !strncasecmp("Date:", buffer, 5) ||
+ 				       !strncasecmp("Message-Id:",buffer, 11) ||
+@@ -745,16 +754,16 @@
+ 		    int len;
+ 		    char *cp;
+ 
+-		    uidl_found++;
+-
+ 		    /* Skip over header */
+ 		    cp = &buffer[7];
+                     while (*cp && (*cp == ' ' || *cp == '\t')) cp++;
+ 		    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;
++			len += strlen("X-UIDL: ") + 1;
++			mp->length += len;
++			p->drop_size += len;
++			mp->lines++;
+ 		    }
+ 		}
+ 		continue;  /* Do not include this value in the message size */