Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 3 | Index: tcp_wrappers_7.6/Makefile |
| 4 | =================================================================== |
| 5 | --- tcp_wrappers_7.6.orig/Makefile |
| 6 | +++ tcp_wrappers_7.6/Makefile |
| 7 | @@ -45,7 +45,7 @@ what: |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8 | # |
| 9 | # SysV.4 Solaris 2.x OSF AIX |
| 10 | #REAL_DAEMON_DIR=/usr/sbin |
| 11 | -# |
| 12 | +REAL_DAEMON_DIR=/usr/sbin |
| 13 | # BSD 4.4 |
| 14 | #REAL_DAEMON_DIR=/usr/libexec |
| 15 | # |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 16 | @@ -513,6 +513,7 @@ VSYSLOG = -Dvsyslog=myvsyslog |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 17 | # (examples: allow, deny, banners, twist and spawn). |
| 18 | # |
| 19 | #STYLE = -DPROCESS_OPTIONS # Enable language extensions. |
| 20 | +STYLE = -DPROCESS_OPTIONS |
| 21 | |
| 22 | ################################################################ |
| 23 | # Optional: Changing the default disposition of logfile records |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 24 | @@ -536,6 +537,7 @@ VSYSLOG = -Dvsyslog=myvsyslog |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 25 | # The LOG_XXX names below are taken from the /usr/include/syslog.h file. |
| 26 | |
| 27 | FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use |
| 28 | +FACILITY= LOG_DAEMON |
| 29 | |
| 30 | # The syslog priority at which successful connections are logged. |
| 31 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 32 | @@ -632,6 +634,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 33 | # lookups altogether, see the next section. |
| 34 | |
| 35 | PARANOID= -DPARANOID |
| 36 | +PARANOID= |
| 37 | |
| 38 | ######################################## |
| 39 | # Optional: turning off hostname lookups |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 40 | @@ -645,6 +648,7 @@ PARANOID= -DPARANOID |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 41 | # mode (see previous section) and comment out the following definition. |
| 42 | |
| 43 | HOSTNAME= -DALWAYS_HOSTNAME |
| 44 | +HOSTNAME= |
| 45 | |
| 46 | ############################################# |
| 47 | # Optional: Turning on host ADDRESS checking |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 48 | @@ -671,6 +675,7 @@ HOSTNAME= -DALWAYS_HOSTNAME |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 49 | # Solaris 2.x, and Linux. See your system documentation for details. |
| 50 | # |
| 51 | # KILL_OPT= -DKILL_IP_OPTIONS |
| 52 | +KILL_OPT= -DKILL_IP_OPTIONS |
| 53 | |
| 54 | ## End configuration options |
| 55 | ############################ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 56 | @@ -678,9 +683,10 @@ HOSTNAME= -DALWAYS_HOSTNAME |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 57 | # Protection against weird shells or weird make programs. |
| 58 | |
| 59 | SHELL = /bin/sh |
| 60 | -.c.o:; $(CC) $(CFLAGS) -c $*.c |
| 61 | +.c.o:; $(CC) $(CFLAGS) -o $*.o -c $*.c |
| 62 | |
| 63 | -CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ |
| 64 | +COPTS = -O2 -g |
| 65 | +CFLAGS = $(COPTS) -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ |
| 66 | $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ |
| 67 | -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ |
| 68 | -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 69 | @@ -713,11 +719,12 @@ all other: config-check tcpd tcpdmatch t |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 70 | |
| 71 | config-check: |
| 72 | @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; } |
| 73 | - @set +e; echo $(CFLAGS) >/tmp/cflags.$$$$ ; \ |
| 74 | - if cmp cflags /tmp/cflags.$$$$ ; \ |
| 75 | - then rm /tmp/cflags.$$$$ ; \ |
| 76 | - else mv /tmp/cflags.$$$$ cflags ; \ |
| 77 | + @set +e; echo $(CFLAGS) >cflags.new ; \ |
| 78 | + if cmp cflags cflags.new ; \ |
| 79 | + then rm cflags.new ; \ |
| 80 | + else mv cflags.new cflags ; \ |
| 81 | fi >/dev/null 2>/dev/null |
| 82 | + @if [ ! -d shared ]; then mkdir shared; fi |
| 83 | |
| 84 | $(LIB): $(LIB_OBJ) |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 85 | rm -f $(LIB) |