From cs.athabascau.ca!smail3-wizards-request Wed Nov  9 05:47:08 1994
Return-Path: <smail3-wizards-request@cs.athabascau.ca>
Received: by qiclab.scn.rain.com (/\==/\ Smail3.1.28.1 #28.13)
	id <m0r5DMi-000URla@qiclab.scn.rain.com>; Wed, 9 Nov 94 05:47 PST
Received: by aupair.cs.athabascau.ca (Smail3.1.28.1 #8)
	id m0r5Cdu-0002B2a; Wed, 9 Nov 94 06:00 MST
Message-Id: <m0r5Cdq-000Mv2C@jagubox.gsfc.nasa.gov>
From: jim@jagubox.gsfc.nasa.gov (Jim Jagielski)
Subject: smail 3.1.29 - little patches and an addition
To: smail3-users@cs.athabascau.ca, smail3-wizards@cs.athabascau.ca
Date: Wed, 9 Nov 1994 08:00:46 -0500 (EST)
Reply-To: jim@jagubox.gsfc.nasa.gov (Jim Jagielski)
X-Mailer: ELM [version 2.4 PL24]
Content-Type: text
Content-Length: 5168      
Precedence: bulk
Status: ORS

Included is a short diff file that fixes one minor little bug when POSIX_OS
is used as well as adding A/UX 3.x.x as a support platform:

----------->8  cut here ----------------------------
*** ./Makefile.orig	Tue Nov  8 09:35:44 1994
--- ./Makefile	Tue Nov  8 10:32:01 1994
***************
*** 8,14 ****
  # See the file COPYING, distributed with smail, for restriction
  # and warranty information.
  
! SHELL=/bin/sh
  MAKE=make
  GET=sccs get
  AR=ar
--- 8,14 ----
  # See the file COPYING, distributed with smail, for restriction
  # and warranty information.
  
! SHELL=/bin/ksh
  MAKE=make
  GET=sccs get
  AR=ar
*** ./src/modes.c.orig	Tue Nov  8 10:04:45 1994
--- ./src/modes.c	Tue Nov  8 11:58:53 1994
***************
*** 1347,1353 ****
  #ifdef POSIX_OS
  	(void) setsid();
  #else	/* not POSIX_OS */
! #ifdef UNIX_BSD
  	(void) setpgrp(0, getpid());
  	fd = open("/dev/tty", O_RDWR);
  	if (fd >= 0) {
--- 1347,1353 ----
  #ifdef POSIX_OS
  	(void) setsid();
  #else	/* not POSIX_OS */
! #if defined(UNIX_BSD) || defined(AUX)
  	(void) setpgrp(0, getpid());
  	fd = open("/dev/tty", O_RDWR);
  	if (fd >= 0) {
***************
*** 1356,1362 ****
  	}
  #else
  	(void) setpgrp();
! #endif	/* UNIX_BSD */
  #endif	/* POSIX_OS */
  	if (errfile) {
  	    (void) fclose(errfile);
--- 1356,1362 ----
  	}
  #else
  	(void) setpgrp();
! #endif	/* UNIX_BSD || AUX */
  #endif	/* POSIX_OS */
  	if (errfile) {
  	    (void) fclose(errfile);
*** ./src/retry.c.orig	Tue Nov  8 10:48:33 1994
--- ./src/retry.c	Tue Nov  8 11:52:55 1994
***************
*** 42,47 ****
--- 42,51 ----
  # endif
  #endif
  
+ #if defined(POSIX_OS)
+ #include <unistd.h>
+ #endif 
+ 
  /*
   * the retry mechanism requires three-parameter open() and
   * kernel locking.  if either of these features is missing,
*** ./conf/EDITME-dist.orig	Wed Nov  9 07:43:38 1994
--- ./conf/EDITME-dist	Wed Nov  9 07:45:49 1994
***************
*** 155,160 ****
--- 155,162 ----
  #OS_TYPE=aix3.1                         # IBM AIX 3.1
  #OS_TYPE=aix3.2                         # IBM AIX 3.2
  #OS_TYPE=aux2.0                         # Apple A/UX v2.0/v2.0.1
+ #OS_TYPE=aux3.0                         # Apple A/UX v3.x.x 
+ #                                       #    requires gcc -D_POSIX_SOURCE
  #OS_TYPE=bsd4.2                         # 4.2 BSD systems
  #OS_TYPE=bsd4.3                         # 4.3 BSD systems
  #OS_TYPE=cpc3.0                         # Counterpoint C-XIX Release 3.0
*** ./conf/os/Makefile.orig	Tue Nov  8 09:33:35 1994
--- ./conf/os/Makefile	Mon Nov  7 22:32:35 1994
***************
*** 25,30 ****
--- 25,31 ----
  	aix3.1 \
  	aix3.2 \
  	aux2.0 \
+ 	aux3.0 \
  	bsd4.2 \
  	bsd4.3 \
  	cpc3.0 \
*** /dev/null	Wed Nov  9 07:33:46 1994
--- ./conf/os/aux3.0	Wed Nov  9 07:50:55 1994
***************
*** 0 ****
--- 1,58 ----
+ # @(#)conf/os/aux3.0	1.0 Sat Nov  7 13:58:17 1992
+ #
+ # aux3.0 - define characteristics of Apple A/UX V3.x.x
+ #
+ # From: Jim Jagielski (jim@jagubox.gsfc.nasa.gov)
+ #   (Orig: denny@alisa.com)
+ #
+ # OSNAMES - Names defining this operating system
+ OSNAMES=UNIX_SYS5_3:UNIX_SYS5:UNIX:POSIX_OS
+ # LOCKING_PROTOCOL - macros for efficient file locking
+ LOCKING_PROTOCOL="\
+ #include <sys/file.h>
+ #define lock_fd(fd)	      (flock((fd), LOCK_EX|LOCK_NB) < 0? FAIL: SUCCEED)
+ #define lock_fd_wait(fd)	(flock((fd), LOCK_EX) < 0? FAIL: SUCCEED)
+ #define unlock_fd(fd)		((void) flock((fd), LOCK_UN))
+ #define unlock_fd_wait(fd)	((void) flock((fd), LOCK_UN))
+ #define lock_fd_rd_wait(fd)	(flock((fd), LOCK_SH) < 0? FAIL: SUCCEED)
+ "
+ 
+ # FLOCK_MAILBOX - should mailbox files be locked with lock_fd_wait
+ FLOCK_MAILBOX=TRUE
+ 
+ # MAILBOX_DIR - in which directory are user mailbox files found
+ MAILBOX_DIR=/usr/mail
+ 
+ # CONSOLE - name of the console device file
+ CONSOLE=/dev/console
+ 
+ # DECLARE_STRINGS - declare string routines, using macros as needed
+ DECLARE_STRINGS="\
+ #include <string.h>
+ #define index strchr
+ #define rindex strrchr
+ "
+ 
+ # SECURE_PATH - directories containing system-supplied user programs
+ SECURE_PATH=/usr/ucb:/bin:/usr/bin
+ 
+ # OSLIBS - name any object libraries containing routines we will need
+ #OSLIBS=" -lbsd -ldbm"
+ OSLIBS=" -lposix -lbsd -ldbm"
+ 
+ # RANLIB - how do we organize an existing object archive library
+ RANLIB=:
+ 
+ # DRIVER_CONFIGURATION - configuration file describing smail drivers
+ DRIVER_CONFIGURATION=arpa-network
+ 
+ # CHOWN - command to use for accessing the chown program
+ CHOWN=/bin/chown
+ 
+ # HAVE - what features should be used with this operating system
+ HAVE=RENAME:MKDIR:BSD_NETWORKING:DBM:BSTRING:SYS5STRLIB:FSYNC
+ HAVE=$HAVE:GETOPT:GETHOSTNAME:UNAME:HASH_BANG:DUP2:READDIR
+ HAVE=$HAVE:VFPRINTF:ULIMIT:BIND:FTRUNCATE:SETGROUPS:SETEUID:HDB_UUCP
+ 
+ # MISC_DEFINES - localized smail fixes for A/UX
+ MISC_DEFINES=FORCE_DIRSIZ_VALUE=14:INCLUDE_UTIME_H
----------->8  cut here ----------------------------
-- 
#include <std/disclaimer.h>
  |     Jim Jagielski      |  jim@jagubox.gsfc.nasa.gov  |  V: 301 286-5964  |
  | NASA/GSFC, Code 734.4  |     Greenbelt, MD 20771     |  F: 301 286-1719  |
                   << We do _not_ touch the DON'T button! >>

