[packages/tcp_wrappers.git] / tcp_wrappers-fix.patch

diff -urN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
--- tcp_wrappers_7.6.orig/Makefile	Mon Dec 13 13:58:15 1999
+++ tcp_wrappers_7.6/Makefile	Mon Dec 13 14:07:48 1999
@@ -71,6 +71,7 @@
 #
 # HP-UX SCO Unicos
 #REAL_DAEMON_DIR=/etc/...
+REAL_DAEMON_DIR=/usr/sbin
 
 # End of mandatory section
 ##########################
@@ -150,8 +151,8 @@
 
 linux:
 	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
-	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP= TLI= \
-	EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -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) -DSYS_ERRLIST_DEFINED -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) \
@@ -373,6 +374,9 @@
 	NETGROUP= TLI= all
 
 ###############################################################
+LIBTOOL = libtool
+PREFIX  = /usr/local
+###############################################################
 # System dependencies: TLI (transport-level interface) support.
 # 
 # Uncomment the following macro if your system has System V.4-style TLI
@@ -504,7 +508,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
@@ -527,7 +531,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_AUTHPRIV
 
 # The syslog priority at which successful connections are logged.
 
@@ -544,7 +548,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
@@ -564,7 +568,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.
@@ -603,7 +607,7 @@
 # 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
@@ -623,7 +627,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
@@ -636,7 +640,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
@@ -670,7 +674,9 @@
 # Protection against weird shells or weird make programs.
 
 SHELL	= /bin/sh
-.c.o:;	$(CC) $(CFLAGS) -c $*.c
+.c.o:;	$(LIBTOOL) $(CC) $(CFLAGS) -c $*.c
+
+%.lo:;	$(LIBTOOL) $(CC) $(CFLAGS) -c $*.c
 
 CFLAGS	= -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
 	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
@@ -679,12 +685,12 @@
 	$(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
 	$(VSYSLOG) $(HOSTNAME)
 
-LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \
-	hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \
-	$(FROM_OBJ) fix_options.o socket.o tli.o workarounds.o \
-	update.o misc.o diag.o percent_m.o myvsyslog.o
+LIB_OBJ= hosts_access.lo options.lo shell_cmd.lo rfc931.lo eval.lo \
+	hosts_ctl.lo refuse.lo percent_x.lo clean_exit.lo $(AUX_OBJ) \
+	$(FROM_OBJ) fix_options.lo socket.lo tli.lo workarounds.lo \
+	update.lo misc.lo diag.lo percent_m.lo myvsyslog.lo
 
-FROM_OBJ= fromhost.o
+FROM_OBJ= fromhost.lo
 
 KIT	= README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \
 	tcpd.h tcpdmatch.c Makefile hosts_access.5 strcasecmp.c BLURB rfc931.c \
@@ -697,7 +703,7 @@
 	refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \
 	scaffold.h tcpdmatch.8 README.NIS
 
-LIB	= libwrap.a
+LIB	= libwrap.la
 
 all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
 
@@ -713,30 +719,29 @@
 
 $(LIB):	$(LIB_OBJ)
 	rm -f $(LIB)
-	$(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ)
-	-$(RANLIB) $(LIB)
+	$(LIBTOOL) $(CC) -O -o $(LIB) $(LIB_OBJ) -rpath /usr/lib
 
 tcpd:	tcpd.o $(LIB)
-	$(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
 
 miscd:	miscd.o $(LIB)
-	$(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
 
 safe_finger: safe_finger.o $(LIB)
-	$(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS)
+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS)
 
 TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
 
 tcpdmatch: $(TCPDMATCH_OBJ) $(LIB)
-	$(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS)
+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS)
 
 try-from: try-from.o fakelog.o $(LIB)
-	$(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS)
+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS)
 
 TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o
 
 tcpdchk: $(TCPDCHK_OBJ) $(LIB)
-	$(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS)
+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS)
 
 shar:	$(KIT)
 	@shar $(KIT)
