openssh-libwrap.patch

   1 diff -Nru openssh-2.1.1p2/Makefile.in openssh-2.1.1p2.new/Makefile.in
   2 --- openssh-2.1.1p2/Makefile.in Thu Jul  6 05:30:34 2000
   3 +++ openssh-2.1.1p2.new/Makefile.in     Thu Jul  6 05:29:57 2000
   4 @@ -23,6 +23,7 @@
   5  PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
   6  CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
   7  LIBS=@LIBS@
   8 +LIBWRAP=@LIBWRAP@
   9  AR=@AR@
  10  RANLIB=@RANLIB@
  11  INSTALL=@INSTALL@
  12 @@ -72,7 +73,7 @@
  13         $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  14
  15  sshd: libssh.a libopenbsd-compat.a $(SSHDOBJS)
  16 -       $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  17 +       $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP)
  18
  19  scp: libopenbsd-compat.a libssh.a scp.o
  20         $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  21 diff -Nru openssh-2.1.1p2/configure.in openssh-2.1.1p2.new/configure.in
  22 --- openssh-2.1.1p2/configure.in        Thu Jul  6 05:30:34 2000
  23 +++ openssh-2.1.1p2.new/configure.in    Thu Jul  6 05:31:54 2000
  24 @@ -929,8 +929,11 @@
  25         [  --with-tcp-wrappers     Enable tcpwrappers support],
  26         [
  27                 if test "x$withval" != "xno" ; then
  28 +                       # we need to add -lwrap to LIBS only for configure
  29 +                       # testing, and then remove
  30                         saved_LIBS="$LIBS"
  31 -                       LIBS="$LIBS -lwrap"
  32 +                       LIBWRAP="-lwrap"
  33 +                       LIBS="$LIBS $LIBWRAP"
  34                         AC_MSG_CHECKING(for libwrap)
  35                         AC_TRY_LINK(
  36                                 [
  37 @@ -941,12 +944,14 @@
  38                                 [
  39                                         AC_MSG_RESULT(yes)
  40                                         AC_DEFINE(LIBWRAP)
  41 +                                       AC_SUBST(LIBWRAP)
  42                                         TCPW_MSG="yes"
  43                                 ],
  44                                 [
  45                                         AC_MSG_ERROR([*** libwrap missing])
  46                                 ]
  47                         )
  48 +                       LIBS="$saved_LIBS"
  49                 fi
  50         ]
  51  )