From 81f01715cd10efbddbbb2987ce91f87629cd2b84 Mon Sep 17 00:00:00 2001
From: Masafumi Max NAKANE <max@FreeBSD.org>
Date: Thu, 16 Jan 1997 09:53:28 +0000
Subject: Upgrade, 3.0PL44 -> 3.0PL53+unofficial patch.

---
 mail/mailagent/files/patch-aa | 50 +++++++++++++++++++----------------------
 mail/mailagent/files/patch-ac | 52 +++++++++++++++++--------------------------
 2 files changed, 44 insertions(+), 58 deletions(-)

(limited to 'mail/mailagent/files')

diff --git a/mail/mailagent/files/patch-aa b/mail/mailagent/files/patch-aa
index 8e01bf0196dd..31a640b797f3 100644
--- a/mail/mailagent/files/patch-aa
+++ b/mail/mailagent/files/patch-aa
@@ -1,27 +1,23 @@
-*** agent/filter/logfile.c.orig	Thu Jan 26 17:06:23 1995
---- agent/filter/logfile.c	Sat Mar 23 02:42:02 1996
-***************
-*** 47,52 ****
---- 47,55 ----
-  # undef KERNEL
-  #endif
-  #include "confmagic.h"
-+ #ifdef _HAVE_PARAM_H
-+ #include <sys/param.h>
-+ #endif
-  
-  #define MAX_STRING	1024			/* Maximum length for logging string */
-  
-***************
-*** 176,183 ****
---- 179,188 ----
-  	 */
-  
-  #ifdef HAS_SYS_ERRLIST
-+ #if !(defined(BSD) && (BSD >= 199306))
-  	extern int sys_nerr;					/* Size of sys_errlist[] */
-  	extern char *sys_errlist[];				/* Maps error code to string */
-+ #endif
-  #endif
-  
-  #ifdef HAS_STRERROR
+--- agent/filter/logfile.c.orig	Fri Dec 27 00:53:50 1996
++++ agent/filter/logfile.c	Thu Jan 16 13:57:14 1997
+@@ -49,6 +49,9 @@
+ # include <sys/time.h>
+ # undef KERNEL
+ #endif
++#ifdef I_SYS_PARAM
++# include <sys/param.h>
++#endif
+ #include "confmagic.h"
+ 
+ #define MAX_STRING	1024			/* Maximum length for logging string */
+@@ -180,8 +183,10 @@
+ 	 */
+ 
+ #ifdef HAS_SYS_ERRLIST
++#if !(defined(BSD) && (BSD >= 199306))
+ 	extern int sys_nerr;					/* Size of sys_errlist[] */
+ 	extern char *sys_errlist[];				/* Maps error code to string */
++#endif
+ #endif
+ 
+ #ifdef HAS_STRERROR
diff --git a/mail/mailagent/files/patch-ac b/mail/mailagent/files/patch-ac
index a6e05f1db4b5..494de74149ff 100644
--- a/mail/mailagent/files/patch-ac
+++ b/mail/mailagent/files/patch-ac
@@ -1,31 +1,21 @@
-*** agent/filter/io.c.orig	Fri Sep  1 05:11:42 1995
---- agent/filter/io.c	Fri Mar 29 04:05:28 1996
-***************
-*** 69,74 ****
---- 69,77 ----
-  #include <stdio.h>
-  #include <errno.h>
-  #include <sys/stat.h>
-+ #ifdef _HAVE_PARAM_H
-+ #include <sys/param.h>
-+ #endif
-  
-  #ifdef I_SYS_WAIT
-  #include <sys/wait.h>
-***************
-*** 428,434 ****
-  	 */
-  	
-  	char **envp;			/* Environment pointer */
-! #ifdef UNION_WAIT
-  	union wait status;		/* Waiting status */
-  #else
-  	int status;				/* Status from command */
---- 431,437 ----
-  	 */
-  	
-  	char **envp;			/* Environment pointer */
-! #if defined(UNION_WAIT) && !defined(BSD)
-  	union wait status;		/* Waiting status */
-  #else
-  	int status;				/* Status from command */
+--- agent/filter/io.c.orig	Fri Dec 27 00:55:27 1996
++++ agent/filter/io.c	Thu Jan 16 14:11:00 1997
+@@ -110,6 +110,9 @@
+ #ifdef I_SYS_IOCTL
+ #include <sys/ioctl.h>
+ #endif
++#ifdef I_SYS_PARAM
++#include <sys/param.h>
++#endif
+ 
+ /*
+  * The following should be defined in <sys/stat.h>.
+@@ -635,7 +638,7 @@
+ 	 */
+ 	
+ 	char **envp;			/* Environment pointer */
+-#ifdef UNION_WAIT
++#if defined(UNION_WAIT) && (!defined(BSD) || BSD < 199306)
+ 	union wait status;		/* Waiting status */
+ #else
+ 	int status;				/* Status from command */
-- 
cgit v1.2.3