@@ -757,6 +762,13 @@
 tidy:	clean
 	chmod -R a+r .
 	chmod 755 .
+
+install:
+	-install -d $(PREFIX)/{sbin,include}
+	$(LIBTOOL) install -c $(LIB) $(PREFIX)/lib/$(LIB)
+	for PROG in safe_finger tcpdchk try-from tcpd tcpdmatch ; do \
+	$(LIBTOOL) install -c $$PROG $(PREFIX)/sbin/$$PROG ; done
+	install tcpd.h $(PREFIX)/include/
 
 # Enable all bells and whistles for linting.
Commit	Line	Data
f1ed6c4e AF	1	diff -urN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
	2	--- tcp_wrappers_7.6.orig/Makefile Mon Dec 13 13:58:15 1999
	3	+++ tcp_wrappers_7.6/Makefile Mon Dec 13 14:07:48 1999
	4	@@ -71,6 +71,7 @@
	5	#
	6	# HP-UX SCO Unicos
	7	#REAL_DAEMON_DIR=/etc/...
	8	+REAL_DAEMON_DIR=/usr/sbin
	9
	10	# End of mandatory section
	11	##########################
	12	@@ -150,8 +151,8 @@
	13
	14	linux:
	15	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
	16	- LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP= TLI= \
	17	- EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -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) -DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all
	20
	21	linux-old:
	22	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
	23	@@ -373,6 +374,9 @@
	24	NETGROUP= TLI= all
	25
	26	###############################################################
	27	+LIBTOOL = libtool
	28	+PREFIX = /usr/local
	29	+###############################################################
	30	# System dependencies: TLI (transport-level interface) support.
	31	#
	32	# Uncomment the following macro if your system has System V.4-style TLI
	33	@@ -504,7 +508,7 @@
	34	# Uncomment the next definition to turn on the language extensions
	35	# (examples: allow, deny, banners, twist and spawn).
	36	#
	37	-#STYLE = -DPROCESS_OPTIONS # Enable language extensions.
	38	+STYLE = -DPROCESS_OPTIONS # Enable language extensions.
	39
	40	################################################################
	41	# Optional: Changing the default disposition of logfile records
	42	@@ -527,7 +531,7 @@
	43	#
	44	# The LOG_XXX names below are taken from the /usr/include/syslog.h file.
	45
	46	-FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use
	47	+FACILITY= LOG_AUTHPRIV
	48
	49	# The syslog priority at which successful connections are logged.
	50
	51	@@ -544,7 +548,7 @@
	52	# and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken
	53	# from /etc/hosts or from NIS maps. It does work with DNS through NIS.
	54	#
	55	-# DOT= -DAPPEND_DOT
	56	+DOT= -DAPPEND_DOT
	57
	58	##################################################
	59	# Optional: Always attempt remote username lookups
	60	@@ -564,7 +568,7 @@
	61	# still do selective username lookups as documented in the hosts_access.5
	62	# and hosts_options.5 manual pages (`nroff -man' format).
	63	#
	64	-#AUTH = -DALWAYS_RFC931
