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