openssh-libwrap.patch

   1 diff -urN openssh-2.5.1p1.org/Makefile.in openssh-2.5.1p1/Makefile.in
   2 --- openssh-2.5.1p1.org/Makefile.in     Wed Feb 21 11:09:35 2001
   3 +++ openssh-2.5.1p1/Makefile.in Wed Feb 21 11:10:45 2001
   4 @@ -28,6 +28,7 @@
   5  CFLAGS=@CFLAGS@
   6  CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/openbsd-compat -I$(srcdir) $(PATHS) @DEFS@
   7  LIBS=@LIBS@
   8 +LIBWRAP=@LIBWRAP@
   9  AR=@AR@
  10  RANLIB=@RANLIB@
  11  INSTALL=@INSTALL@
  12 @@ -95,7 +96,7 @@
  13         $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  14
  15  sshd$(EXEEXT): libssh.a        $(LIBCOMPAT) $(SSHDOBJS)
  16 -       $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  17 +       $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP)
  18
  19  scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o log-client.o
  20         $(LD) -o $@ scp.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  21 diff -urN openssh-2.5.1p1.org/configure.in openssh-2.5.1p1/configure.in
  22 --- openssh-2.5.1p1.org/configure.in    Wed Feb 21 11:09:36 2001
  23 +++ openssh-2.5.1p1/configure.in        Wed Feb 21 11:12:07 2001
  24 @@ -459,7 +459,8 @@
  25         [
  26                 if test "x$withval" != "xno" ; then
  27                         saved_LIBS="$LIBS"
  28 -                       LIBS="-lwrap $LIBS"
  29 +                       LIBWRAP="-lwrap"
  30 +                       LIBS="$LIBS $LIBWRAP"
  31                         AC_MSG_CHECKING(for libwrap)
  32                         AC_TRY_LINK(
  33                                 [
  34 @@ -470,12 +471,14 @@
  35                                 [
  36                                         AC_MSG_RESULT(yes)
  37                                         AC_DEFINE(LIBWRAP)
  38 +                                       AC_SUBST(LIBWRAP)
  39                                         TCPW_MSG="yes"
  40                                 ],
  41                                 [
  42                                         AC_MSG_ERROR([*** libwrap missing])
  43                                 ]
  44                         )
  45 +                       LIBS="$saved_LIBS"
  46                 fi
  47         ]
  48  )