65	+AUTH = -DALWAYS_RFC931
66	#
67	# The default username lookup timeout is 10 seconds. This may not be long
68	# enough for slow hosts or networks, but is enough to irritate PC users.
69	@@ -603,7 +607,7 @@
70	# look for access control information. Watch out for the quotes and
71	# backslashes when you make changes.
72
73	-TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
74	+TABLES = -DHOSTS_DENY=\"/etc/tcpd/hosts.deny\" -DHOSTS_ALLOW=\"/etc/tcpd/hosts.allow\"
75
76	####################################################
77	# Optional: dealing with host name/address conflicts
78	@@ -623,7 +627,7 @@
79	# Paranoid mode implies hostname lookup. In order to disable hostname
80	# lookups altogether, see the next section.
81
82	-PARANOID= -DPARANOID
83	+PARANOID= #-DPARANOID
84
85	########################################
86	# Optional: turning off hostname lookups
87	@@ -636,7 +640,7 @@
88	# In order to perform selective hostname lookups, disable paranoid
89	# mode (see previous section) and comment out the following definition.
90
91	-HOSTNAME= -DALWAYS_HOSTNAME
92	+HOSTNAME= #-DALWAYS_HOSTNAME
93
94	#############################################
95	# Optional: Turning on host ADDRESS checking
96	@@ -670,7 +674,9 @@
97	# Protection against weird shells or weird make programs.
98
99	SHELL = /bin/sh
100	-.c.o:; $(CC) $(CFLAGS) -c $*.c
101	+.c.o:; $(LIBTOOL) $(CC) $(CFLAGS) -c $*.c
102	+
103	+%.lo:; $(LIBTOOL) $(CC) $(CFLAGS) -c $*.c
104
105	CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
106	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
107	@@ -679,12 +685,12 @@
108	$(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
109	$(VSYSLOG) $(HOSTNAME)
110
111	-LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \
112	- hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \
113	- $(FROM_OBJ) fix_options.o socket.o tli.o workarounds.o \
114	- update.o misc.o diag.o percent_m.o myvsyslog.o
115	+LIB_OBJ= hosts_access.lo options.lo shell_cmd.lo rfc931.lo eval.lo \
116	+ hosts_ctl.lo refuse.lo percent_x.lo clean_exit.lo $(AUX_OBJ) \
117	+ $(FROM_OBJ) fix_options.lo socket.lo tli.lo workarounds.lo \
118	+ update.lo misc.lo diag.lo percent_m.lo myvsyslog.lo
119
120	-FROM_OBJ= fromhost.o
121	+FROM_OBJ= fromhost.lo
122
123	KIT = README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \
124	tcpd.h tcpdmatch.c Makefile hosts_access.5 strcasecmp.c BLURB rfc931.c \
125	@@ -697,7 +703,7 @@
126	refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \
127	scaffold.h tcpdmatch.8 README.NIS
128
129	-LIB = libwrap.a
130	+LIB = libwrap.la
131
132	all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
133
134	@@ -713,30 +719,29 @@
135
136	$(LIB): $(LIB_OBJ)
137	rm -f $(LIB)
138	- $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ)
139	- -$(RANLIB) $(LIB)
140	+ $(LIBTOOL) $(CC) -O -o $(LIB) $(LIB_OBJ) -rpath /usr/lib
141
142	tcpd: tcpd.o $(LIB)
143	- $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
144	+ $(LIBTOOL) $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
145
146	miscd: miscd.o $(LIB)
147	- $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
148	+ $(LIBTOOL) $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
149
150	safe_finger: safe_finger.o $(LIB)
151	- $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS)
152	+ $(LIBTOOL) $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS)
153
154	TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
155
156	tcpdmatch: $(TCPDMATCH_OBJ) $(LIB)
157	- $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS)
158	+ $(LIBTOOL) $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS)
159
160	try-from: try-from.o fakelog.o $(LIB)
161	- $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS)
162	+ $(LIBTOOL) $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS)
163
164	TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o
165
166	tcpdchk: $(TCPDCHK_OBJ) $(LIB)
167	- $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS)
168	+ $(LIBTOOL) $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS)
169
170	shar: $(KIT)
171	@shar $(KIT)
172	@@ -757,6 +762,13 @@
173	tidy: clean
174	chmod -R a+r .
175	chmod 755 .
176	+
177	+install:
178	+ -install -d $(PREFIX)/{sbin,include}
179	+ $(LIBTOOL) install -c $(LIB) $(PREFIX)/lib/$(LIB)
180	+ for PROG in safe_finger tcpdchk try-from tcpd tcpdmatch ; do \
181	+ $(LIBTOOL) install -c $$PROG $(PREFIX)/sbin/$$PROG ; done
182	+ install tcpd.h $(PREFIX)/include/
183
184	# Enable all bells and whistles for linting.
185