portability fixes for Amdahl UTS System V 2.1.5

SCCS-vsn: usr.sbin/sendmail/src/makesendmail 8.12
SCCS-vsn: usr.sbin/sendmail/src/clock.c 8.9
SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.124
SCCS-vsn: usr.sbin/sendmail/src/conf.h 8.128

diff --git a/usr/src/usr.sbin/sendmail/src/clock.c b/usr/src/usr.sbin/sendmail/src/clock.c
index 55d06f8..cbf6193 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/clock.c
+++ b/usr/src/usr.sbin/sendmail/src/clock.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)clock.c    8.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)clock.c    8.9 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -190,10 +190,10 @@ tick(arg)
                sigaddset(&ss, SIGALRM);
                sigprocmask(SIG_UNBLOCK, &ss, NULL);
 #else
                sigaddset(&ss, SIGALRM);
                sigprocmask(SIG_UNBLOCK, &ss, NULL);
 #else

-#ifdef SIGVTALRM
+#if HASSIGSETMASK

                /* reset 4.2bsd signal mask to allow future alarms */
                (void) sigsetmask(sigblock(0) & ~sigmask(SIGALRM));
                /* reset 4.2bsd signal mask to allow future alarms */
                (void) sigsetmask(sigblock(0) & ~sigmask(SIGALRM));

-#endif /* SIGVTALRM */
+#endif /* HASSIGSETMASK */

 #endif /* SIG_UNBLOCK */
 
                /* call ev_func */
 #endif /* SIG_UNBLOCK */
 
                /* call ev_func */

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 77b7053..138e995 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)conf.c     8.123 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.124 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -2006,7 +2006,7 @@ freespace(dir, bsize)
 #   else
        struct statfs fs;
 #    define FSBLOCKSIZE        fs.f_bsize
 #   else
        struct statfs fs;
 #    define FSBLOCKSIZE        fs.f_bsize

-#    if defined(_SCO_unix_) || defined(IRIX) || defined(apollo) || defined(ALTOS_SYS_V)
+#    if defined(_SCO_unix_) || defined(IRIX) || defined(apollo) || defined(ALTOS_SYS_V) || defined(_UTS)

 #     define f_bavail f_bfree
 #    endif
 #   endif
 #     define f_bavail f_bfree
 #    endif
 #   endif

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 8d8a1ec..d6091ce 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)conf.h      8.127 (Berkeley) %G%
+ *     @(#)conf.h      8.128 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -994,6 +994,36 @@ extern int syslog(int, char *, ...);
 #endif
 
 
 #endif
 
 

+/*
+**  Amdahl UTS System V 2.1.5 (SVr3-based)
+**
+**    From: Janet Jackson <janet@dialix.oz.au>.
+*/
+
+#ifdef _UTS
+# include <sys/sysmacros.h>
+# undef HASLSTAT       /* has symlinks, but they cause problems */
+# define NEEDFSYNC     1       /* system fsync(2) fails on non-EFS filesys */
+# define SYS5SIGNALS   1       /* System V signal semantics */
+# define SYS5SETPGRP   1       /* use System V setpgrp(2) syscall */
+# define HASUNAME      1       /* use System V uname(2) system call */
+# define HASINITGROUPS 1       /* has initgroups(3) function */
+# define HASSETVBUF    1       /* has setvbuf(3) function */
+# define HASSIGSETMASK 0       /* does not have sigsetmask(2) function */
+# ifndef HASGETUSERSHELL
+#  define HASGETUSERSHELL 0    /* does not have getusershell(3) function */
+# endif
+# define GIDSET_T      gid_t   /* type of 2nd arg to getgroups(2) isn't int */
+# define LA_TYPE       LA_ZERO         /* doesn't have load average */
+# define SFS_TYPE      SFS_4ARGS       /* use 4-arg statfs() */
+# define _PATH_UNIX    "/unix"
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF     "/usr/lib/sendmail.cf"
+# endif
+#endif
+
+
+

 
 /**********************************************************************
 **  End of Per-Operating System defines
 
 /**********************************************************************
 **  End of Per-Operating System defines


@@ -1135,6 +1165,15 @@ extern int       syslog(int, char *, ...);
 # define OLD_NEWDB     0       /* assume newer version of newdb */
 #endif
 
 # define OLD_NEWDB     0       /* assume newer version of newdb */
 #endif
 

+/* heuristic setting of HASSETSIGMASK; can override above */
+#ifndef HASSIGSETMASK
+# ifdef SIGVTALRM
+#  define HASSETSIGMASK        1
+# else
+#  define HASSETSIGMASK        0
+# endif
+#endif
+

 
 /**********************************************************************
 **  Remaining definitions should never have to be changed.  They are
 
 /**********************************************************************
 **  Remaining definitions should never have to be changed.  They are

diff --git a/usr/src/usr.sbin/sendmail/src/makesendmail b/usr/src/usr.sbin/sendmail/src/makesendmail
index 81d6bab..3c98fc2 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/makesendmail
+++ b/usr/src/usr.sbin/sendmail/src/makesendmail
@@ -6,7 +6,7 @@
 #
 # %sccs.include.redist.sh%
 #
 #
 # %sccs.include.redist.sh%
 #

-#       @(#)makesendmail       8.11 (Berkeley) %G%
+#       @(#)makesendmail       8.12 (Berkeley) %G%

 #
 
 #
 #
 
 #


@@ -15,7 +15,7 @@
 #
 
 # determine machine architecture
 #
 
 # determine machine architecture

-arch=`uname -m`
+arch=`uname -m | sed -e 's/ //g'`

 case $arch
 in
   sun4*)       arch=sun4;;
 case $arch
 in
   sun4*)       arch=sun4;;