diff -urNp -x '*.orig' tcp_wrappers_7.6.org/Makefile tcp_wrappers_7.6/Makefile --- tcp_wrappers_7.6.org/Makefile 2021-05-10 00:37:26.282798762 +0200 +++ tcp_wrappers_7.6/Makefile 2021-05-10 00:37:26.357798762 +0200 @@ -71,6 +71,7 @@ what: # # HP-UX SCO Unicos #REAL_DAEMON_DIR=/etc/... +REAL_DAEMON_DIR=/usr/sbin # End of mandatory section ########################## @@ -150,8 +151,8 @@ netbsd: linux: @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ - LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \ - NETGROUP= TLI= EXTRA_CFLAGS="-DHAVE_WEAKSYMS -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all + LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \ + EXTRA_CFLAGS="$(RPM_OPT_FLAGS) -DHAVE_STRERROR -DHAVE_WEAKSYMS -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all linux-old: @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ @@ -515,7 +516,7 @@ AR = ar # 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 @@ -538,7 +539,7 @@ AR = ar # # 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_AUTHPRIV # The syslog priority at which successful connections are logged. @@ -555,7 +556,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normall # 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 @@ -575,7 +576,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normall # 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. @@ -614,7 +615,7 @@ ACCESS = -DHOSTS_ACCESS # look for access control information. Watch out for the quotes and # backslashes when you make changes. -TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" +TABLES = -DHOSTS_DENY=\"/etc/tcpd/hosts.deny\" -DHOSTS_ALLOW=\"/etc/tcpd/hosts.allow\" #################################################### # Optional: dealing with host name/address conflicts @@ -634,7 +635,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\ # 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 @@ -647,7 +648,7 @@ PARANOID= -DPARANOID # 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 @@ -673,7 +674,7 @@ HOSTNAME= -DALWAYS_HOSTNAME # 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 ############################ @@ -685,7 +686,7 @@ SHELL = /bin/sh %.lo:; $(LIBTOOL) --tag=CC --mode=compile $(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) \