Upgrade to 2.52

1 files changed, 31 insertions, 19 deletions

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 {