diff -urP sendmail-8.9.3/BuildTools/Site/site.NEWS-OS.4.x.m4 sendmail-8.9.3-newsos/BuildTools/Site/site.NEWS-OS.4.x.m4 --- sendmail-8.9.3/BuildTools/Site/site.NEWS-OS.4.x.m4 Thu Jan 1 09:00:00 1970 +++ sendmail-8.9.3-newsos/BuildTools/Site/site.NEWS-OS.4.x.m4 Thu Oct 7 17:35:57 1999 @@ -0,0 +1,9 @@ +define(`confOPTIMIZE', `-O -Olimit 1200') +define(`confNROFF', `nroff -h') +define(`confMANDOC', `-man') +define(`confMANOWN', `root') +define(`confMANGRP', `kmem') +define(`confMANROOT', `/usr/local/man/C/cat') +define(`confSTDIR', `/var/adm') +define(`confUBINOWN', `root') +define(`confUBINGRP', `wheel') diff -urP sendmail-8.9.3/BuildTools/Site/site.NEWS-OS.6.x.m4 sendmail-8.9.3-newsos/BuildTools/Site/site.NEWS-OS.6.x.m4 --- sendmail-8.9.3/BuildTools/Site/site.NEWS-OS.6.x.m4 Thu Jan 1 09:00:00 1970 +++ sendmail-8.9.3-newsos/BuildTools/Site/site.NEWS-OS.6.x.m4 Thu Oct 7 16:51:34 1999 @@ -0,0 +1,19 @@ +# @(#)NEWS-OS.6.x 8.8 (Berkeley) 3/12/98 +define(`confCC', `cc') +define(`confOPTIMIZE', `-O2 -Olimit 3000') +define(`confSBINDIR', `/usr/sbin') +define(`confUBINDIR', `/usr/bin') +define(`confENVDEF', `-DUSE_VSYSLOG=0 -D__SVR4 -DSYSLOG_BUFSIZE=256 # -DSPT_TYPE=SPT_NONE ') +define(`confMANROOT', `/usr/local/man/C/man') +define(`confSTDIR', `/var/adm') +define(`confBEFORE', `sysexits.h ndbm.o mkstemp.o') +define(`confLIBS', `ndbm.o mkstemp.o -lelf -lsocket -lnsl # # with NDBM') +# +# must link mkstemp.o in /usr/ucblib/libucb.a for mail.local. +# +PUSHDIVERT(3) +mkstemp.o: + if [ -f /usr/ucblib/libucb.a ]; then \ + ar x /usr/ucblib/libucb.a mkstemp.o; \ + fi; +POPDIVERT diff -urP sendmail-8.9.3/mail.local/mail.local.c sendmail-8.9.3-newsos/mail.local/mail.local.c --- sendmail-8.9.3/mail.local/mail.local.c Wed Dec 30 02:42:38 1998 +++ sendmail-8.9.3-newsos/mail.local/mail.local.c Thu Oct 7 16:33:24 1999 @@ -102,6 +102,10 @@ # define USE_VSYSLOG 0 #endif +#if defined(__sony_news) && !defined(__svr4) +# define USE_VSYSLOG 0 +#endif + #if defined(NeXT) && !defined(__APPLE__) # include # define _PATH_MAILDIR "/usr/spool/mail" diff -urP sendmail-8.9.3/rmail/rmail.c sendmail-8.9.3-newsos/rmail/rmail.c --- sendmail-8.9.3/rmail/rmail.c Wed Dec 30 02:42:50 1998 +++ sendmail-8.9.3-newsos/rmail/rmail.c Sun Oct 10 21:08:06 1999 @@ -99,6 +99,26 @@ # define memmove(d, s, l) (bcopy((s), (d), (l))) #endif +#if defined(__sony_news) && !defined(__svr4) +#define WEXITSTATUS(status) (int)( WIFEXITED(status) ? ( (status).w_retcode) : -1) +#define WTERMSIG(status) (int)( (status).w_termsig ) +int +#if __STDC__ +waitpid(int pid, int *istat, int options) +#else +waitpid(pid, istat, options) + int pid; + int *istat; + int options; +#endif +{ + if (pid == -1) + return wait3((union wait*)istat, options, (struct rusage *)NULL); + else + return wait4(pid, (union wait *)istat, options, (struct rusage *)NULL); +} +#endif + #if !HASSNPRINTF extern int snprintf __P((char *, size_t, const char *, ...)); #endif /* !HASSNPRINTF */ @@ -138,7 +158,12 @@ struct stat sb; size_t fplen = 0, fptlen = 0, len; off_t offset; +#if defined(__sony_news) && !defined(__svr4) + int ch, debug, i, pdes[2], pid; + union wait status; +#else int ch, debug, i, pdes[2], pid, status; +#endif char *addrp = NULL, *domain, *p, *t; char *from_path, *from_sys, *from_user; char *args[100], buf[2048], lbuf[2048];