- rediffed

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

diff --git a/tcp_wrappers-shared.patch b/tcp_wrappers-shared.patch
index 3d8a7dabdb75701137ad0db32eb8fc516448f6bf..fb98edea0d9479f871621b0091b9fe1e5f1bf0be 100644 (file)
--- a/tcp_wrappers-shared.patch
+++ b/tcp_wrappers-shared.patch
@@ -21,20 +21,17 @@ diff -urN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
  # System dependencies: TLI (transport-level interface) support.
  # 
  # Uncomment the following macro if your system has System V.4-style TLI
-@@ -670,9 +674,11 @@
+@@ -670,7 +674,9 @@
  # Protection against weird shells or weird make programs.
  
  SHELL = /bin/sh
 -.c.o:;        $(CC) $(CFLAGS) -c $*.c
-+.c.o:;        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $*.c
++.c.o:;        $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $*.c
 +
-+%.lo:;        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $*.c
++%.lo:;        $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $*.c
  
--CFLAGS        = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
-+CFLAGS        = -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
+ CFLAGS        = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
        $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
-       -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
-       -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
 @@ -679,12 +685,12 @@
        $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
        $(VSYSLOG) $(HOSTNAME)
@@ -68,35 +65,35 @@ diff -urN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
        rm -f $(LIB)
 -      $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ)
 -      -$(RANLIB) $(LIB)
-+      $(LIBTOOL) --mode=link $(CC) -o $(LDFLAGS) $(LIB) $(LIB_OBJ) -rpath $(LIBDIR)
++      $(LIBTOOL) --tag=CC --mode=link $(CC) -o $(LIB) $(LIB_OBJ) $(LDFLAGS) $(LIBS) -rpath $(LIBDIR)
  
  tcpd: tcpd.o $(LIB)
 -      $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
-+      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ tcpd.o $(LDFLAGS) $(LIB) $(LIBS)
++      $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ tcpd.o $(LDFLAGS) $(LIB) $(LIBS)
  
  miscd:        miscd.o $(LIB)
 -      $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
-+      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ miscd.o $(LDFLAGS) $(LIB) $(LIBS)
++      $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ miscd.o $(LDFLAGS) $(LIB) $(LIBS)
  
  safe_finger: safe_finger.o $(LIB)
 -      $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS)
-+      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ safe_finger.o $(LDFLAGS) $(LIB) $(LIBS)
++      $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ safe_finger.o $(LDFLAGS) $(LIB) $(LIBS)
  
  TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
  
  tcpdmatch: $(TCPDMATCH_OBJ) $(LIB)
 -      $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS)
-+      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LDFLAGS) $(LIB) $(LIBS)
++      $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LDFLAGS) $(LIB) $(LIBS)
  
  try-from: try-from.o fakelog.o $(LIB)
 -      $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS)
-+      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LDFLAGS) $(LIB) $(LIBS)
++      $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LDFLAGS) $(LIB) $(LIBS)
  
  TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o
  
  tcpdchk: $(TCPDCHK_OBJ) $(LIB)
 -      $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS)
-+      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LDFLAGS) $(LIB) $(LIBS)
++      $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LDFLAGS) $(LIB) $(LIBS)
  
  shar: $(KIT)
        @shar $(KIT)
@@ -111,7 +108,7 @@ diff -urN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
 +      $(LIBTOOL) --mode=finish $(LIBDIR)
 +      for PROG in safe_finger tcpdchk try-from tcpd tcpdmatch ; do \
 +              $(LIBTOOL) --mode=install install -c $$PROG $(PREFIX)/sbin/$$PROG ; done
-+      install tcpd.h $(PREFIX)/include/
++      install -p tcpd.h $(PREFIX)/include/
  
  # Enable all bells and whistles for linting.