diff -urk.orig tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile --- tcp_wrappers_7.6.orig/Makefile 2003-12-07 11:02:09 +0000 +++ tcp_wrappers_7.6/Makefile 2005-08-21 14:22:13 +0000 @@ -686,6 +686,10 @@ scaffold.h tcpdmatch.8 README.NIS LIB = libwrap.a +SHLIB = libwrap.so +SONAME = libwrap.so.0 +SOVER = libwrap.so.7.6 +MAP = libwrap.map all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk @@ -704,27 +708,33 @@ $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ) -$(RANLIB) $(LIB) -tcpd: tcpd.o $(LIB) - $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS) +$(SHLIB): $(LIB) + rm -f $(SHLIB) $(SONAME) $(SOVER) + gcc -shared -Wl,-soname,$(SONAME),--version-script=$(MAP) -o $(SOVER) -Wl,-whole-archive $(LIB) -Wl,-no-whole-archive $(LIBS) + ln -s $(SOVER) $(SONAME) + ln -s $(SOVER) $(SHLIB) -miscd: miscd.o $(LIB) - $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) +tcpd: tcpd.o $(SHLIB) + $(CC) $(CFLAGS) -o $@ tcpd.o -L. -lwrap -safe_finger: safe_finger.o $(LIB) - $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) +miscd: miscd.o $(SHLIB) + $(CC) $(CFLAGS) -o $@ miscd.o -L. -lwrap + +safe_finger: safe_finger.o + $(CC) $(CFLAGS) -o $@ safe_finger.o TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o -tcpdmatch: $(TCPDMATCH_OBJ) $(LIB) - $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS) +tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB) + $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) -L. -lwrap -try-from: try-from.o fakelog.o $(LIB) - $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS) +try-from: try-from.o fakelog.o $(SHLIB) + $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o -L. -lwrap TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o -tcpdchk: $(TCPDCHK_OBJ) $(LIB) - $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS) +tcpdchk: $(TCPDCHK_OBJ) $(SHLIB) + $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) -L. -lwrap shar: $(KIT) @shar $(KIT) diff -urk.orig tcp_wrappers_7.6.orig/libwrap.map tcp_wrappers_7.6/libwrap.map --- tcp_wrappers_7.6.orig/libwrap.map 1970-01-01 00:00:00 +0000 +++ tcp_wrappers_7.6/libwrap.map 2005-08-21 14:06:24 +0000 @@ -0,0 +1,44 @@ +{ + global: + allow_severity; + clean_exit; + deny_severity; + dot_quad_addr; + dry_run; + eval_client; + eval_hostaddr; + eval_hostinfo; + eval_hostname; + eval_server; + eval_user; + fix_options; + fromhost; + hosts_access; + hosts_access_verbose; + hosts_allow_table; + hosts_ctl; + hosts_deny_table; + paranoid; + percent_m; + percent_x; + process_options; + refuse; + request_init; + request_set; + resident; + rfc931; + rfc931_timeout; + shell_cmd; + sock_host; + sock_hostaddr; + sock_hostname; + split_at; + tcpd_buf; + tcpd_context; + tcpd_warn; + tli_host; + unknown; + xgets; + local: + *; +}; diff -urk.orig tcp_wrappers_7.6.orig/options.c tcp_wrappers_7.6/options.c --- tcp_wrappers_7.6.orig/options.c 2005-08-21 14:17:56 +0000 +++ tcp_wrappers_7.6/options.c 2005-08-21 14:19:46 +0000 @@ -59,6 +59,8 @@ #include "tcpd.h" +int allow_severity = LOG_INFO, deny_severity = LOG_WARNING; + /* Options runtime support. */ int dry_run = 0; /* flag set in verification mode */