- obsolete (merged into source)

Changed files:
    openssh-libwrap.patch -> 1.15

diff --git a/openssh-libwrap.patch b/openssh-libwrap.patch
deleted file mode 100644 (file)
index 058387a..0000000
--- a/openssh-libwrap.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -urN openssh-3.0p1.orig/Makefile.in openssh-3.0p1/Makefile.in
---- openssh-3.0p1.orig/Makefile.in     Mon Oct 22 02:53:59 2001
-+++ openssh-3.0p1/Makefile.in  Wed Nov  7 15:47:33 2001
-@@ -30,6 +30,7 @@
- CFLAGS=@CFLAGS@
- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
-+LIBWRAP=@LIBWRAP@
- AR=@AR@
- RANLIB=@RANLIB@
- INSTALL=@INSTALL@
-@@ -98,7 +99,7 @@
-       $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
- 
- sshd$(EXEEXT): libssh.a       $(LIBCOMPAT) $(SSHDOBJS)
--      $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-+      $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP)
- 
- scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o
-       $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-diff -urN openssh-3.0p1.orig/configure.ac openssh-3.0p1/configure.ac
---- openssh-3.0p1.orig/configure.ac    Sat Nov  3 20:09:33 2001
-+++ openssh-3.0p1/configure.ac Wed Nov  7 15:48:55 2001
-@@ -546,7 +546,9 @@
-                                       CPPFLAGS="-I${withval} ${CPPFLAGS}"
-                               fi
-                       fi
--                      LIBS="-lwrap $LIBS"
-+                      LIBWRAP="-lwrap"
-+                      LIBS="$LIBS $LIBWRAP"
-+ 
-                       AC_MSG_CHECKING(for libwrap)
-                       AC_TRY_LINK(
-                               [
-@@ -557,12 +559,14 @@
-                               [
-                                       AC_MSG_RESULT(yes)
-                                       AC_DEFINE(LIBWRAP)
-+                                      AC_SUBST(LIBWRAP)
-                                       TCPW_MSG="yes"
-                               ],
-                               [
-                                       AC_MSG_ERROR([*** libwrap missing])
-                               ]
-                       )
-+                      LIBS="$saved_LIBS"
-               fi
-       ]
- )