1 diff -urNp -x '*.orig' tcp_wrappers_7.6.org/Makefile tcp_wrappers_7.6/Makefile
2 --- tcp_wrappers_7.6.org/Makefile 2021-05-10 00:37:26.282798762 +0200
3 +++ tcp_wrappers_7.6/Makefile 2021-05-10 00:37:26.357798762 +0200
4 @@ -71,6 +71,7 @@ what:
7 #REAL_DAEMON_DIR=/etc/...
8 +REAL_DAEMON_DIR=/usr/sbin
10 # End of mandatory section
11 ##########################
12 @@ -150,8 +151,8 @@ netbsd:
15 @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
16 - LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
17 - NETGROUP= TLI= EXTRA_CFLAGS="-DHAVE_WEAKSYMS -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all
18 + LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
19 + EXTRA_CFLAGS="$(RPM_OPT_FLAGS) -DHAVE_STRERROR -DHAVE_WEAKSYMS -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all
22 @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
23 @@ -515,7 +516,7 @@ AR = ar
24 # Uncomment the next definition to turn on the language extensions
25 # (examples: allow, deny, banners, twist and spawn).
27 -#STYLE = -DPROCESS_OPTIONS # Enable language extensions.
28 +STYLE = -DPROCESS_OPTIONS # Enable language extensions.
30 ################################################################
31 # Optional: Changing the default disposition of logfile records
32 @@ -538,7 +539,7 @@ AR = ar
34 # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
36 -FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use
37 +FACILITY= LOG_AUTHPRIV
39 # The syslog priority at which successful connections are logged.
41 @@ -555,7 +556,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normall
42 # and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken
43 # from /etc/hosts or from NIS maps. It does work with DNS through NIS.
48 ##################################################
49 # Optional: Always attempt remote username lookups
50 @@ -575,7 +576,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normall
51 # still do selective username lookups as documented in the hosts_access.5
52 # and hosts_options.5 manual pages (`nroff -man' format).
54 -#AUTH = -DALWAYS_RFC931
55 +AUTH = -DALWAYS_RFC931
57 # The default username lookup timeout is 10 seconds. This may not be long
58 # enough for slow hosts or networks, but is enough to irritate PC users.
59 @@ -614,7 +615,7 @@ ACCESS = -DHOSTS_ACCESS
60 # look for access control information. Watch out for the quotes and
61 # backslashes when you make changes.
63 -TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
64 +TABLES = -DHOSTS_DENY=\"/etc/tcpd/hosts.deny\" -DHOSTS_ALLOW=\"/etc/tcpd/hosts.allow\"
66 ####################################################
67 # Optional: dealing with host name/address conflicts
68 @@ -634,7 +635,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\
69 # Paranoid mode implies hostname lookup. In order to disable hostname
70 # lookups altogether, see the next section.
73 +PARANOID= #-DPARANOID
75 ########################################
76 # Optional: turning off hostname lookups
77 @@ -647,7 +648,7 @@ PARANOID= -DPARANOID
78 # In order to perform selective hostname lookups, disable paranoid
79 # mode (see previous section) and comment out the following definition.
81 -HOSTNAME= -DALWAYS_HOSTNAME
82 +HOSTNAME= #-DALWAYS_HOSTNAME
84 #############################################
85 # Optional: Turning on host ADDRESS checking
86 @@ -673,7 +674,7 @@ HOSTNAME= -DALWAYS_HOSTNAME
87 # source-routed traffic in the kernel. Examples: 4.4BSD derivatives,
88 # Solaris 2.x, and Linux. See your system documentation for details.
90 -# KILL_OPT= -DKILL_IP_OPTIONS
91 +KILL_OPT= -DKILL_IP_OPTIONS
93 ## End configuration options
94 ############################
95 @@ -685,7 +686,7 @@ SHELL = /bin/sh
97 %.lo:; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $*.c
99 -CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
100 +CFLAGS = -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
101 $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
102 -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
103 -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \