diff -urN -x .build -x .inst -x .sinst tcp_wrappers_7.6-orig/CYGWIN-PATCHES/postinstall.sh tcp_wrappers_7.6/CYGWIN-PATCHES/postinstall.sh --- tcp_wrappers_7.6-orig/CYGWIN-PATCHES/postinstall.sh 1969-12-31 16:00:00.000000000 -0800 +++ tcp_wrappers_7.6/CYGWIN-PATCHES/postinstall.sh 2006-04-13 19:04:43.930000000 -0700 @@ -0,0 +1,27 @@ +#!/bin/bash +if [ ! -f /etc/hosts.allow ]; then +cat > /etc/hosts.allow <<-EOF + # + # hosts.allow This file describes the names of the hosts which are + # allowed to use the local INET services, as decided + # by the '/usr/sbin/tcpd' server. + # + # + sshd: ALL +EOF +fi +if [ ! -f /etc/hosts.deny ]; then +cat > /etc/hosts.deny <<-EOF + # + # hosts.deny This file describes the names of the hosts which are + # *not* allowed to use the local INET services, as decided + # by the '/usr/sbin/tcpd' server. + # + # The portmap line is redundant, but it is left to remind you that + # the new secure portmap uses hosts.deny and hosts.allow. In particular + # you should know that NFS uses portmap! + # +ALL:ALL EXCEPT localhost:DENY +EOF +fi + diff -urN -x .build -x .inst -x .sinst tcp_wrappers_7.6-orig/CYGWIN-PATCHES/setup.hint tcp_wrappers_7.6/CYGWIN-PATCHES/setup.hint --- tcp_wrappers_7.6-orig/CYGWIN-PATCHES/setup.hint 1969-12-31 16:00:00.000000000 -0800 +++ tcp_wrappers_7.6/CYGWIN-PATCHES/setup.hint 2006-04-13 19:04:43.945625000 -0700 @@ -0,0 +1,16 @@ +# TCP Wrappers +sdesc: "Provides host-based access restrictions on tcp services" +ldesc: "TCP Wrappers, With this package you can monitor and filter incoming +requests for the SSHD, SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, +TFTP, TALK, and other network services. + +The package provides tiny daemon wrapper programs that can be installed +without any changes to existing software or to existing configuration +files. The wrappers report the name of the client host and of the +requested service; the wrappers do not exchange information with the +client or server applications, and impose no overhead on the actual +conversation between the client and server applications." +curr: 7.6-1 +test: 7.6-2 +category: Net +requires: cygwin diff -urN -x .build -x .inst -x .sinst tcp_wrappers_7.6-orig/CYGWIN-PATCHES/shtool tcp_wrappers_7.6/CYGWIN-PATCHES/shtool --- tcp_wrappers_7.6-orig/CYGWIN-PATCHES/shtool 1969-12-31 16:00:00.000000000 -0800 +++ tcp_wrappers_7.6/CYGWIN-PATCHES/shtool 2006-04-13 19:04:43.961250000 -0700 @@ -0,0 +1,426 @@ +#!/bin/sh +## +## GNU shtool -- The GNU Portable Shell Tool +## Copyright (c) 1994-2001 Ralf S. Engelschall +## +## See http://www.gnu.org/software/shtool/ for more information. +## See ftp://ftp.gnu.org/gnu/shtool/ for latest version. +## +## Version: 1.5.4 (14-Jun-2001) +## Contents: 1/17 available modules +## + +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +## USA, or contact Ralf S. Engelschall . +## +## NOTICE: Given that you include this file verbatim into your own +## source tree, you are justified in saying that it remains separate +## from your package, and that this way you are simply just using GNU +## shtool. So, in this situation, there is no requirement that your +## package itself is licensed under the GNU General Public License in +## order to take advantage of GNU shtool. +## + +## +## Usage: shtool [] [ [] []] +## +## Available commands: +## mkshadow Make a shadow tree through symbolic links +## +## Not available commands (because module was not built-in): +## echo Print string with optional construct expansion +## mdate Pretty-print modification time of a file or dir +## table Pretty-print a field-separated list as a table +## prop Display progress with a running propeller +## move Move files with simultaneous substitution +## install Install a program, script or datafile +## mkdir Make one or more directories +## mkln Make link with calculation of relative paths +## fixperm Fix file permissions inside a source tree +## tarball Roll distribution tarballs +## guessos Simple operating system guesser +## arx Extended archive command +## slo Separate linker options by library class +## scpp Sharing C Pre-Processor +## version Maintain a version information file +## path Deal with program paths +## + +if [ $# -eq 0 ]; then + echo "$0:Error: invalid command line" 1>&2 + echo "$0:Hint: run \`$0 -h' for usage" 1>&2 + exit 1 +fi +if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then + echo "This is GNU shtool, version 1.5.4 (14-Jun-2001)" + echo "Copyright (c) 1994-2001 Ralf S. Engelschall " + echo "Report bugs to " + echo '' + echo "Usage: shtool [] [ [] []]" + echo '' + echo 'Available global :' + echo ' -v, --version display shtool version information' + echo ' -h, --help display shtool usage help page (this one)' + echo ' -d, --debug display shell trace information' + echo ' -r, --recreate recreate this shtool script via shtoolize' + echo '' + echo 'Available [] []:' + echo ' mkshadow [-v] [-t] [-a] ' + echo '' + echo 'Not available (because module was not built-in):' + echo ' echo [-n] [-e] [ ...]' + echo ' mdate [-n] [-z] [-s] [-d] [-f] [-o] ' + echo ' table [-F] [-w] [-c] [-s] ...' + echo ' prop [-p]' + echo ' move [-v] [-t] [-e] [-p] ' + echo ' install [-v] [-t] [-c] [-C] [-s] [-m] [-o] [-g]' + echo ' [-e] [ ...] ' + echo ' mkdir [-t] [-f] [-p] [-m] [ ...]' + echo ' mkln [-t] [-f] [-s] [ ...] ' + echo ' fixperm [-v] [-t] [ ...]' + echo ' tarball [-t] [-v] [-o] [-c] [-d] [-u]' + echo ' [-g] [-e] [ ...]' + echo ' guessos ' + echo ' arx [-t] [-C] [ ...]' + echo ' slo [-p] -- -L -l [-L -l ...]' + echo ' scpp [-v] [-p] [-f] [-o] [-t] [-M]' + echo ' [-D] [-C] [ ...]' + echo ' version [-l] [-n] [-p] [-s] [-e]' + echo ' [-i] [-d] ' + echo ' path [-s] [-r] [-d] [-b] [-m] [-p] [ ...]' + echo '' + exit 0 +fi +if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then + echo "GNU shtool 1.5.4 (14-Jun-2001)" + exit 0 +fi +if [ ".$1" = ".-r" -o ".$1" = ."--recreate" ]; then + shtoolize -oshtool mkshadow + exit 0 +fi +if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then + shift + set -x +fi +name=`echo "$0" | sed -e 's;.*/\([^/]*\)$;\1;' -e 's;-sh$;;' -e 's;\.sh$;;'` +case "$name" in + mkshadow ) + # implicit tool command selection + tool="$name" + ;; + * ) + # explicit tool command selection + tool="$1" + shift + ;; +esac +arg_spec="" +opt_spec="" +gen_tmpfile=no + +## +## DISPATCH INTO SCRIPT PROLOG +## + +case $tool in + mkshadow ) + str_tool="mkshadow" + str_usage="[-v] [-t] [-a] " + arg_spec="2=" + opt_spec="v.t.a." + opt_v=no + opt_t=no + opt_a=no + ;; + -* ) + echo "$0:Error: unknown option \`$tool'" 2>&1 + echo "$0:Hint: run \`$0 -h' for usage" 2>&1 + exit 1 + ;; + * ) + echo "$0:Error: unknown command \`$tool'" 2>&1 + echo "$0:Hint: run \`$0 -h' for usage" 2>&1 + exit 1 + ;; +esac + +## +## COMMON UTILITY CODE +## + +# determine name of tool +if [ ".$tool" != . ]; then + # used inside shtool script + toolcmd="$0 $tool" + toolcmdhelp="shtool $tool" + msgprefix="shtool:$tool" +else + # used as standalone script + toolcmd="$0" + toolcmdhelp="sh $0" + msgprefix="$str_tool" +fi + +# parse argument specification string +eval `echo $arg_spec |\ + sed -e 's/^\([0-9]*\)\([+=]\)/arg_NUMS=\1; arg_MODE=\2/'` + +# parse option specification string +eval `echo h.$opt_spec |\ + sed -e 's/\([a-zA-Z0-9]\)\([.:+]\)/opt_MODE_\1=\2;/g'` + +# interate over argument line +opt_PREV='' +while [ $# -gt 0 ]; do + # special option stops processing + if [ ".$1" = ".--" ]; then + shift + break + fi + + # determine option and argument + opt_ARG_OK=no + if [ ".$opt_PREV" != . ]; then + # merge previous seen option with argument + opt_OPT="$opt_PREV" + opt_ARG="$1" + opt_ARG_OK=yes + opt_PREV='' + else + # split argument into option and argument + case "$1" in + -[a-zA-Z0-9]*) + eval `echo "x$1" |\ + sed -e 's/^x-\([a-zA-Z0-9]\)/opt_OPT="\1";/' \ + -e 's/";\(.*\)$/"; opt_ARG="\1"/'` + ;; + -[a-zA-Z0-9]) + opt_OPT=`echo "x$1" | cut -c3-` + opt_ARG='' + ;; + *) + break + ;; + esac + fi + + # eat up option + shift + + # determine whether option needs an argument + eval "opt_MODE=\$opt_MODE_${opt_OPT}" + if [ ".$opt_ARG" = . -a ".$opt_ARG_OK" != .yes ]; then + if [ ".$opt_MODE" = ".:" -o ".$opt_MODE" = ".+" ]; then + opt_PREV="$opt_OPT" + continue + fi + fi + + # process option + case $opt_MODE in + '.' ) + # boolean option + eval "opt_${opt_OPT}=yes" + ;; + ':' ) + # option with argument (multiple occurances override) + eval "opt_${opt_OPT}=\"\$opt_ARG\"" + ;; + '+' ) + # option with argument (multiple occurances append) + eval "opt_${opt_OPT}=\"\$opt_${opt_OPT} \$opt_ARG\"" + ;; + * ) + echo "$msgprefix:Error: unknown option: \`-$opt_OPT'" 1>&2 + echo "$msgprefix:Hint: run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2 + exit 1 + ;; + esac +done +if [ ".$opt_PREV" != . ]; then + echo "$msgprefix:Error: missing argument to option \`-$opt_PREV'" 1>&2 + echo "$msgprefix:Hint: run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2 + exit 1 +fi + +# process help option +if [ ".$opt_h" = .yes ]; then + echo "Usage: $toolcmdhelp $str_usage" + exit 0 +fi + +# complain about incorrect number of arguments +case $arg_MODE in + '=' ) + if [ $# -ne $arg_NUMS ]; then + echo "$msgprefix:Error: invalid number of arguments (exactly $arg_NUMS expected)" 1>&2 + echo "$msgprefix:Hint: run \`$toolcmd -h' or \`man shtool' for details" 1>&2 + exit 1 + fi + ;; + '+' ) + if [ $# -lt $arg_NUMS ]; then + echo "$msgprefix:Error: invalid number of arguments (at least $arg_NUMS expected)" 1>&2 + echo "$msgprefix:Hint: run \`$toolcmd -h' or \`man shtool' for details" 1>&2 + exit 1 + fi + ;; +esac + +# establish a temporary file on request +if [ ".$gen_tmpfile" = .yes ]; then + if [ ".$TMPDIR" != . ]; then + tmpdir="$TMPDIR" + elif [ ".$TEMPDIR" != . ]; then + tmpdir="$TEMPDIR" + else + tmpdir="/tmp" + fi + tmpfile="$tmpdir/.shtool.$$" + rm -f $tmpfile >/dev/null 2>&1 + touch $tmpfile + chmod 600 $tmpfile +fi + +## +## DISPATCH INTO SCRIPT BODY +## + +case $tool in + +mkshadow ) + ## + ## mkshadow -- Make a shadow tree through symbolic links + ## Copyright (c) 1998-2001 Ralf S. Engelschall + ## Originally written for Apache + ## + + # source and destination directory + src=`echo "$1" | sed -e 's:/$::' -e 's:^\./\(.\):\1:'` + dst=`echo "$2" | sed -e 's:/$::' -e 's:^\./\(.\):\1:'` + + # check whether source exists + if [ ! -d $src ]; then + echo "$msgprefix:Error: source directory not found: \`$src'" 1>&2 + exit 1 + fi + + # determine if one of the paths is an absolute path, + # because then we have to use an absolute symlink + oneisabs=0 + case $src in + /* ) oneisabs=1 ;; + esac + case $dst in + /* ) oneisabs=1 ;; + esac + + # determine reverse directory for destination directory + dstrevdir='' + if [ $oneisabs = 0 ]; then + # derive reverse path from forward path + pwd=`pwd` + OIFS="$IFS"; IFS='/' + for pe in $dst; do + if [ "x$pe" = "x.." ]; then + OIFS2="$IFS"; IFS="$DIFS" + eval `echo "$pwd" |\ + sed -e 's:\([^/]*\)$:; dir="\1":' \ + -e 's:^\(.*\)/[^/]*;:pwd="\1";:'\ + -e 's:^;:pwd="";:'` + dstrevdir="$dir/$dstrevdir" + IFS="$OIFS2" + else + dstrevdir="../$dstrevdir" + fi + done + IFS="$OIFS" + else + src="`cd $src; pwd`"; + fi + + # create directory tree at destination + if [ ! -d $dst ]; then + if [ ".$opt_t" = .yes ]; then + echo "mkdir $dst" 1>&2 + fi + mkdir $dst + fi + if [ ".$opt_a" = .yes ]; then + DIRS=`cd $src; find . -type d -print |\ + sed -e '/^\.$/d' -e 's:^\./::'` + else + DIRS=`cd $src; find . -type d -print |\ + sed -e '/\/CVS/d' -e '/^\.$/d' -e 's:^\./::'` + fi + for dir in $DIRS; do + if [ ".$opt_t" = .yes ]; then + echo "mkdir $dst/$dir" 1>&2 + fi + mkdir $dst/$dir + done + + # fill directory tree with symlinks to files + if [ ".$opt_a" = .yes ]; then + FILES="`cd $src; find . -depth -print |\ + sed -e 's/^\.\///'`" + else + FILES="`cd $src; find . -depth -print |\ + sed -e '/\.o$/d' -e '/\.a$/d' -e '/\.so$/d' \ + -e '/\.cvsignore$/d' -e '/\/CVS/d' \ + -e '/\/\.#/d' -e '/\.orig$/d' \ + -e 's/^\.\///'`" + fi + for file in $FILES; do + # don't use `-type f' above for find because of symlinks + if [ -d "$src/$file" ]; then + continue + fi + basename=`echo $file | sed -e 's:^.*/::'` + dir=`echo $file | sed -e 's:[^/]*$::' -e 's:/$::' -e 's:$:/:' -e 's:^/$::'` + from=`echo "$src/$file" | sed -e 's/^\.\///'` + to="$dst/$dir$basename" + if [ $oneisabs = 0 ]; then + if [ ".$dir" != . ]; then + subdir=`echo $dir | sed -e 's:/$::'` + # derive reverse path from forward path + revdir='' + OIFS="$IFS"; IFS='/' + for pe in $subdir; do + revdir="../$revdir" + done + IFS="$OIFS" + # finalize from + from="$revdir$from" + fi + from="$dstrevdir$from" + fi + if [ ".$opt_v" = .yes ]; then + echo " $to" 1>&2 + fi + if [ ".$opt_t" = .yes ]; then + echo "ln -s $from $to" 1>&2 + fi + ln -s $from $to + done + ;; + +esac + +exit 0 + +##EOF## diff -urN -x .build -x .inst -x .sinst tcp_wrappers_7.6-orig/CYGWIN-PATCHES/tcp_wrappers.README tcp_wrappers_7.6/CYGWIN-PATCHES/tcp_wrappers.README --- tcp_wrappers_7.6-orig/CYGWIN-PATCHES/tcp_wrappers.README 1969-12-31 16:00:00.000000000 -0800 +++ tcp_wrappers_7.6/CYGWIN-PATCHES/tcp_wrappers.README 2006-04-13 19:04:43.976875000 -0700 @@ -0,0 +1,74 @@ +tcp_wrappers +-------------------------------------- +With this package you can monitor and filter incoming requests for the +SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK, and other +network services. + +Runtime requirements: + cygwin-1.3.9 or newer + +Build requirements + cygwin-1.3.9 or newer + gcc-2.95.3-5 or newer + binutils-20011002-1 or newer + +Canonical homepage: + ftp://ftp.porcupine.org/pub/security/index.html + +Canonical download: + ftp://ftp.porcupine.org/pub/security/ + +--------------------------------------- + +Build instructions: + unpack tcp_wrappers-7.6-X-src.tar.bz2 + if you use setup to install this src package, it will be unpacked + under /usr/src automatically + cd /usr/src + ./tcp_wrappers-7.6-X.sh all + +This will create: + /usr/src/tcp_wrappers-7.6-X.tar.bz2 + /usr/src/tcp_wrappers-7.6-X-src.tar.bz2 + +--------------------------------------- + +Files included in tcp_wrappers-7.6.tar.bz2: + + /usr/share/doc/Cygwin/tcp_wrappers-7.6.README + /usr/share/doc/tcp_wrappers-7.6/* + /usr/bin/cygwrap-1.dll + /usr/sbin/tcpdchk.exe + /usr/sbin/tcpdmatch.exe + /usr/sbin/safe_finger.exe + /usr/sbin/try-from.exe + /usr/sbin/tcpd.exe + /usr/lib/libwrap.a + /usr/lib/libwrap.dll.a + /usr/man/man3/hosts_access.3 + /usr/man/man5/hosts_access.5 + /usr/man/man5/hosts_options.5 + /usr/man/man8/tcpdchk.8 + /usr/man/man8/tcpdmatch.8 + /usr/man/man8/tcpd.8 + /usr/include/tcpd.h + /etc/postinstall/tcp_wrappers.sh + +---------------------------------------- + +Port Notes: + +7.6-2: + Simply moved documents to /usr/share per FHS. + +7.6-1: + if /etc/hosts.deny or /etc/hosts.allow do not exist, + then default versions are created. The default version + blocks everything except local services and sshd. + + Since tcp_wrappers must be built "in" the source directory, + we use 'shtool' to make a symlink-farm "copy" of srcdir + within .build. + +---------------------------------------- +Cygwin port maintained by: Bryan D. Thomas diff -urN -x .build -x .inst -x .sinst tcp_wrappers_7.6-orig/Makefile tcp_wrappers_7.6/Makefile --- tcp_wrappers_7.6-orig/Makefile 1997-03-21 10:27:21.000000000 -0800 +++ tcp_wrappers_7.6/Makefile 2006-04-13 19:04:43.992500000 -0700 @@ -16,13 +16,14 @@ @echo @echo "This Makefile knows about the following sys-types:" @echo - @echo " generic (most bsd-ish systems with sys5 compatibility)" - @echo " 386bsd aix alpha apollo bsdos convex-ultranet dell-gcc dgux dgux543" - @echo " dynix epix esix freebsd hpux irix4 irix5 irix6 isc iunix" - @echo " linux machten mips(untested) ncrsvr4 netbsd next osf power_unix_211" - @echo " ptx-2.x ptx-generic pyramid sco sco-nis sco-od2 sco-os5 sinix sunos4" - @echo " sunos40 sunos5 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2" - @echo " uts215 uxp" + @echo " generic (most bsd-ish systems with sys5 compatibility)" + @echo " 386bsd aix alpha apollo cygwin bsdos convex-ultranet" + @echo " dell-gcc dgux dgux543 dynix epix esix freebsd hpux irix4" + @echo " irix5 irix6 isc iunix linux machten mips(untested) ncrsvr4" + @echo " netbsd next osf power_unix_211 ptx-2.x ptx-generic pyramid" + @echo " sco sco-nis sco-od2 sco-os5 sinix sunos4 sunos40 sunos5" + @echo " sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2" + @echo " uts215 uxp" @echo @echo "If none of these match your environment, edit the system" @echo "dependencies sections in the Makefile and do a 'make other'." @@ -43,8 +44,8 @@ # Ultrix 4.x SunOS 4.x ConvexOS 10.x Dynix/ptx #REAL_DAEMON_DIR=/usr/etc # -# SysV.4 Solaris 2.x OSF AIX -#REAL_DAEMON_DIR=/usr/sbin +# SysV.4 Solaris 2.x OSF AIX cygwin +REAL_DAEMON_DIR=/usr/sbin # # BSD 4.4 #REAL_DAEMON_DIR=/usr/libexec @@ -359,6 +360,14 @@ LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=environ.o \ NETGROUP= TLI= all +# Cygwin v1.1.7 or newer +cygwin: + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ + LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \ + NETGROUP= TLI= \ + EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -Dsys_errlist=_sys_errlist \ + -Dsys_nerr=_sys_nerr" all + ############################################################### # System dependencies: TLI (transport-level interface) support. # @@ -684,9 +693,19 @@ refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \ scaffold.h tcpdmatch.8 README.NIS -LIB = libwrap.a +STATLIB = libwrap.a + +# for cygwin +#DYNLIB = cygwrap-1.dll +#DYNIMP = libwrap.dll.a +EXE = .exe +LINK_STATIC = -static +# end for cygwin + +LIB = $(STATLIB) $(DYNLIB) -all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk +all other: config-check tcpd${EXE} tcpdmatch${EXE} try-from${EXE} \ + safe_finger${EXE} tcpdchk${EXE} # Invalidate all object files when the compiler options (CFLAGS) have changed. @@ -698,32 +717,38 @@ else mv /tmp/cflags.$$$$ cflags ; \ fi >/dev/null 2>/dev/null -$(LIB): $(LIB_OBJ) - rm -f $(LIB) - $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ) - -$(RANLIB) $(LIB) +$(STATLIB): $(LIB_OBJ) + rm -f $(STATLIB) + $(AR) $(ARFLAGS) $(STATLIB) $(LIB_OBJ) + -$(RANLIB) $(STATLIB) + +# for cygwin +$(DYNLIB): $(LIB_OBJ) + rm -f $(DYNLIB) $(DYNIMP) + gcc -shared -Wl,--enable-auto-import -Wl,--export-all \ + -Wl,--out-implib=$(DYNIMP) -o $(DYNLIB) $(LIB_OBJ) $(LIBS) -tcpd: tcpd.o $(LIB) - $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS) +tcpd${EXE}: tcpd.o $(LIB) + $(CC) ${LINK_STATIC} $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS) -miscd: miscd.o $(LIB) - $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) +miscd${EXE}: miscd.o $(LIB) + $(CC) ${LINK_STATIC} $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) -safe_finger: safe_finger.o $(LIB) - $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) +safe_finger${EXE}: safe_finger.o $(LIB) + $(CC) ${LINK_STATIC} $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o -tcpdmatch: $(TCPDMATCH_OBJ) $(LIB) - $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS) +tcpdmatch${EXE}: $(TCPDMATCH_OBJ) $(LIB) + $(CC) ${LINK_STATIC} $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS) -try-from: try-from.o fakelog.o $(LIB) - $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS) +try-from${EXE}: try-from.o fakelog.o $(LIB) + $(CC) ${LINK_STATIC} $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS) TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o -tcpdchk: $(TCPDCHK_OBJ) $(LIB) - $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS) +tcpdchk${EXE}: $(TCPDCHK_OBJ) $(LIB) + $(CC) ${LINK_STATIC} $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS) shar: $(KIT) @shar $(KIT) @@ -738,8 +763,9 @@ $(ARCHIVE) $(KIT) clean: - rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \ - cflags + rm -f tcpd${EXE} miscd${EXE} safe_finger${EXE} tcpdmatch${EXE} \ + tcpdchk${EXE} try-from${EXE} *.[oa] core \ + cflags ${STATLIB} ${DYNLIB} ${DYNIMP} tidy: clean chmod -R a+r . diff -urN -x .build -x .inst -x .sinst tcp_wrappers_7.6-orig/percent_m.c tcp_wrappers_7.6/percent_m.c --- tcp_wrappers_7.6-orig/percent_m.c 1994-12-28 08:42:37.000000000 -0800 +++ tcp_wrappers_7.6/percent_m.c 2006-04-13 19:04:44.008125000 -0700 @@ -12,7 +12,9 @@ #include #include +#ifndef errno extern int errno; +#endif #ifndef SYS_ERRLIST_DEFINED extern char *sys_errlist[]; extern int sys_nerr;