openssh-libwrap.patch

   1 diff -bruN openssh-2.1.0/Makefile.in openssh-2.1.0.new/Makefile.in
   2 --- openssh-2.1.0/Makefile.in   Tue May  9 06:28:55 2000
   3 +++ openssh-2.1.0.new/Makefile.in       Wed May 10 19:16:45 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 @@ -71,7 +72,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 -bruN openssh-2.1.0/configure.in openssh-2.1.0.new/configure.in
  22 --- openssh-2.1.0/configure.in  Mon May  8 12:49:37 2000
  23 +++ openssh-2.1.0.new/configure.in      Wed May 10 20:44:06 2000
  24 @@ -756,8 +756,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 @@ -768,6 +771,7 @@
  38                                 [
  39                                         AC_MSG_RESULT(yes)
  40                                         AC_DEFINE(LIBWRAP)
  41 +                                       AC_SUBST(LIBWRAP)
  42                                 ],
  43                                 [
  44                                         AC_MSG_RESULT(no)
  45 @@ -775,6 +779,7 @@
  46                                         LIBS="$saved_LIBS"
  47                                 ]
  48                         )
  49 +                       LIBS="$saved_LIBS"
  50                 fi
  51         ]
  52  )