diff options
Diffstat (limited to 'net/cap/files')
23 files changed, 0 insertions, 1718 deletions
diff --git a/net/cap/files/m4.features b/net/cap/files/m4.features deleted file mode 100644 index 154b64aff6a6..000000000000 --- a/net/cap/files/m4.features +++ /dev/null @@ -1,245 +0,0 @@ -# m4.features -# -# This file is used to determine the default set of additional features -# that will be incorporated into CAP. These features have been contributed -# by many people throughout the network community. -# -# Necessary preamble - please don't alter -define(`concat',$1$2$3$4$5$6$7$8$9) -define(`specialcflags',`') -define(`aufsosflags',`') -define(`simpleflags',`') -define(`lwflags',`') -# -# To change the feature set, simply uncomment the wanted defines(). -# The Configure file will then use the customised version. -# For more details, refer to the file 'CAP60.README' -# -# + SHORT_NAMES adds short name support to AUFS for AppleShare PC. -# define(`specialcflags',concat(specialcflags,` -DSHORT_NAMES')) -# -# + NOCASEMATCH removes UNIX case sensitivity in AUFS (like Macs). -# define(`specialcflags',concat(specialcflags,` -DNOCASEMATCH')) -# -# + SIZESERVER adds a daemon per AUFS server process for volume size info. -# define(`specialcflags',concat(specialcflags,` -DSIZESERVER')) -# -# + LWSRV_AUFS_SECURITY provides printer security based on AUFS connection. -# define(`specialcflags',concat(specialcflags,` -DLWSRV_AUFS_SECURITY')) -# -# + HIDE_LWSEC_FILE increases security of LWSRV_AUFS_SECURITY flag file -# define(`aufsosflags',concat(aufsosflags,` -DHIDE_LWSEC_FILE')) -# define(`lwflags',concat(lwflags,` -DHIDE_LWSEC_FILE')) -# -# + LWSRV_LPR_LOG causes stdout/stderr lpr output to be included in lwsrv log -define(`specialcflags',concat(specialcflags,` -DLWSRV_LPR_LOG')) -# -# + AUTHENTICATE turn on alternate AUFS/LWSRV authentication method -# define(`specialcflags',concat(specialcflags,` -DAUTHENTICATE')) -# -# + STAT_CACHE causes critical AUFS stat() calls to be cached. -define(`specialcflags',concat(specialcflags,` -DSTAT_CACHE')) -# -# + TREL_TIMEOUT causes an extra TREL timeout listener to run to avoid timeouts -# define(`specialcflags',concat(specialcflags,` -DTREL_TIMEOUT')) -# -# + RUTGERS includes local modifications for Rutgers University -# define(`specialcflags',concat(specialcflags,` -DRUTGERS')) -# -# + MELBOURNE includes local modifications for Melbourne University -# define(`specialcflags',concat(specialcflags,` -DMELBOURNE')) -# -# + USE_HOST_ICON provides automatic aufs ICON selection on supported hosts -# define(`specialcflags',concat(specialcflags,` -DUSE_HOST_ICON')) -# -# + PERMISSIVE_USER_NAME allows AUFS users to have their real name in Chooser -# define(`specialcflags',concat(specialcflags,` -DPERMISSIVE_USER_NAME')) -# -# + ULTRIX_SECURITY adds ULTRIX enhanced security to aufs -# define(`specialcflags',concat(specialcflags,` -DULTRIX_SECURITY')) -# -# + DIGITAL_UNIX_SECURITY adds OSF/1 enhanced security to aufs -# define(`specialcflags',concat(specialcflags,` -DDIGITAL_UNIX_SECURITY')) -# -# + USING_FDDI_NET adds support for FDDI networks (Digital UNIX/Ultrix only) -# define(`specialcflags',concat(specialcflags,` -DUSING_FDDI_NET')) -# -# + USE_MAC_DATES maintains Mac Create/Modify dates on file copy -# define(`specialcflags',concat(specialcflags,` -DUSE_MAC_DATES')) -# -# + DEV_NIT specifies alternate NIT device name (default "/dev/nit") -# define(`specialcflags',concat(specialcflags,` -DDEV_NIT=\"/dev/nit\"')) -# -# + APPLICATION_MANAGER control the use of designated applications -# define(`specialcflags',concat(specialcflags,` -DAPPLICATION_MANAGER')) -# -# + AUFS_README links readme file into new user's top level -# define(`specialcflags',concat(specialcflags,` -DAUFS_README')) -# -# + ULT42PFBUG unpatched ULTRIX 4.2 packet filter workaround (also need COPYALL) -# define(`specialcflags',concat(specialcflags,` -DULT42PFBUG')) -# -# + AUFS_IDLE_TIMEOUT will disconnect idle AUFS sessions (-[i|I] period) -# define(`specialcflags',concat(specialcflags,` -DAUFS_IDLE_TIMEOUT')) -# -# + REREAD_AFPVOLS kill -USR1 will make parent aufs re-read system vols file -define(`specialcflags',concat(specialcflags,` -DREREAD_AFPVOLS')) -# -# + PASS_THRU pass through LWSRV jobs with no adobe preprocessing (for PCs) -# define(`specialcflags',concat(specialcflags,` -DPASS_THRU')) -# -# + DONT_PARSE pass through LWSRV jobs with no adobe preprocessing at all -# define(`specialcflags',concat(specialcflags,` -DDONT_PARSE')) -# -# + XDEV_RENAME allow files to be moved over cross device links -# define(`specialcflags',concat(specialcflags,` -DXDEV_RENAME')) -# -# + USR_FILE_TYPES user defined file suffix to creator/type/xlate mapping -define(`specialcflags',concat(specialcflags,` -DUSR_FILE_TYPES')) -# -# + CREATE_AFPVOL create user .afpvols and 'mac' directories if non-existent -define(`specialcflags',concat(specialcflags,` -DCREATE_AFPVOL=\"mac\"')) -# -# + CREAT_AFPVOL_NAM customize name for the volume (modifies CREATE_AFPVOL) -# (CREAT_AFPVOL_NAM fmt string: %U user, %H host, %V vol, %D home eg: "%U@%H") -# define(`specialcflags',concat(specialcflags,` -DCREAT_AFPVOL_NAM="\"%U\""')) -# -# + ISO_TRANSLATE use Macintosh/ISO 8859 character translation on I/O -# define(`specialcflags',concat(specialcflags,` -DISO_TRANSLATE')) -# -# + ISO_FILENAMES extend ISO translation to filenames (assumes ISO_TRANSLATE) -# define(`specialcflags',concat(specialcflags,` -DISO_FILENAMES')) -# -# + ISO_FILE_TRANS use ISO translation on unix/TEXT file contents -# define(`specialcflags',concat(specialcflags,` -DISO_FILE_TRANS')) -# -# + DENYREADWRITE implement AUFS read/write access and deny modes -# define(`specialcflags',concat(specialcflags,` -DDENYREADWRITE')) -# -# + STEAL_PORTS extends DDP dynamic skts down into experimental range 64-128 -# (WARNING!!: Requires uar.1.0.patch11 or uar.1.1.patch09 for use with UAR) -# define(`specialcflags',concat(specialcflags,` -DSTEAL_PORTS')) -# -# + USESYSLOG sends PAPIF Information, Warning & Debug messages to syslog() -# define(`specialcflags',concat(specialcflags,` -DUSESYSLOG')) -# -# + NOCAPDOTPRINTERS uses /etc/lp/printers/<lw>/comment instead of cap.printers -# (Note: intended for use with Solaris 2.N only) -# define(`specialcflags',concat(specialcflags,` -DNOCAPDOTPRINTERS')) -# -# -# AUFS definable options (previously required editing m4.setup) -# -# + FIXED_DIRIDS compile server and AUFS code for fixed directory & file IDs -# define(`specialcflags',concat(specialcflags,` -DFIXED_DIRIDS')) -# -# + DISTRIB_PASSWDS use ~/.afppass for encrypted passwords (see CAP60.README) -# define(`specialcflags',concat(specialcflags,` -DDISTRIB_PASSWDS')) -# -# + AFP_DISTPW_PATH alternate directory for .afppass files (not in ~user) -# define(`specialcflags',concat(specialcflags,` -DAFP_DISTPW_PATH=\"/etc/dp\"')) -# -# + AFP_DISTPW_MODE enforced .afppass mode (must be 0644 for NFS mounted dirs) -# define(`specialcflags',concat(specialcflags,` -DAFP_DISTPW_MODE=0600')) -# -# + DEBUG_AFP_CMD write detailed AUFS AFP debugging info to -Z specified file -# define(`specialcflags',concat(specialcflags,` -DDEBUG_AFP_CMD')) -# -# + PID_FILE write an aufs process-ID file -define(`specialcflags',concat(specialcflags,` -DPID_FILE=\"/var/run/aufs.pid\"')) -# -# + CLOSE_LOG_SIG close and reopen the aufs log on signal -USR2 -# define(`specialcflags',concat(specialcflags,` -DCLOSE_LOG_SIG=SIGUSR2')) -# -# + LOG_WTMP add entry to the 'wtmp' file for each AUFS connection (not IRIX4) -define(`aufsosflags',concat(aufsosflags,` -DLOG_WTMP')) -# -# + LOG_WTMP_FILE specify name of alternate wtmp file for LOG_WTMP feature -define(`aufsosflags',concat(aufsosflags,` -DLOG_WTMP_FILE=\"/var/log/wtmp\"')) -# -# + ADMIN_GRP allows users in specified UNIX group to login as AUFS superuser -# define(`aufsosflags',concat(aufsosflags,` -DADMIN_GRP=\"macadm\"')) -# -# + NONLXLATE for aufs -# define(`aufsosflags',concat(aufsosflags,` -DNONLXLATE')) -# -# + FULL_NCS_SUPPORT (National Character Support) for aufs -# define(`aufsosflags',concat(aufsosflags,` -DFULL_NCS_SUPPORT')) -# -# + NCS_ALL_TEXT perform specified translation on any TEXT file -# define(`aufsosflags',concat(aufsosflags,` -DNCS_ALL_TEXT')) -# -# + GGTYPE="gid_t" (group ID type) for AUFS -# define(`aufsosflags',concat(aufsosflags,` -DGGTYPE="gid_t"')) -# -# + NOCHGRPEXEC don't exec chgrp, just use chown(2) 3rd arg. [Not for Sys V] -# define(`aufsosflags',concat(aufsosflags,` -DNOCHGRPEXEC')) -# -# + USEDIRSETGID set group ID bit on non-primary group dirs [SunOS/Sys V] -# define(`aufsosflags',concat(aufsosflags,` -DUSEDIRSETGID')) -# -# + NETWORKTRASH fix permissions on network trash stuff -define(`aufsosflags',concat(aufsosflags,` -DNETWORKTRASH')) -# -# + SHADOW_PASSWD add support for shadow password files if supported -# define(`aufsosflags',concat(aufsosflags,` -DSHADOW_PASSWD')) -# -# + LOGIN_AUTH_PROG AUFS -L option specifies external authorization program -# define(`aufsosflags',concat(aufsosflags,` -DLOGIN_AUTH_PROG')) -# -# + USEQUOTA forces usage of ufs quotas [Solaris 2.x only] -# note: check if you applied ufs quota patch: -# 100833-xx for Solaris 2.1 -# 101039-xx for Solaris 2.2 -# define(`aufsosflags',concat(aufsosflags,` -DUSEQUOTA')) -# -# -# LWSRV definable options (previously required editing m4.setup) -# -# + LPRARGS passes arguments on lwsrv command line directly to lpr -# define(`lwflags',concat(lwflags,` -DLPRARGS')) -# -# + DOCNAME adds document name as a part of job name to lpr -# define(`lwflags',concat(lwflags,` -DDOCNAME')) -# -# + LPRCMD redefine BSD lpr to use alternate path -# define(`lwflags',concat(lwflags,` -DLPRCMD=\"/usr/local/bin/lpr\"')) -# -# + TEMPFILE set alternative path for lwsrv spool files (default /tmp) -# define(`lwflags',concat(lwflags,` -DTEMPFILE=\"/usr/tmp/lwsrvXXXXXX\"')) -# -# + USELPRSYM add -s (symlink) option to lwsrv lpr call (not for OSF/1) -# define(`lwflags',concat(lwflags,` -DUSELPRSYM')) -# -# + USESYSVLP required for HP-UX (and probably other System V) spooling -# define(`lwflags',concat(lwflags,` -DUSESYSVLP')) -# -# + PAGECOUNT adds page count to job name (value is internal buffer size) -# define(`lwflags',concat(lwflags,` -DPAGECOUNT=512')) -# define(`simpleflags',concat(simpleflags,` -DPAGECOUNT=512')) -# -# + ADOBE_DSC2_CONFORMANT forces Adobe DSC2 conformance -# define(`simpleflags',concat(simpleflags,` -DADOBE_DSC2_CONFORMANT')) -# -# + PROCSET_PATCH delete PatchPrep header for non-Apple LaserWriters -# define(`simpleflags',concat(simpleflags,` -DPROCSET_PATCH')) -# -# + RUN_AS_USER run lpd job as Chooser Name if valid UNIX account (no authent) -define(`lwflags',concat(lwflags,` -DRUN_AS_USER')) -# -# + USER_REQUIRED (requires RUN_AS_USER) refuse printing if Chsr name invalid -define(`lwflags',concat(lwflags,` -DUSER_REQUIRED')) -# -# -# PAPIF options -# -# + DUPLEXMODE tell suitably equipped printer to print on both sides of a page -# define(`specialcflags',concat(specialcflags,` -DDUPLEXMODE')) -# -# + TRANS3 add support for TranScript 3.0 'psdman' (instead of pstext) -# define(`specialcflags',concat(specialcflags,` -DTRANS3')) -# -# + PSJOBHEADER send PS header in file specified in env. variable "PSJOBHEADER" -# define(`specialcflags',concat(specialcflags,` -DPSJOBHEADER')) -# -# diff --git a/net/cap/files/m4.setup.in b/net/cap/files/m4.setup.in deleted file mode 100644 index f25d7cb0b4c7..000000000000 --- a/net/cap/files/m4.setup.in +++ /dev/null @@ -1,543 +0,0 @@ -define(`concat',$1$2$3$4$5$6$7$8$9) -changequote([,]) - -# os - one of: -# "bsd" - bsd 4.2, bsd 4.3, ultrix 1.1, acis 4.2,4.3 other -# "standard" bsd systems without nfs -# "ultrix12" - Ultrix 1.2 -# "ultrix20" - Ultrix 2.0 or greater -# "ultrix40" - Ultrix 4.0 or greater -# "osf1" - OSF/1 1.3 or greater -# "hpux" - HP/UX -# "aux" - A/UX -# "uts" - Amdahl UTS -# "xenix5" - SCO Xenix System V -# "aix" - IBM AIX System V -# "pyr" - pyramid (in BSD universe) -# "sunos" - SunOS 4.N or less -# "solaris" - Solaris 2.N (SunOS 5.0 and greater) -# "encore" - Encore MultiMax -# "next" - NeXT/MACH -# "dynix" - Sequent Balance -# "irix" - Silicon Graphics IRIS-4D/IRIX -# "newsos" - Sony NEWS -# "drsnx" - ICL DRS/NX V4.0 -# "epix" - Control Data EP/IX -# "386bsd" - 386/BSD and derivatives -# "netbsd" - NetBSD 1.0 -# "freebsd" - FreeBSD 2.0 -# "bsdi" - BSDI BSD/386 1.1 -# "domainosbsd" - HP/Apollo Domain BSD 4.3 -# Warning: hpux, pyr are hardcoded in some of the makefiles (sorry) - -# MAJOR CONFIGURATION -# set to one of the above (or configure your own below) -define([os],[[freebsd]]) - -# System call configuration (not for system v compatibilty) -# known: X_GETOPT, X_VPRINTF, X_GETMNT, X_STATFS, X_QUOTA, -# X_SUNQUOTA, X_FLOCK, X_LOCKF, X_FCNTLLOCKF -# getopt - "cap: argument processing" -define([X_GETOPT],1) -# getmnt - "aufs: info on file systems (dec)" -# define([X_GETMNT],1) -# statvfs - "aufs: info on file systems (solaris)" -# define([X_STATFS],1) -# statfs - "aufs: info on file systems (sun nfs)" -# define([X_STATFS],1) -# statfs - "aufs: info on file systems (irix,domainos)" -# define([X_STATFS],1) -# statfs - "aufs: info on file systems (bsd44)" -define([X_STATFS],1) -# quota - "aufs: info on user quota" -# define([X_QUOTA],1) -# ioctl - "aufs: info on user quota (solaris)" -# define([X_QUOTA],1) -# getmntent - "aufs: used by sunquota" -# define([X_SUNQUOTA],1) -# quotactl - "aufs: used by bsdquota" -# define([X_BSDQUOTA],1) -# flock - "afp: file locking" -define([X_FLOCK],1) -# lockf - "afp: byte range locking using unistd.h" -# define([X_LOCKF],1) -# lockf - "afp: byte range locking using fcntl.h" -# define([X_FCNTLLOCKF],1) -# vfprintf - "cap: variable arg fprintf" -define([X_VPRINTF],1) -# recvmsg - "cap: lib: scatter gather recv" -# define([X_NORECVMSG],1) -# sendmsg - "cap: lib: scatter gather send" -# define([X_NOSENDMSG],1) -# ffs - "cap: lib: ffs - find first set bit" -# define([X_NOFFS],1) - -# GETOPT support -ifdef([X_GETOPT],[],[define([needgetopt],[att_getopt.o])]) -# VPRINTF support -ifdef([X_VPRINTF],[define([usevprintf], 1)],[]) - -# Path to cap sources: useful for testing -define([cwd],[@CWD@]) -# turn on if your system sends packets very quickly -# (see applications/aufs/INSTALLATION) -# define([fastether],1) # For papif and samples - -# The following selects the correct lap delivery objects -define([lapobj],[abetalk.o abddp.o abnbp.o atalkdbm.o]) - -# This determines what happens to UAB and UAR -define([uabprogs],[]) -define([uabplibs],[]) -define([uabpobjs],[]) - -# This sets up Native EtherTalk support -define([etherprogs],[aarpd]) -define([etherpobjs],[bpfiltp.o]) - -# This sets up capd -define([capdprogs],[]) -define([capdpobjs],[]) - -# And this determines if Phase 2 packets are used -define([usephase2],1) - -# The following selects byteswapping or otherwise -define([usebyteswap],1) - -# We use build_here to restrict CAP to a single directory tree -# but still using etcdest (see below) for the location of atalk.local -# and other configuration files -# define([build_here],1) - -# We use the debug flag to restrict CAP to a single directory tree -# for testing purposes, e.g. testing new versions -# define([debug],1) - -# The includef flag sets an alternate localtion for include files -define([includef],1) - -# Systems with kernel AppleTalk support do not need atis -define([useatis],1) - -# uncomment if your param.h includes types.h and types.h doesn't -# prevent itself from being included twice -# define _TYPES -# define([selfdefinetypes],1) -# MINOR CONFIGURATION: configure various programs - -#define([columbia],1) # so columbia can do things quickly -#define([rutgersdef],1) # so rutgers can do things quickly - -# Installation prefix -define([prefix],[[@PREFIX@]]) - -# location of include files -define([includedest],concat(prefix,[[[/include]]])) -ifelse(os,[epix],[define([includedir],[[/bsd43/usr/include]])]) -# location of des subroutine source (see lib/afp/README) -define([desloc],[[../../extras]]) -# location of atalk.local, etc. -define([etcdest],concat(prefix,[/etc/cap])) -ifdef([columbia],[define([etcdest],[[/usr/local/lib/cap]])]) -# location of user cap programs -define([capdestdir],concat(prefix,[/bin])) -# location of cap "server" programs (aufs, lwsrv, papif, uab etc.) -define([capsrvrdestdir],concat(prefix,[/sbin])) -# location of some cap data files -define([caplibdestdir],concat(prefix,[/lib/cap])) -ifdef([rutgersdef],[define([caplibdestdir],[[/usr/local/cap/lib]])]) -# location of cap libraries -define([libdestdir],concat(prefix,[/lib])) -# override for aux (doesn't search /usr/local/lib) -ifelse(os,[aux],[define([libdestdir],[[/usr/lib]])]) -# cap library names -define([caplib],[[libcap.a]]) -define([afplib],[[libafp.a]]) -define([afpclib],[[libafpc.a]]) -# names to load cap libraries with -define([libcap],[[-lcap]]) -define([libafp],[[-lafp]]) -define([libafpc],[[-lafpc]]) -ifelse(os,[encore], - [define([libcap],concat([-L],libdestdir,[ ],libcap))]) -ifelse(os,[encore], - [define([libafp],concat([-L],libdestdir,[ ],libafp))]) -ifelse(os,[encore], - [define([libafpc],concat([-L],libdestdir,[ ],libafpc))]) -ifelse(os,[aix], - [define([libcap],concat([-L],libdestdir,[ ],libcap))]) -ifelse(os,[aix], - [define([libafp],concat([-L],libdestdir,[ ],libafp))]) -ifelse(os,[aix], - [define([libafpc],concat([-L],libdestdir,[ ],libafpc))]) -ifelse(os,[hpux], - [define([libcap],concat([-L],libdestdir,[ ],libcap))]) -ifelse(os,[hpux], - [define([libafp],concat([-L],libdestdir,[ ],libafp))]) -ifelse(os,[hpux], - [define([libafpc],concat([-L],libdestdir,[ ],libafpc))]) -ifelse(os,[epix], - [define([libcap],concat([-L],libdestdir,[ ],libcap))]) -ifelse(os,[epix], - [define([libafp],concat([-L],libdestdir,[ ],libafp))]) -ifelse(os,[epix], - [define([libafpc],concat([-L],libdestdir,[ ],libafpc))]) -ifelse(os,[solaris], - [define([libcap],concat([-L],libdestdir,[ ],libcap))]) -ifelse(os,[solaris], - [define([libafp],concat([-L],libdestdir,[ ],libafp))]) -ifelse(os,[solaris], - [define([libafpc],concat([-L],libdestdir,[ ],libafpc))]) -ifelse(os,[netbsd], - [define([libcap],concat([-L],libdestdir,[ ],libcap))]) -ifelse(os,[netbsd], - [define([libafp],concat([-L],libdestdir,[ ],libafp))]) -ifelse(os,[netbsd], - [define([libafpc],concat([-L],libdestdir,[ ],libafpc))]) -ifelse(os,[freebsd], - [define([libcap],concat([-L],cwd,[/lib/cap],[ ],libcap))]) -ifelse(os,[freebsd], - [define([libafp],concat([-L],cwd,[/lib/afp],[ ],libafp))]) -ifelse(os,[freebsd], - [define([libafpc],concat([-L],cwd,[/lib/afpc],[ ],libafpc))]) -# any special libraries -define([libspecial],[]) -ifelse(os,[ultrix40],[ - define([libspecial],concat(libspecial,[ -lauth]))]) -ifelse(os,[osf1],[ - define([libspecial],concat(libspecial,[ -lsecurity]))]) -ifelse(os,[xenix5],[ - define([libspecial],concat(libspecial,[ -lsocket]))]) -ifelse(os,[drsnx],[ - define([libspecial],concat(libspecial,[ -lucb]))]) -ifelse(os,[uts],[ - define([libspecial],concat(libspecial,[ -lsocket -lbsd -la]))]) -ifelse(os,[dynix],[ - define([libspecial],concat(libspecial,[ -lseq]))]) -ifelse(os,[irix],[ - define([libspecial],concat(libspecial,[ -lbsd]))]) -ifelse(os,[aix],[ - define([libspecial],concat(libspecial,[ -lbsd]))]) -ifelse(os,[aux],[ - define([libspecial],concat(libspecial,[ -lat -lbsd]))]) -ifelse(os,[hpux],[ - define([libspecial],concat(libspecial,[ -lBSD -lndbm]))]) -ifelse(os,[epix],[ - define([libspecial],concat(libspecial,[ -lc -lsec]))]) -ifelse(os,[386bsd],[ - define([libspecial],concat(libspecial,[ -lrpc]))]) -ifelse(os,[netbsd],[ - define([libspecial],concat(libspecial,[ -lcrypt]))]) -ifelse(os,[freebsd],[ - define([libspecial],concat(libspecial,[ -lcrypt]))]) -ifelse(os,[bsdi],[ - define([libspecial],concat(libspecial,[ -lrpc -lkvm]))]) -ifelse(os,[linux],[ - define([libspecial],concat(libspecial,[ -lgdbm]))]) -ifelse(os,[solaris],[ - define([libspecial],concat(libspecial,[ -lsocket -lnsl ]))]) -# rutgers specific -define([libru],[]) -ifdef([rutgersdef], [ -ifelse(os,[solaris],[ - define([libru],concat(libru,[ -L/usr/local/lib -R/usr/local/lib -lru ]))],[ - define([libru],concat(libru,[ -lru ]))])]) - -# -# special configurations for individual source files -# - -# -# Aufs: see applications/aufs/INSTALLATION -# -# WARNING: OS DEPENDENT -# define([smartunixfinderinfo],1) -# -# Set -DNONLXLATE, -DFULL_NCS_SUPPORT, -DGGTYPE="gid_t" or -DNOCHGRPEXEC -# in m4.features -# Others: USESTATFS, USEGETMNT, USECHOWN, USEQUOTA, USESUNQUOTA, USEBSDQUOTA -# are autoconfigured -define([aufsosdefs],[aufsosflags()]) - -# -# lib/cap/authenticate.c: configuration file -# -define([authconfig],concat([\"],etcdest,[/],[cap.auth],[\"])) - -# -# lwsrv: see applications/lwsrv/README -# -# lwflags and simpleflags are now defined in m4.features - -# -# lwrename: set name of file containing list of printers to be renamed -# -define([lwrenamefile],concat([\"],caplibdestdir,[/lwrename.list\"])) - -# -# papif: see applications/papif/README -# -# uncomment and set to right location to turn on printing "plain text files" -# define([pstextloc],[[\"/usr/local/lib/ps/pstext\"]]) -# -# uncomment and set to right location to turn on page reversal -# define([psrevloc],[[\"/usr/local/lib/ps/psrev\"]]) -# -# Valid are: -# -DVERBOSELOG - default (set =0 to turn off) -# -DNO_STRUCT - default is on (structured) -# -DNOACCT - default is on (accounting) -# -DIDLESTUFF - default is off -# -DSFLOWQ - default is 8 (min 1, max 8) -# -DRFLOWQ - default is 8 (min 1, max 8) -# -DATPRESPONSETIMEOUT - default is 120 (2 minutes) - in seconds -# -DWATCHTIME - default is 10 seconds (in seconds) -# -DDEBUG - default is off -# -DSTRIPCONTROLD - default is off -# -DMAPCRTOLF - default is off -# -DMACUSER - default is off (need LPD_JOB environment variable in lpd) -# -DPLP - Use with PLP rather than Berkeley lpd -# see papif README file for explanations of the above -# The following defines are recommended for System V lp printers (vs. bsd lpd) -# -DWATCHTIME=0 (no status) -DNOACCT -define([papflags],[-DMACUSER]) -define([papflags],concat(papflags,[ -DIDLESTUFF])) - -# Set -DBANNERFIRST if you want the banner page to come out as the -# first page instead of the last page -# Set -DBANNERLAST if want it last -# Set -DPSBANNER if you want a custom PostScipt Banner (must specify -# short banners in printcap). This still defaults to regular banners -# Add -DCHARGEBANNER if you want to charge the banner page to the user -# on system V - there is no accounting, so leave blank -define([papbanner],[-DCHARGEBANNER]) - -# for cap.printers - uncomment and change the following line to point -# papif, et. al. to a location other than /etc/cap.printers. (Note: -# line below would set it to $etcdest/cap.printers) -define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"])) -ifdef([columbia], - [define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))]) -# for atalkdbm - allows change following line(s) to modify atalk.local -# (probably shouldn't). Remember that atalk.local is expected to -# be in etcdest -define([atalklocal],concat([\"],etcdest,[/],[atalk.local],[\"])) -define([etalklocal],concat([\"],etcdest,[/],[etalk.local],[\"])) -define([configdir],concat([\"],etcdest,[\"])) -define([uabpidfile],concat([\"],caplibdestdir,[/],[uab.pid],[\"])) -define([uabbrdescr],concat([\"],caplibdestdir,[/],[bridge_desc],[\"])) - -# in case you want to globally change the c compiler -define([thecompiler],[cc]) -define([theloader],[ld]) -define([theinstaller],[cp]) - -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -# END OF CONFIGABLE OPTIONS # -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -# You should only edit past here if you are "porting" -# Automatics -define([osname],[Unknown]) -ifelse(os,[ultrix12],[define([osname],[Ultrix 1.2])]) -ifelse(os,[ultrix20],[define([osname],[Ultrix 2.0])]) -ifelse(os,[ultrix40],[define([osname],[Ultrix 4.0])]) -ifelse(os,[osf1],[define([osname],[OSF/1])]) -ifelse(os,[aux],[define([osname],[A/UX])]) -ifelse(os,[sunos],[define([osname],[SunOS])]) -ifelse(os,[solaris],[define([osname],[Solaris 2.x in native SVR4 mode])]) -ifelse(os,[encore],[define([osname],[Encore Umax])]) -ifelse(os,[hpux],[define([osname],[HP-UX (for 9000 series)])]) -ifelse(os,[uts],[define([osname],[Amdahl UTS])]) -ifelse(os,[bsd],[define([osname],[Standard BSD])]) -ifelse(os,[pyr],[define([osname],[Pyramid in BSD universe])]) -ifelse(os,[xenix5],[define([osname],[SCO Xenix System V])]) -ifelse(os,[aix],[define([osname],[IBM AIX System V])]) -ifelse(os,[next],[define([osname],[NeXT/MACH])]) -ifelse(os,[dynix],[define([osname],[Sequent Balance])]) -ifelse(os,[irix],[define([osname],[Silicon Graphics IRIS/IRIX])]) -ifelse(os,[newsos],[define([osname],[Sony NEWS])]) -ifelse(os,[drsnx],[define([osname],[ICL DRS])]) -ifelse(os,[epix],[define([osname],[Control Data EP/IX])]) -ifelse(os,[386bsd],[define([osname],[386/BSD etc])]) -ifelse(os,[netbsd],[define([osname],[NetBSD 1.0])]) -ifelse(os,[freebsd],[define([osname],[FreeBSD])]) -ifelse(os,[bsdi],[define([osname],[BSD/386])]) -ifelse(os,[domainosbsd],[define([osname],[HP/Apollo Domain BSD 4.3])]) -# -define([cflags],ifdef([selfdefinetypes],[-D_TYPES],[])) -define([cflags],concat(cflags,ifdef([usebyteswap],[ -DBYTESWAPPED],[]))) -define([cflags],concat(cflags,ifdef([usephase2],[ -DPHASE2],[]))) -define([bigcflags],ifelse(os,[hpux],[])) -# The encore optimiser is slightly over zealous -ifelse(os,[encore],[define([cflags],concat(cflags,[ -Dencore]))],[ - define([cflags],concat(cflags,[ -O]))]) -ifelse(os,[pyr],[ - define([cflags],concat(cflags,[ -q]))]) -ifelse(os,[next],[ - define([cflags],concat(cflags,[ -DNeXT -DADDRINPACK]))]) -ifelse(os,[xenix5],[ - define([cflags],concat(cflags,[ -Dxenix5 -I$I -DLAI_TCP -Di386]))]) -ifelse(os,[aix],[ - define([cflags],concat(cflags,[ -DAIX -DUSETIMES -DNOWAIT3 -DUSEDIRENT]))]) -ifelse(os,[solaris],[ - define([cflags],concat(cflags,[ -DSOLARIS]))]) -ifelse(os,[uts],[ - define([cflags],concat(cflags,[ -eft ]))]) -ifelse(os,[irix],[ - define([cflags],concat(cflags,[ -cckr -D_BSD_COMPAT]))]) -ifelse(os,[drsnx],[ - define([cflags],concat(cflags,[ -DNOWAIT3]))]) -ifelse(os,[epix],[ - define([cflags],concat(cflags,[ -DEPIX]))]) -ifelse(os,[osf1],[ - define([cflags],concat(cflags,[ -DUSEDIRENT]))]) -ifelse(os,[netbsd],[ - define([cflags],concat(cflags,[ -D__386BSD__]))]) -ifelse(os,[bsdi],[ - define([cflags],concat(cflags,[ -D__386BSD__]))]) -ifelse(os,[linux],[ - define([cflags],concat(cflags,[ -DUSE_GDBM]))]) - -# was used for nbp, but found we needed more... leave in case -define([nbpflags],[]) -define([lflags],[]) -define([mflags],[]) - -# aux's c compiler isn't nice - it doesn't have a preprocessor -# definition for aux. So, let's invent one. Also turn on -n -# for shared code. -ifelse(os,[aux],[ - define([cflags],concat(cflags,[ -n -Daux])) - define([lflags],concat(lflags,[ -n]))]) - -# for NetBSD 1.0 on 68k strip symbols to avoid ld error on some progs -ifelse(os,[netbsd],[define([lflags],concat(lflags,[ -s]))]) - -# use the transitional option of the C compiler - interpret as K&R C, not ANSI -ifelse(os,[drsnx],[ - define([cflags],concat(cflags,[ -Xt -Ddrsnx]))]) - -# check to see if we need sysvinstall usage -ifelse(os,[hpux6],[define([sysvinstall],[yes])], - os,[irix3],[define([sysvinstall],[yes])]) - -# or if we really want to use install -# ifelse(os,[someOS], [define([theinstaller],[install])]) - -# for cap library -# Valid are: -# NOFFS - no ffs function defined, fake it out -# LOCALTIME_GTOD - uses pd localtime, but gettimeofday always reads -# disk based time of day. Always defined for AUX for now. Probably -# needs to be changed for versions of Aux after 1.0 -# NORECVMSG - no recvmsg in system (fake it out) -# NOSENDMSG - no recvmsg in system (fake it out) -define([caposdefs], - concat( ifdef([X_NOFFS],[ -DNOFFS],[]), - ifelse(os,[aux],[ -DLOCALTIME_GTOD],[]), - ifdef([X_NORECVMSG], [ -DNORECVMSG],[]), - ifdef([X_NOSENDMSG], [ -DNOSENDMSG],[]))) -# for afp library -# two cases for X_LOCKF - if lockf isn't defined -# first: X_FCNTLLOCKF is defined, so just note that lockf uses fcntl.h -# second: " " isn't defined so define no lockf -# we "know" that flock() was hiding in libbsd.a under aix -define([afposdefs], - concat( ifdef([X_FLOCK],[], ifelse(os,[aix],[],[ -DNOFLOCK])), - ifdef([X_LOCKF],[], - [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL], - ifelse(os,[freebsd],[ -DUSEFCNTLLOCK],[ -DNOLOCKF]))]))) -# for aufs -define([aufsosdefs], - concat(aufsosdefs, - ifdef([X_STATFS],[ -DUSESTATFS],[]), - ifdef([X_GETMNT],[ -DUSEGETMNT],[]), - ifdef([X_QUOTA],[ -DUSEQUOTA],[]), - ifdef([X_SUNQUOTA],[ -DUSESUNQUOTA],[]), - ifdef([X_BSDQUOTA],[ -DUSEBSDQUOTA],[]), - ifelse(os,[irix],[ -DNOVFORK]), - ifelse(os,[aix],[ -DNOVFORK -DUSECHOWN],[]))) - -# if no ranlib (or fakeout like hpux) and need to order libaries -ifelse(os,[dummy], [define(uselordertsort,[1])], - os,[aux], [define(uselordertsort,[1])], - os,[solaris], [define(uselordertsort,[1])], - os,[uts], [define(uselordertsort,[1])], - os,[drsnx], [define(uselordertsort,[1])], - os,[irix], [define(uselordertsort,[1])]) - -# lw config -define([lwflags], - concat(lwflags, - ifdef([fastether],[ -DSFLOWQ=1],[]), - ifelse(os,[aix],[],[]))) - -# more papif config -define([papflags], - concat(papflags, - ifelse(os,[irix],[ -DNOVFORK]), - ifelse(os,[aix],[ -DNOVFORK],[]))) - -#NBPFLAGS = nbpflags() -#SPECCFLAGS = specialcflags() -#BIGCFLAGS = bigcflags() -#CFLAGS = cflags() -#LFLAGS = lflags() -#AFPOSDEFS = afposdefs() -#AUFSOSDEFS = aufsosdefs() - -ifdef([debug],[ - define([build_here],1) -# location of atalk.local, etc. - define([etcdest],concat(cwd,[[[/etc]]])) -]) - -ifdef([includef],[ -# location of include files - define([includedir],[cwd]) - define([cflags],concat(cflags,[ -I],includedir)) -]) - -ifdef([build_here],[ -# location of include files - define([includedir],[cwd]) -# location of des subroutine source (see lib/afp/README) - define([desloc],[[../../extras]]) -# location of user cap programs - define([capdestdir],concat(cwd,[[[/bin]]])) -# location of cap "server" programs (aufs, lwsrv, papif, uab etc.) - define([capsrvrdestdir],concat(cwd,[[[/bin]]])) -# location of some cap data files - define([caplibdestdir],concat(cwd,[[[/bin]]])) -# location of cap libraries - define([libdestdir],concat(cwd,[[[/lib]]])) -# cap library names - define([caplib],[[libcap.a]]) - define([afplib],[[libafp.a]]) - define([afpclib],[[libafpc.a]]) -# names to load cap libraries with - define([libcap],concat(cwd,[[[/lib/libcap.a]]])) - define([libafp],concat(cwd,[[[/lib/libafp.a]]])) - define([libafpc],concat(cwd,[[[/lib/libafpc.a]]])) - define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"])) - define([cflags],concat(cflags,[ -I],includedir)) - define([atalklocal],concat([\"],etcdest,[/],[atalk.local],[\"])) - define([etalklocal],concat([\"],etcdest,[/],[etalk.local],[\"])) - define([configdir],concat([\"],etcdest,[\"])) -]) - -define([datestring],maketemp(/tmp/capcXXXXXX)) -syscmd(date > datestring()) -##########MARKER########## -# Makefile autoconfigured for ... -[#] osname() system on include(datestring()) -syscmd(rm -f datestring()) - -MFLAGS=mflags() -LFLAGS=lflags() -CC?=thecompiler() -LD=theloader() -SHELL=/bin/sh -INSTALLER=theinstaller() diff --git a/net/cap/files/patch-aa b/net/cap/files/patch-aa deleted file mode 100644 index 99a13e3b9307..000000000000 --- a/net/cap/files/patch-aa +++ /dev/null @@ -1,92 +0,0 @@ ---- Configure.orig Tue Jan 14 15:11:45 1997 -+++ Configure Tue Jan 14 15:52:29 1997 -@@ -433,7 +433,7 @@ - usingphase2="# define([usephase2],1)" - usingatis="# define([useatis],1)" - singletree="# define([debug],1)" --includefile="# define([includef],1)" -+includefile="define([includef],1)" - result=0 - usephase2=0 - uabsupport=0 -@@ -1517,29 +1517,39 @@ - echo "# prevent itself from being included twice" - echo "# define _TYPES" - echo "${needselfdef}" --${PCAT} <<\EOT1 -+${PCAT} <<\EOTL - # MINOR CONFIGURATION: configure various programs - - #define([columbia],1) # so columbia can do things quickly - #define([rutgersdef],1) # so rutgers can do things quickly - -+EOTL -+echo "# Installation prefix" -+if [ ! -z ${PREFIX} ]; then -+ echo "define([prefix],[[${PREFIX}]])" -+ else -+ echo "define([prefix],[[/usr/local]])" -+fi -+echo -+ -+${PCAT} <<\EOT1 - # location of include files --define([includedir],[[/usr/include]]) -+define([includedest],concat(prefix,[[[/include]]])) - ifelse(os,[epix],[define([includedir],[[/bsd43/usr/include]])]) - # location of des subroutine source (see lib/afp/README) - define([desloc],[[../../extras]]) - # location of atalk.local, etc. --define([etcdest],[[/etc]]) -+define([etcdest],concat(prefix,[/etc/cap])) - ifdef([columbia],[define([etcdest],[[/usr/local/lib/cap]])]) - # location of user cap programs --define([capdestdir],[[/usr/local/cap]]) -+define([capdestdir],concat(prefix,[/bin])) - # location of cap "server" programs (aufs, lwsrv, papif, uab etc.) --define([capsrvrdestdir],[[/usr/local/cap]]) -+define([capsrvrdestdir],concat(prefix,[/sbin])) - # location of some cap data files --define([caplibdestdir],[[/usr/local/lib/cap]]) -+define([caplibdestdir],concat(prefix,[/lib/cap])) - ifdef([rutgersdef],[define([caplibdestdir],[[/usr/local/cap/lib]])]) - # location of cap libraries --define([libdestdir],[[/usr/local/lib]]) -+define([libdestdir],concat(prefix,[/lib])) - # override for aux (doesn't search /usr/local/lib) - ifelse(os,[aux],[define([libdestdir],[[/usr/lib]])]) - # cap library names -@@ -1587,11 +1597,11 @@ - ifelse(os,[netbsd], - [define([libafpc],concat([-L],libdestdir,[ ],libafpc))]) - ifelse(os,[freebsd], -- [define([libcap],concat([-L],libdestdir,[ ],libcap))]) -+ [define([libcap],concat([-L],cwd,[/lib/cap],[ ],libcap))]) - ifelse(os,[freebsd], -- [define([libafp],concat([-L],libdestdir,[ ],libafp))]) -+ [define([libafp],concat([-L],cwd,[/lib/afp],[ ],libafp))]) - ifelse(os,[freebsd], -- [define([libafpc],concat([-L],libdestdir,[ ],libafpc))]) -+ [define([libafpc],concat([-L],cwd,[/lib/afpc],[ ],libafpc))]) - # any special libraries - define([libspecial],[]) - ifelse(os,[ultrix40],[ -@@ -1717,7 +1727,7 @@ - # for cap.printers - uncomment and change the following line to point - # papif, et. al. to a location other than /etc/cap.printers. (Note: - # line below would set it to $etcdest/cap.printers) --# define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"])) -+define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"])) - ifdef([columbia], - [define([capprinters],concat([\"],etcdest,[/],[cap.printers],[\"]))]) - # for atalkdbm - allows change following line(s) to modify atalk.local -@@ -1850,7 +1860,8 @@ - define([afposdefs], - concat( ifdef([X_FLOCK],[], ifelse(os,[aix],[],[ -DNOFLOCK])), - ifdef([X_LOCKF],[], -- [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL],[ -DNOLOCKF])]))) -+ [ifdef([X_FCNTLLOCKF],[ -DLOCKFUSESFCNTL],[ -DNOLOCKF]), -+ ifelse(os,[freebsd],[ -DUSEFCNTLLOCK],[ -DNOLOCKF]))]))) - # for aufs - define([aufsosdefs], - concat(aufsosdefs, diff --git a/net/cap/files/patch-ab b/net/cap/files/patch-ab deleted file mode 100644 index 24b0abaded73..000000000000 --- a/net/cap/files/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.orig Wed Nov 13 21:19:14 1996 -+++ Makefile Thu Nov 14 14:19:16 1996 -@@ -19,6 +19,12 @@ - (cd lib/afpc; make install) - touch libinstall - -+dummy-libinstall: libsmade -+ ranlib lib/cap/libcap.a -+ ranlib lib/afp/libafp.a -+ ranlib lib/afpc/libafpc.a -+ touch libinstall -+ - programs: libinstall - -(cd etc; make) - -(cd samples; make) diff --git a/net/cap/files/patch-ac b/net/cap/files/patch-ac deleted file mode 100644 index 299819508c3c..000000000000 --- a/net/cap/files/patch-ac +++ /dev/null @@ -1,52 +0,0 @@ ---- netat/Makefile.m4.orig Thu Nov 14 14:23:47 1996 -+++ netat/Makefile.m4 Thu Nov 14 14:24:05 1996 -@@ -1,4 +1,4 @@ --I=includedir() -+I=includedest() - HFILES = aberrors.h abqueue.h appletalk.h afp.h afpcmd.h afpc.h \ - compat.h sysvcompat.h macfile.h abnbp.h fcntldomv.h afppass.h - ---- etc/Makefile.m4.orig Sun Mar 8 22:46:19 1992 -+++ etc/Makefile.m4 Sun Jan 26 00:19:02 1997 -@@ -1,17 +1,20 @@ - CFLAGS=cflags() nbpflags() specialcflags() - SDESTDIR=capsrvrdestdir() - UDESTDIR=capdestdir() --ETCDIR=etcdest() - CAPLIB=libcap() - I=includedir() - # for other libraries (like BSD on hpux) - SLIB=libspecial() - -+ETCDIR=/var/run -+ - ifdef([useatis],[],[# ])ATISPROGS=atis - PROGS=${ATISPROGS} - - # aufs.c definitions: USEVPRINTF - use vprintf in logging - ifdef([usevprintf],[],[#])ATISDEFS=-DUSEVPRINTF -+ -+ATISDEFS+=-DNISDUMPFILE=\"/var/tmp/nis.db\" -DATISRUNFILE=\"/var/tmp/atis.run\" - - # Make sure to define needgetopt if your system doesnt have it or - # just set GETOPT=att_getopt.o (or to a getopt of your own liking) ---- support/uab/Makefile.m4.orig Sun Mar 8 22:46:21 1992 -+++ support/uab/Makefile.m4 Sun Jan 26 00:46:55 1997 -@@ -5,6 +5,8 @@ - CAPLIB=libcap() - LFLAGS= - -+UABDEFS=-DUAB_RUNFILE=\"/var/tmp/uab.run\" -DUAB_STATSFILE=\"/var/tmp/uab.stats\" -DUAB_DUMPFILE=\"/var/tmp/uab.dump\" -+ - SRCS=aarp.c kip_mpx.c rtmp.c ethertalk.c ddprouter.c ddpsvcs.c ddpport.c \ - hash.c asyncatalk.c - OBJS=aarp.o kip_mpx.o rtmp.o ethertalk.o ddprouter.o ddpsvcs.o ddpport.o \ -@@ -28,7 +30,7 @@ - ${CC} -c ${CFLAGS} -DTAB=etalklocal() -DMTAB=etalklocal() kip_mpx.c - - uab.o: uab.c mpxddp.h gw.h node.h ddpport.h if_desc.h -- ${CC} -c ${CFLAGS} -DUAB_PIDFILE=uabpidfile() \ -+ ${CC} -c ${CFLAGS} ${UABDEFS} -DUAB_PIDFILE=uabpidfile() \ - -DBRIDGE_DESC=uabbrdescr() uab.c - - lint: diff --git a/net/cap/files/patch-ad b/net/cap/files/patch-ad deleted file mode 100644 index 0073ed2a4f4e..000000000000 --- a/net/cap/files/patch-ad +++ /dev/null @@ -1,35 +0,0 @@ ---- support/ethertalk/bpfiltp.c.orig Tue Jan 14 11:15:34 1997 -+++ support/ethertalk/bpfiltp.c Tue Jan 14 13:18:36 1997 -@@ -41,6 +41,14 @@ - #include <net/if.h> - #include <net/bpf.h> - #include <netinet/in.h> -+#ifdef __FreeBSD__ -+#if __FreeBSD__ >= 2 -+#include <osreldate.h> -+#endif -+#if __FreeBSD_version >= 300000 -+#include <net/if_var.h> -+#endif -+#endif /*__FreeBSD__*/ - #include <netinet/if_ether.h> - #include <netdb.h> - #include <ctype.h> -@@ -785,7 +793,7 @@ - - bcopy(eaddr, &eh.ether_dhost, 6); - #ifdef PHASE2 --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) && __FreeBSD_version <= 199607 - /* This should really be fixed in the kernel. */ - eh.ether_type = buflen; - #else -@@ -806,7 +814,7 @@ - *q++ = (eph->protocol >> 8) & 0xff; - *q++ = (eph->protocol & 0xff); - #else PHASE2 --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) && __FreeBSD_version <= 199607 - /* This should really be fixed in the kernel. */ - eh.ether_type = eph->protocol; - #else diff --git a/net/cap/files/patch-ae b/net/cap/files/patch-ae deleted file mode 100644 index e5a3215e132f..000000000000 --- a/net/cap/files/patch-ae +++ /dev/null @@ -1,189 +0,0 @@ -Patches to reflect file locations in man pages. ---- man/aarpd.8.orig Sun Mar 8 22:46:26 1992 -+++ man/aarpd.8 Sun Nov 10 08:01:47 1996 -@@ -32,7 +32,7 @@ - At startup, - .I aarpd - probes for a node number, determines the network number and --maintains a copy of the network information in /etc/etalk.local which it -+maintains a copy of the network information in /usr/local/etc/cap/etalk.local which it - updates as necessary. - .PP - The options -@@ -57,10 +57,10 @@ - .BI <interface> " <zoneName>" - defines the network interface (as listed by netstat(8)) such as ie0, le0, - ln0 or pf0. The zoneName argument is a valid zonename for the EtherTalk --connected to the interface. These values may be seeded in /etc/etalk.local -+connected to the interface. These values may be seeded in /usr/local/etc/cap/etalk.local - but it is recommended that both arguments be supplied. - .SH FILES --/etc/etalk.local - refer man/etalk.local.5 -+/usr/local/etc/cap/etalk.local - refer man/etalk.local.5 - .SH NOTES - .I aarpd - be run as "root" (uid 0) and should be started before any other CAP ---- man/atalk.local.5.orig Wed Mar 13 19:47:13 1991 -+++ man/atalk.local.5 Sun Nov 10 08:05:49 1996 -@@ -129,7 +129,7 @@ - underlying IP network structure is of importance here. Unfortunately, - the details of this issue are beyond the scope of this document. - .SH FILES --atalk.local usually resides in /etc -+atalk.local resides in /usr/local/etc/cap - .SH BUGS - The node numbers should be automatically determined since they are - fixed. In addition, it would be nice if the zone name were picked up ---- man/atis.8.orig Sun Jan 26 00:25:04 1997 -+++ man/atis.8 Sun Jan 26 00:32:44 1997 -@@ -91,19 +91,19 @@ - .I atis - automatically disassociates itself from the controlling terminal - unless debug options are set. To allow some control over the --disassocated process, the pid is recorded in /etc/atis.pid and the -+disassocated process, the pid is recorded in /usr/local/etc/cap/atis.pid and the - following commands options have been added. - .TP - .B dump - sends a SIGQUIT signal to the running atis. This causes the running - atis to dump --its name table into /usr/tmp/nis.db. -+its name table into /var/tmp/nis.db. - .TP - .B reload - sends a SIGHUP signal to the running atis. This - causes the running - .I atis --to reload its name tables from /usr/tmp/nis.db. -+to reload its name tables from /var/tmp/nis.db. - .TP - .B exit - will stop the currently running copy of -@@ -112,11 +112,11 @@ - .TP - .B debug - increments the debug level of the running server by sending it a --SIGIOT. If no log file was defined, /usr/tmp/atis.run is created and used. -+SIGIOT. If no log file was defined, /var/tmp/atis.run is created and used. - .TP - .B nodebug - turns off debugging in the running server by sending it a SIGEMT. If --/usr/tmp/atis.run was created by -+/var/tmp/atis.run was created by - .I debug - then the file is closed. - .PP -@@ -131,14 +131,14 @@ - to dump the database and exit. - .PP - .SH FILES --/etc/atis.pid records the pid of the currently running server. -+/usr/local/etc/cap/atis.pid records the pid of the currently running server. - .br --/etc/atalk.local is used to find the closest Ethernet/Appletalk bridge -+/usr/local/etc/cap/atalk.local is used to find the closest Ethernet/Appletalk bridge - (directory location alterable at compile time). - .br --/usr/tmp/nis.db is used to hold the name data base when dumped -+/var/tmp/nis.db is used to hold the name data base when dumped - .br --/usr/tmp/atis.run is used for logging if debug is turned on without a -+/var/tmp/atis.run is used for logging if debug is turned on without a - log file via "atis debug". - .SH NOTES - The current copy of atis runs with Revisions 10/86, 9/87, 1/88 or 6/88 of the ---- man/atprint.1.orig Sun Mar 8 22:44:36 1992 -+++ man/atprint.1 Sun Nov 10 08:23:43 1996 -@@ -49,7 +49,7 @@ - PostScript device. - You can specify the device in one of three ways (-a is the default). - "tlw -u <short-printer-name>" maps a Unix short printer name to an Appletalk --entity name via the cap.printers file (often found in /etc). -+entity name via the cap.printers file (found in /usr/local/etc/cap). - "tlw -a <object-name>" specifies a device of type "LaserWriter" in the current - zone "*". - "tlw -a <appletalk-entity>" lets you choose an arbitrary object, type and zone, -@@ -96,7 +96,7 @@ - .SH BUGS - There are bound to be several. - .SH FILES --/etc/cap.printers \- papif configuation file to associate UNIX printer -+/usr/local/etc/cap/cap.printers \- papif configuration file to associate UNIX printer - queues with LaserWriter names. Location may vary according to local option. - .SH AUTHOR - lwpr, iwpr, tlw and isrv were written by Charlie C. Kim of ---- man/etalk.local.5.orig Thu Mar 14 23:50:17 1991 -+++ man/etalk.local.5 Sun Nov 10 08:04:48 1996 -@@ -42,6 +42,6 @@ - An underscore in the zone name is - no longer treated as a space as in previous versions of atalk.local. - .SH FILES --etalk.local usually resides in /etc -+etalk.local resides in /usr/local/etc/cap - .SH SEE ALSO - CAP(3), CAP(8), atalkatab(5), atalkad(8), atis(8) ---- man/lwrename.8.orig Sun Nov 10 08:37:05 1996 -+++ man/lwrename.8 Sun Nov 10 08:40:05 1996 -@@ -141,7 +141,7 @@ - .I start\-cap\-servers - file. - .SH FILES --/etc/lwrename.list default location for list of monitored printers -+/usr/local/lib/cap/lwrename.list location for list of monitored printers - .SH SEE ALSO - CAP(8), atlook(1), lwsrv(8) - .SH AUTHOR ---- man/papif.8.orig Sun Nov 10 08:16:47 1996 -+++ man/papif.8 Sun Nov 10 08:26:38 1996 -@@ -414,9 +414,9 @@ - may no longer work properly. - .SH FILES - .nf --.ta \w'/etc/cap.printers 'u -+.ta \w'/usr/local/etc/cap/cap.printers 'u - /etc/printcap --/etc/cap.printers (location is settable) -+/usr/local/etc/cap/cap.printers (location is settable) - \&.status lpd status file - newstatus papif status temporary file - \&.banner lpd banner file ---- man/snitch.1.orig Thu Feb 28 21:42:51 1991 -+++ man/snitch.1 Sun Nov 10 08:41:46 1996 -@@ -103,7 +103,7 @@ - .I snitch - in the background). - .SH FILES --Uses the cap file "atalk.local", usually in /etc. -+Uses the cap file "atalk.local", in //usr/local/etc/cap. - .SH "SEE ALSO" - CAP(8), atis(8), cap(3) - .SH EXAMPLE ---- man/UAB.8.orig Sun Mar 8 22:43:56 1992 -+++ man/UAB.8 Sun Jan 26 00:53:02 1997 -@@ -73,12 +73,12 @@ - (SIGEMT), statistics (SIGUSR2), or exit (SIGTERM) will - send these signals. - tdump causes the running uab to dump its internal tables (rtmp, etc.) to --/usr/tmp/uab.dump. (dump is -+/var/tmp/uab.dump. (dump is - reserved for nbp if uab ever support nbp). debug tells the running - uab to increment the debug level: if not log file was currently --active, the log will go to /usr/tmp/uab.run. -+active, the log will go to /var/tmp/uab.run. - nodebug turns off all debugging. --stat or statisitics dumps statistics to /usr/tmp/uab.stats. exit -+stat or statisitics dumps statistics to /var/tmp/uab.stats. exit - causes the running uab to stop. - .PP - The bridge description file is a list of the valid ports for a -@@ -155,7 +155,7 @@ - for Computing Activities, Columbia University - .SH FILES - .nf --/usr/tmp/uab.stats --/usr/tmp/uab.run --/usr/tmp/uab.dump -+/var/tmp/uab.stats -+/var/tmp/uab.run -+/var/tmp/uab.dump - .fi diff --git a/net/cap/files/patch-af b/net/cap/files/patch-af deleted file mode 100644 index 3b7d69762816..000000000000 --- a/net/cap/files/patch-af +++ /dev/null @@ -1,73 +0,0 @@ ---- etc/list-cap-servers.orig Mon Nov 25 13:11:46 1996 -+++ etc/list-cap-servers Mon Nov 25 13:22:07 1996 -@@ -1,2 +1,2 @@ - #! /bin/sh --ps agx | egrep ':[0-9][0-9]( | [^ ]*/)(atalkrd|atis|aufs|lwsrv|lwrename|printqueue)( |$)' -+ps ax | egrep '[0-9][0-9]( | [^ ]*/)(atalkrd|atis|aufs|lwsrv|lwrename|printqueue|snitch|aarpd)( |$)' ---- etc/start-cap-servers.orig Tue Nov 26 02:38:32 1996 -+++ etc/start-cap-servers Tue Nov 26 02:49:03 1996 -@@ -1,11 +1,12 @@ - #!/bin/sh - --### sample start servers file (copy to /usr/local/lib) --### start from '/etc/rc.local' -+### sample start servers file (copy to /usr/local/etc/rc.d -+### as start-cap-servers.sh or something. And /etc/rc will automatically -+### execute this script.) - --LOGd=/usr/tmp -+LOGd=/var/log - LOGf=/dev/null --CAP=/usr/local/cap -+CAP=/usr/local/sbin - LIB=/usr/local/lib/cap - - LWARGS="-a ${LIB}/procsets -f ${LIB}/LW+Fonts" -@@ -19,7 +20,7 @@ - # - # Otherwise start aarpd first for Native EtherTalk - # --# ${CAP}/aarpd "interface" "zone" -+${CAP}/aarpd "interface" "zone" - - # - # Or capd for Kernel AppleTalk under Linux -@@ -34,12 +35,12 @@ - # - # Make this 15 seconds if using aarpd - # --sleep 5 -+sleep 15 - --${CAP}/snitch -S -f "SUN 4 SunOS 4.0 UNIX" -l lwsrv -+${CAP}/snitch -S -f "`uname -s -r` UNIX" -l lwsrv - ${CAP}/lwsrv -n "Technical Services Spool" -p lw.tsa ${LWARGS} - - # if CAP compiled with FIXED_DIRIDS then start AFP ID server first - # ${CAP}/afpidsrvr -l ${LOGd}/afpidsrvr.log - --${CAP}/aufs -U 20 -V ${LIB}/afpvols -l ${LOGf} -n `hostname` -+${CAP}/aufs -U 20 -V ${LIB}/afpvols -F ${LIB}/afpfile -l ${LOGf} -n `hostname` ---- etc/kill-cap-servers.orig Mon Nov 25 16:16:13 1996 -+++ etc/kill-cap-servers Mon Nov 25 16:21:11 1996 -@@ -1,17 +1,17 @@ - #! /bin/sh - TEMP=/tmp/kcs$$ - trap "rm -f $TEMP" 1 2 3 15 --ps agx | egrep ':[0-9][0-9]( | [^ ]*/)(atalkrd|atis|aufs|lwsrv|lwrename|printqueue)( |$)' > $TEMP -+ps ax | egrep '[0-9][0-9]( | [^ ]*/)(atalkrd|atis|aufs|lwsrv|lwrename|printqueue|snitch|aarpd)( |$)' > $TEMP - cat $TEMP - echo -n 'Kill [ny]? ' - read reply junk - if [ X${reply-n} = Xy ] ; then - echo Killing... -- AUFS=`egrep ':[0-9][0-9]( | [^ ]*/)aufs( |$)' $TEMP | awk '{print $1}'` -+ AUFS=`egrep '[0-9][0-9]( | [^ ]*/)aufs( |$)' $TEMP | awk '{print $1}'` - if [ x"$AUFS" != x ]; then - kill -HUP $AUFS - fi -- kill `egrep -v ':[0-9][0-9]( | [^ ]*/)aufs( |$)' $TEMP | awk '{print $1}'` -+ kill `egrep -v '[0-9][0-9]( | [^ ]*/)aufs( |$)' $TEMP | awk '{print $1}'` - else - echo Cancelled... - fi diff --git a/net/cap/files/patch-ag b/net/cap/files/patch-ag deleted file mode 100644 index 6ec14d00410a..000000000000 --- a/net/cap/files/patch-ag +++ /dev/null @@ -1,10 +0,0 @@ ---- support/ethertalk/aarpd.c.orig Mon Dec 30 01:29:16 1996 -+++ support/ethertalk/aarpd.c Mon Dec 30 01:29:59 1996 -@@ -19,6 +19,7 @@ - #if !defined(ultrix) && !defined(__osf__) && !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__bsdi__) && !defined(NeXT) - #include <sys/sockio.h> - #endif /* ultrix && __osf__ && __386BSD__ && __FreeBSD__ */ -+#include <sys/time.h> - #include <net/if.h> - #endif PHASE2 - #include <netinet/in.h> diff --git a/net/cap/files/patch-ah b/net/cap/files/patch-ah deleted file mode 100644 index af5ed3fc243d..000000000000 --- a/net/cap/files/patch-ah +++ /dev/null @@ -1,17 +0,0 @@ ---- support/uab/aarp.c.orig Tue Jan 14 11:11:30 1997 -+++ support/uab/aarp.c Tue Jan 14 13:31:06 1997 -@@ -40,6 +40,14 @@ - #ifdef pyr - #include <netinet/in_ether.h> - #else pyr -+#ifdef __FreeBSD__ -+#if __FreeBSD__ >= 2 -+#include <osreldate.h> -+#endif -+#if __FreeBSD_version >= 300000 -+#include <net/if_var.h> -+#endif -+#endif /*__FreeBSD__*/ - #include <netinet/if_ether.h> - #endif pyr - diff --git a/net/cap/files/patch-ai b/net/cap/files/patch-ai deleted file mode 100644 index 3cf7b2216e51..000000000000 --- a/net/cap/files/patch-ai +++ /dev/null @@ -1,29 +0,0 @@ ---- support/ethertalk/bpfiltp.c.orig Mon Feb 1 10:09:12 1999 -+++ support/ethertalk/bpfiltp.c Mon Feb 1 10:07:12 1999 -@@ -47,6 +47,8 @@ - #endif - #if __FreeBSD_version >= 300000 - #include <net/if_var.h> -+#include <net/if_dl.h> -+#include <net/ethernet.h> - #endif - #endif /*__FreeBSD__*/ - #include <netinet/if_ether.h> -@@ -347,9 +349,17 @@ - struct ifreq *ifr; - { - int sock; -+#if defined(__FreeBSD__) && __FreeBSD_version >= 300000 -+ struct sockaddr_dl *sdl; - -+ sdl = (struct sockaddr_dl *)&ifr->ifr_addr; -+ sdl->sdl_len = sizeof(struct sockaddr_dl); -+ sdl->sdl_family = AF_LINK; -+ bcopy(multi, LLADDR(sdl), ETHER_ADDR_LEN); -+#else - ifr->ifr_addr.sa_family = AF_UNSPEC; - bcopy(multi, ifr->ifr_addr.sa_data, EHRD); -+#endif - /* - * open a socket, temporarily, to use for SIOC* ioctls - * diff --git a/net/cap/files/patch-applications-aufs-afpos.c b/net/cap/files/patch-applications-aufs-afpos.c deleted file mode 100644 index 7d5e440dd368..000000000000 --- a/net/cap/files/patch-applications-aufs-afpos.c +++ /dev/null @@ -1,11 +0,0 @@ ---- applications/aufs/afpos.c.orig Wed Feb 5 17:48:07 2003 -+++ applications/aufs/afpos.c Wed Feb 5 17:48:45 2003 -@@ -4776,7 +4776,7 @@ - #if !(defined(__FreeBSD__) || defined(__NetBSD__)) - extern char *sys_errlist[]; - #endif -- extern int sys_nerr; -+ extern __const int sys_nerr; - static char buf[50]; - int serrno; - diff --git a/net/cap/files/patch-applications-lwsrv-lwsrv.c b/net/cap/files/patch-applications-lwsrv-lwsrv.c deleted file mode 100644 index 86ef32146da6..000000000000 --- a/net/cap/files/patch-applications-lwsrv-lwsrv.c +++ /dev/null @@ -1,54 +0,0 @@ ---- applications/lwsrv/lwsrv.c.orig Sat Mar 20 14:38:45 2004 -+++ applications/lwsrv/lwsrv.c Sat Mar 20 14:55:51 2004 -@@ -1864,7 +1864,7 @@ - PFILE *pf; - { - long t; -- int argc, i; -+ int argc, i, fd; - FILE *outfile; - char tname[256],status[256]; - char pbuf[256],rhbuf[16],jbuf[1024]; -@@ -1930,10 +1930,8 @@ - strcat(tname,"/lwsrvXXXXXX"); - } else - strcpy(tname,TEMPFILE); -- mktemp(tname); -- if ((outfile = fopen(tname, "w+")) == NULL) -+ if ( ((fd = mkstemp(tname)) == -1 ) || ((outfile = fdopen(fd, "w+")) == NULL) ) - perror(tname); -- chmod(tname, 0600); - } - - NewStatus(prtp->children <= 0 ? "initializing" : statusprocessing); -@@ -2310,7 +2308,7 @@ - PFILE *pf; - { - long t; -- int argc, i; -+ int argc, i, fd; - FILE *outfile; - char tname[256],status[256]; - char pbuf[256],rhbuf[16],jbuf[1024]; -@@ -2354,16 +2352,15 @@ - if (tmpfiledir != NULL) { - strcpy(tname,tmpfiledir); - strcat(tname,"/lwsrvXXXXXX"); -+ if ((outfile = fopen(tname, "w+")) == NULL) -+ perror(tname); -+ chmod(tname, 0600); - } else - strcat(tname,TEMPFILE); -- mktemp(tname); -+ if ( ((fd = mkstemp(tname)) == -1 ) || ((outfile = fdopen(fd, "w+")) == NULL) ) -+ perror(tname); - } - -- if ((outfile = fopen(tname, "w+")) == NULL) -- perror(tname); -- -- chmod(tname, 0600); -- - if (singlefork) - NewStatus("initializing"); - diff --git a/net/cap/files/patch-applications-lwsrv-simple.c b/net/cap/files/patch-applications-lwsrv-simple.c deleted file mode 100644 index 7483887dd229..000000000000 --- a/net/cap/files/patch-applications-lwsrv-simple.c +++ /dev/null @@ -1,98 +0,0 @@ ---- applications/lwsrv/simple.c.orig Sat Mar 20 12:03:13 2004 -+++ applications/lwsrv/simple.c Sat Mar 20 12:06:30 2004 -@@ -139,8 +139,7 @@ - byte changeecho; - #endif /* LWSRV8 */ - } toktbl[] = { --#ifndef LWSRV8 - #define TOKEN(token, tag) { (token), (sizeof(token)-1), (tag)} - TOKEN("%%EOF", TOK_DROP), - TOKEN("%%Title", TOK_TIT), - TOKEN("%%Creator", TOK_CRE), -@@ -161,84 +159,24 @@ - TOKEN("%%BeginProcSet", TOK_BPS), - TOKEN("%%EndProcSet", TOK_EPS), - TOKEN("%%?BeginPrinterQuery", TOK_BEGINR), - TOKEN("%%?EndPrinterQuery", TOK_ENDR), - TOKEN("%%?BeginQuery", TOK_BEGINR), - TOKEN("%%?EndQuery", TOK_ENDR), --#else /* LWSRV8 */ --/* Now in SORTED order, because we do a binary search on it */ --#define TOKEN(token, tag, e) {(token), (tag), (sizeof(token)-1), (e)} -- TOKEN("%!PS-Adobe-", TOK_PSA, ECHO_OFF), -- TOKEN("%%?BeginFeatureQuery", TOK_BFEQ, ECHO_UNCHANGED), -- TOKEN("%%?BeginFileQuery", TOK_BFIQ, ECHO_UNCHANGED), -- TOKEN("%%?BeginFontListQuery", TOK_BFLQ, ECHO_UNCHANGED), -- TOKEN("%%?BeginFontQuery", TOK_BFOQ, ECHO_UNCHANGED), -- TOKEN("%%?BeginPrinterQuery", TOK_BPRQ, ECHO_UNCHANGED), -- TOKEN("%%?BeginProcSetQuery", TOK_BPSQ, ECHO_UNCHANGED), -- TOKEN("%%?BeginQuery", TOK_BQU, ECHO_UNCHANGED), -- TOKEN("%%?BeginResourceListQuery", TOK_BRLQ, ECHO_UNCHANGED), -- TOKEN("%%?BeginResourceQuery", TOK_BREQ, ECHO_UNCHANGED), -- TOKEN("%%?BeginVMStatus", TOK_BVQ, ECHO_UNCHANGED), -- TOKEN("%%?EndFeatureQuery", TOK_EFEQ, ECHO_UNCHANGED), -- TOKEN("%%?EndFileQuery", TOK_EFIQ, ECHO_UNCHANGED), -- TOKEN("%%?EndFontListQuery", TOK_EFLQ, ECHO_UNCHANGED), -- TOKEN("%%?EndFontQuery", TOK_EFOQ, ECHO_UNCHANGED), -- TOKEN("%%?EndPrinterQuery", TOK_EPRQ, ECHO_UNCHANGED), -- TOKEN("%%?EndProcSetQuery", TOK_EPSQ, ECHO_UNCHANGED), -- TOKEN("%%?EndQuery", TOK_EQU, ECHO_UNCHANGED), -- TOKEN("%%?EndResourceListQuery", TOK_ERLQ, ECHO_UNCHANGED), -- TOKEN("%%?EndResourceQuery", TOK_EREQ, ECHO_UNCHANGED), -- TOKEN("%%?EndVMStatus", TOK_EVQ, ECHO_UNCHANGED), -- TOKEN("%%BeginExitServer", TOK_BEGIN, ECHO_OFF), -- TOKEN("%%BeginProcSet", TOK_BPS, ECHO_OFF), -- TOKEN("%%Creator", TOK_CRE, ECHO_UNCHANGED), -- TOKEN("%%EOF", TOK_TEOF, ECHO_DROP), -- TOKEN("%%EndComments", TOK_ENC, ECHO_UNCHANGED), -- TOKEN("%%EndExitServer", TOK_END, ECHO_ON), -- TOKEN("%%EndProcSet", TOK_EPS, ECHO_ON), -- TOKEN("%%For", TOK_FOR, ECHO_UNCHANGED), --#endif /* LWSRV8 */ - #ifdef ADOBE_DSC2_CONFORMANT --#ifndef LWSRV8 - TOKEN("%%IncludeProcSet", TOK_IPS), --#else /* LWSRV8 */ -- TOKEN("%%IncludeProcSet", TOK_IPS, ECHO_UNCHANGED), --#endif /* LWSRV8 */ - #else ADOBE_DSC2_CONFORMANT --#ifndef LWSRV8 - TOKEN("%%IncludeProcSet", TOK_IPS|TOK_INVALID), --#else /* LWSRV8 */ -- TOKEN("%%IncludeProcSet", TOK_IPS|TOK_INVALID, ECHO_UNCHANGED), --#endif /* LWSRV8 */ - #endif ADOBE_DSC2_CONFORMANT --#ifndef LWSRV8 - #ifdef PAGECOUNT - TOKEN("%%Pages", TOK_PGS), - #endif PAGECOUNT --#else /* LWSRV8 */ -- TOKEN("%%Page:", TOK_PAGE, ECHO_UNCHANGED), -- TOKEN("%%Pages", TOK_PGS, ECHO_UNCHANGED), --#endif /* LWSRV8 */ - #ifdef PROCSET_PATCH --#ifndef LWSRV8 - TOKEN("%%Patches", TOK_PATCH), --#else /* LWSRV8 */ -- TOKEN("%%Patches", TOK_PATCH, ECHO_OFF), --#endif /* LWSRV8 */ - #endif PROCSET_PATCH --#ifdef LWSRV8 -- TOKEN("%%Title", TOK_TIT, ECHO_UNCHANGED), --#endif /* LWSRV8 */ -- /* very old type of queries */ --#ifndef LWSRV8 - TOKEN("%?appledict version #", TOK_ADV), -- TOKEN("%?fontList", TOK_FLS), - TOKEN("%?end",TOK_ENDOLD), -- {NULL, TOK_UNK, 0} --#else /* LWSRV8 */ -- TOKEN("%?appledict version #", TOK_ADV, ECHO_OFF), -- TOKEN("%?end",TOK_ENDOLD, ECHO_ON), -- TOKEN("%?fontList", TOK_FLS, ECHO_OFF), --#endif /* LWSRV8 */ -+ TOKEN("%?fontList", TOK_FLS), -+ {NULL, TOK_UNK, 0} - }; - - #ifndef LWSRV8 diff --git a/net/cap/files/patch-applications-papif-papif.c b/net/cap/files/patch-applications-papif-papif.c deleted file mode 100644 index ba4a6a2d14d1..000000000000 --- a/net/cap/files/patch-applications-papif-papif.c +++ /dev/null @@ -1,21 +0,0 @@ ---- applications/papif/papif.c.orig Sat Mar 20 12:14:20 2004 -+++ applications/papif/papif.c Sat Mar 20 12:19:52 2004 -@@ -1801,16 +1801,13 @@ - dolog(fmt, a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af) - char *fmt; - #else --dolog(va_alist) -+dolog(register char *fmt, ...) --va_dcl - #endif - { - #ifdef USEVPRINTF -- register char *fmt; - va_list args; - -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - if (jobout) - vfprintf(jobout, fmt, args); - vfprintf(stderr, fmt, args); diff --git a/net/cap/files/patch-contrib-MacPS-macps-22.shar b/net/cap/files/patch-contrib-MacPS-macps-22.shar deleted file mode 100644 index 2b0e0a5833e6..000000000000 --- a/net/cap/files/patch-contrib-MacPS-macps-22.shar +++ /dev/null @@ -1,26 +0,0 @@ ---- contrib/MacPS/macps-22.shar.orig Thu Feb 28 13:45:16 1991 -+++ contrib/MacPS/macps-22.shar Sat Mar 20 14:56:30 2004 -@@ -738,7 +738,7 @@ - { - register STR *str; - register FILE *tp; -- register int i; -+ register int i, tmpfd; - register unsigned char *lp; - char buf[BUFSIZ]; - char *malloc(), *realloc(); -@@ -787,11 +787,10 @@ - fprintf(stderr, "%s: Can't open %s\n", myname, *argv); - exit(1); - } -- mktemp(tempname); -- if((tp = fopen(tempname, "w+")) == NULL) { -+ if ( ((tmpfd = mkstemp(tempname)) == -1 ) || (tp = fdopen(tmpfd, "w+")) ) == NULL) { - fprintf(stderr, "%s: Can't create temp file %s\n", -- myname, tempname); -- exit(1); -+ myname, tempname); -+ exit(1); - } - unlink(tempname); - str = STRalloc(); diff --git a/net/cap/files/patch-contrib-MacPS-prepfix.c b/net/cap/files/patch-contrib-MacPS-prepfix.c deleted file mode 100644 index 3f838d9b1732..000000000000 --- a/net/cap/files/patch-contrib-MacPS-prepfix.c +++ /dev/null @@ -1,21 +0,0 @@ ---- contrib/MacPS/prepfix.c.orig Thu Feb 28 13:45:17 1991 -+++ contrib/MacPS/prepfix.c Sat Mar 20 14:56:52 2004 -@@ -60,7 +60,7 @@ - { - register STR *str; - register FILE *tp; -- register int i; -+ register int i, tmpfd; - register unsigned char *lp; - char buf[BUFSIZ]; - char *malloc(), *realloc(); -@@ -109,8 +109,7 @@ - fprintf(stderr, "%s: Can't open %s\n", myname, *argv); - exit(1); - } -- mktemp(tempname); -- if((tp = fopen(tempname, "w+")) == NULL) { -+ if ( ((tmpfd = mkstemp(tempname)) == -1 ) || (tp = fdopen(tmpfd, "w+")) ) == NULL) { - fprintf(stderr, "%s: Can't create temp file %s\n", - myname, tempname); - exit(1); diff --git a/net/cap/files/patch-lib-cap-ablog.c b/net/cap/files/patch-lib-cap-ablog.c deleted file mode 100644 index c3baa70fe94a..000000000000 --- a/net/cap/files/patch-lib-cap-ablog.c +++ /dev/null @@ -1,66 +0,0 @@ ---- lib/cap/ablog.c.orig Sat Aug 30 18:19:18 2003 -+++ lib/cap/ablog.c Sat Aug 30 18:25:05 2003 -@@ -24,13 +24,14 @@ - * - */ - -+#include <osreldate.h> - #include <stdio.h> - #include <sys/types.h> - #include <sys/time.h> - #include <netat/appletalk.h> - - #ifdef USEVPRINTF --# include <varargs.h> -+# include <stdarg.h> - #endif USEVPRINTF - #ifdef USETIMES - # include <time.h> -@@ -66,8 +67,13 @@ - * This is something all machine should, but don't have :-) - */ - -+#if defined(__FreeBSD__) && __FreeBSD_version < 470000 - static FILE *lfp = stderr; -- -+#else -+static FILE *lfp; -+static void lfp_construct (void) __attribute__((constructor)); -+static void lfp_construct (void) { lfp = stderr; } -+#endif - - #ifndef USEVPRINTF - /* Bletch - gotta do it because pyramids don't work the other way */ -@@ -79,19 +85,16 @@ - char *fmt; - #else USEVPRINTF - /*VARARGS*/ --logit(va_alist) --va_dcl -+logit(int level, char *fmt, ...) - #endif USEVPRINTF - { - static char *mytod(); - #ifdef USEVPRINTF -- register char *fmt; - va_list args; -- int level; - #endif USEVPRINTF - int saveerr; - extern int errno; -- extern int sys_nerr; -+ extern __const int sys_nerr; - #ifndef __FreeBSD__ - extern char *sys_errlist[]; - #endif -@@ -101,9 +104,7 @@ - - saveerr = errno; - #ifdef USEVPRINTF -- va_start(args); -- level = va_arg(args, int); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - #endif USEVPRINTF - - if (dlevel < (level & L_LVL)) diff --git a/net/cap/files/patch-papif.c b/net/cap/files/patch-papif.c deleted file mode 100644 index 25f47e001577..000000000000 --- a/net/cap/files/patch-papif.c +++ /dev/null @@ -1,20 +0,0 @@ ---- applications/papif/papif.c.orig Sat Aug 21 18:29:42 2004 -+++ applications/papif/papif.c Sat Aug 21 18:31:17 2004 -@@ -244,6 +244,17 @@ - #define lpd_REPRINT 1 /* forces a reprint */ - #define lpd_ERRORS 2 /* printed with errors */ - -+#ifndef USEVPRINTF -+/* Bletch - gotta do it because pyramids don't work the other way */ -+/* (using _doprnt and &args) and don't have vprintf */ -+/* of course, there will be something that is just one arg larger :-) */ -+/* VARARGS1 */ -+dolog(fmt, a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af); -+char *fmt; -+#else -+dolog(register char *fmt, ...); -+#endif -+ - #ifdef USESYSLOG - #ifdef __STDC__ - log_i(fmt, a1,a2,a3,a4,a5,a6,a7,a8,a9,aa,ab,ac,ad,ae,af) diff --git a/net/cap/files/patch-support-ethertalk-aarpd_clnt.c b/net/cap/files/patch-support-ethertalk-aarpd_clnt.c deleted file mode 100644 index 9f4bf1a2e64c..000000000000 --- a/net/cap/files/patch-support-ethertalk-aarpd_clnt.c +++ /dev/null @@ -1,46 +0,0 @@ ---- support/ethertalk/aarpd_clnt.c.orig Sat Mar 20 12:58:10 2004 -+++ support/ethertalk/aarpd_clnt.c Sat Mar 20 13:12:03 2004 -@@ -32,8 +32,8 @@ - { - static etheraddr res; - bzero((char *)res, sizeof(res)); -- if (clnt_call(clnt, AARP_RESOLVE, xdr_int, (caddr_t)argp, -- xdr_etheraddr, (char *)res, TIMEOUT) != RPC_SUCCESS) { -+ if (clnt_call(clnt, AARP_RESOLVE, (xdrproc_t)xdr_int, (caddr_t)argp, -+ (xdrproc_t)xdr_etheraddr, (char *)res, TIMEOUT) != RPC_SUCCESS) { - return (NULL); - } - return (res); -@@ -50,8 +50,8 @@ - { - static bridgeaddr res; - bzero((char *)res, sizeof(res)); -- if (clnt_call(clnt, RTMP_GETBADDR, xdr_int, (caddr_t)argp, -- xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) { -+ if (clnt_call(clnt, RTMP_GETBADDR, (xdrproc_t)xdr_int, (caddr_t)argp, -+ (xdrproc_t)xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) { - return (NULL); - } - return (res); -@@ -68,8 +68,8 @@ - { - static bridgeaddr res; - bzero((char *)res, sizeof(res)); -- if (clnt_call(clnt, RTMP_SETBADDR, xdr_int, (caddr_t)argp, -- xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) { -+ if (clnt_call(clnt, RTMP_SETBADDR, (xdrproc_t)xdr_int, (caddr_t)argp, -+ (xdrproc_t)xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) { - return (NULL); - } - return (res); -@@ -87,8 +87,8 @@ - { - static bridgeaddr res; /* convenient size */ - bzero((char *)res, sizeof(res)); -- if (clnt_call(clnt, NET_RANGE_SET, xdr_int, (caddr_t)argp, -- xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) { -+ if (clnt_call(clnt, NET_RANGE_SET, (xdrproc_t)xdr_int, (caddr_t)argp, -+ (xdrproc_t)xdr_bridgeaddr, (char *)res, TIMEOUT) != RPC_SUCCESS) { - return (NULL); - } - return (res); diff --git a/net/cap/files/patch-support-ethertalk-aarpd_svc.c b/net/cap/files/patch-support-ethertalk-aarpd_svc.c deleted file mode 100644 index 0760124306e7..000000000000 --- a/net/cap/files/patch-support-ethertalk-aarpd_svc.c +++ /dev/null @@ -1,31 +0,0 @@ ---- support/ethertalk/aarpd_svc.c.orig Sat Mar 20 13:48:32 2004 -+++ support/ethertalk/aarpd_svc.c Sat Mar 20 13:53:53 2004 -@@ -40,7 +40,7 @@ - - switch (rqstp->rq_proc) { - case NULLPROC: -- (void)svc_sendreply(transp, xdr_void, (char *)NULL); -+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL); - return; - - case AARP_RESOLVE: -@@ -74,16 +74,16 @@ - return; - } - bzero((char *)&argument, sizeof(argument)); -- if (!svc_getargs(transp, xdr_argument, (caddr_t)&argument)) { -+ if (!svc_getargs(transp, (xdrproc_t)xdr_argument, (caddr_t)&argument)) { - svcerr_decode(transp); - return; - } - result = (*local)(&argument, rqstp); - if (result != NULL -- && !svc_sendreply(transp, xdr_result, (caddr_t)result)) { -+ && !svc_sendreply(transp, (xdrproc_t)xdr_result, (caddr_t)result)) { - svcerr_systemerr(transp); - } -- if (!svc_freeargs(transp, xdr_argument, (caddr_t)&argument)) { -+ if (!svc_freeargs(transp, (xdrproc_t)xdr_argument, (caddr_t)&argument)) { - (void)fprintf(stderr, "unable to free arguments\n"); - exit(1); - } diff --git a/net/cap/files/patch-support-ethertalk-aarpd_xdr.c b/net/cap/files/patch-support-ethertalk-aarpd_xdr.c deleted file mode 100644 index 9ff2a29eac33..000000000000 --- a/net/cap/files/patch-support-ethertalk-aarpd_xdr.c +++ /dev/null @@ -1,20 +0,0 @@ ---- support/ethertalk/aarpd_xdr.c.orig Sat Mar 20 13:39:44 2004 -+++ support/ethertalk/aarpd_xdr.c Sat Mar 20 13:40:02 2004 -@@ -11,7 +11,7 @@ - XDR *xdrs; - etheraddr objp; - { -- if (!xdr_vector(xdrs, (char *)objp, 6, sizeof(u_char), xdr_u_char)) { -+ if (!xdr_vector(xdrs, (char *)objp, 6, sizeof(u_char), (xdrproc_t)xdr_u_char)) { - return (FALSE); - } - return (TRUE); -@@ -22,7 +22,7 @@ - XDR *xdrs; - bridgeaddr objp; - { -- if (!xdr_vector(xdrs, (char *)objp, 4, sizeof(u_char), xdr_u_char)) { -+ if (!xdr_vector(xdrs, (char *)objp, 4, sizeof(u_char), (xdrproc_t)xdr_u_char)) { - return (FALSE); - } - return (TRUE); diff --git a/net/cap/files/pkg-message.in b/net/cap/files/pkg-message.in deleted file mode 100644 index 1a3bf1e51625..000000000000 --- a/net/cap/files/pkg-message.in +++ /dev/null @@ -1,4 +0,0 @@ -********************************************************************** - Now, edit %%PREFIX%%/etc/cap/start-cap-servers.sample. - Then install it as %%PREFIX%%/etc/rc.d/start-cap-servers.sh. -********************************************************************** |