diff -urk.orig tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile --- tcp_wrappers_7.6.orig/Makefile 1997-03-21 18:27:21 +0000 +++ tcp_wrappers_7.6/Makefile 2003-12-07 11:02:09 +0000 @@ -43,8 +43,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 Linux +REAL_DAEMON_DIR=/usr/sbin # # BSD 4.4 #REAL_DAEMON_DIR=/usr/libexec @@ -143,8 +143,9 @@ linux: @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ - LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \ - NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all + LIBS="-lnsl" RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \ + NETGROUP="-DNETGROUP" TLI= \ + EXTRA_CFLAGS="$(RPM_OPT_FLAGS) -DSYS_ERRLIST_DEFINED" all # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x. hpux hpux8 hpux9 hpux10: @@ -472,7 +473,7 @@ # If your system supports vsyslog(), comment out the following definition. # If in doubt leave it in, it won't harm. -VSYSLOG = -Dvsyslog=myvsyslog +#VSYSLOG = -Dvsyslog=myvsyslog # End of the system dependencies. ################################# @@ -491,7 +492,7 @@ # Uncomment the next definition to turn on the language extensions # (examples: allow, deny, banners, twist and spawn). # -#STYLE = -DPROCESS_OPTIONS # Enable language extensions. +STYLE = -DPROCESS_OPTIONS # Enable language extensions. ################################################################ # Optional: Changing the default disposition of logfile records @@ -514,7 +515,7 @@ # # The LOG_XXX names below are taken from the /usr/include/syslog.h file. -FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use +FACILITY= LOG_AUTH # LOG_MAIL is what most sendmail daemons use # The syslog priority at which successful connections are logged. @@ -531,7 +532,7 @@ # and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken # from /etc/hosts or from NIS maps. It does work with DNS through NIS. # -# DOT= -DAPPEND_DOT +DOT= -DAPPEND_DOT ################################################## # Optional: Always attempt remote username lookups @@ -551,7 +552,7 @@ # still do selective username lookups as documented in the hosts_access.5 # and hosts_options.5 manual pages (`nroff -man' format). # -#AUTH = -DALWAYS_RFC931 +AUTH = #-DALWAYS_RFC931 # # The default username lookup timeout is 10 seconds. This may not be long # enough for slow hosts or networks, but is enough to irritate PC users. @@ -571,7 +572,7 @@ # control of the daemon wrappers. Comment it out only if you are certain # that inetd and its children are started with a safe umask value. -UMASK = -DDAEMON_UMASK=022 +UMASK = -DDAEMON_UMASK=077 ####################################### # Optional: Turning off access control @@ -610,7 +611,7 @@ # Paranoid mode implies hostname lookup. In order to disable hostname # lookups altogether, see the next section. -PARANOID= -DPARANOID +PARANOID= #-DPARANOID ######################################## # Optional: turning off hostname lookups @@ -623,7 +624,7 @@ # In order to perform selective hostname lookups, disable paranoid # mode (see previous section) and comment out the following definition. -HOSTNAME= -DALWAYS_HOSTNAME +HOSTNAME= #-DALWAYS_HOSTNAME ############################################# # Optional: Turning on host ADDRESS checking @@ -649,7 +650,7 @@ # source-routed traffic in the kernel. Examples: 4.4BSD derivatives, # Solaris 2.x, and Linux. See your system documentation for details. # -# KILL_OPT= -DKILL_IP_OPTIONS +KILL_OPT= -DKILL_IP_OPTIONS ## End configuration options ############################ @@ -659,7 +660,7 @@ SHELL = /bin/sh .c.o:; $(CC) $(CFLAGS) -c $*.c -CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ +CFLAGS = -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ @@ -692,10 +693,10 @@ config-check: @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; } - @set +e; echo $(CFLAGS) >/tmp/cflags.$$$$ ; \ - if cmp cflags /tmp/cflags.$$$$ ; \ - then rm /tmp/cflags.$$$$ ; \ - else mv /tmp/cflags.$$$$ cflags ; \ + @set +e; echo $(CFLAGS) > cflags.$$$$ ; \ + if cmp cflags cflags.$$$$ ; \ + then rm cflags.$$$$ ; \ + else mv cflags.$$$$ cflags ; \ fi >/dev/null 2>/dev/null $(LIB): $(LIB_OBJ)