- updated to 2.3.0p1

Changed files:
    openssh-LIBS.patch -> 1.3
    openssh-libwrap.patch -> 1.12

diff --git a/openssh-LIBS.patch b/openssh-LIBS.patch
index af683f860987f7d2bdf96f36a007343c36f37810..36eaae2b63c74a9719eb6d03e7be0c2f8fe0ae4a 100644 (file)
--- a/openssh-LIBS.patch
+++ b/openssh-LIBS.patch
@@ -1,31 +1,31 @@
-diff -Naur openssh-2.1.1p1/Makefile.in openssh-2.1.1p1-p/Makefile.in
---- openssh-2.1.1p1/Makefile.in        Mon Jun 12 16:34:55 2000
-+++ openssh-2.1.1p1-p/Makefile.in      Mon Jun 12 16:36:51 2000
-@@ -70,22 +70,22 @@
+diff -ur openssh-2.3.0p1.orig/Makefile.in openssh-2.3.0p1/Makefile.in
+--- openssh-2.3.0p1.orig/Makefile.in   Tue Nov  7 16:14:09 2000
++++ openssh-2.3.0p1/Makefile.in        Tue Nov  7 16:16:29 2000
+@@ -71,22 +71,22 @@
        $(RANLIB) $@
  
- ssh: libopenbsd-compat.a libssh.a $(SSHOBJS)
+ ssh$(EXEEXT): libopenbsd-compat.a libssh.a $(SSHOBJS)
 -      $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 +      $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lz -lcrypto
  
- sshd: libssh.a        libopenbsd-compat.a $(SSHDOBJS)
+ sshd$(EXEEXT): libssh.a       libopenbsd-compat.a $(SSHDOBJS)
        $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP)
  
- scp: libopenbsd-compat.a libssh.a scp.o
+ scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o
 -      $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 +      $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat -lcrypto
  
- ssh-add: libopenbsd-compat.a libssh.a ssh-add.o log-client.o
+ ssh-add$(EXEEXT): libopenbsd-compat.a libssh.a ssh-add.o log-client.o
 -      $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 +      $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat -lcrypto
  
- ssh-agent: libopenbsd-compat.a libssh.a ssh-agent.o log-client.o
+ ssh-agent$(EXEEXT): libopenbsd-compat.a libssh.a ssh-agent.o log-client.o
 -      $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 +      $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat -lcrypto
  
- ssh-keygen: libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o
+ ssh-keygen$(EXEEXT): libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o
 -      $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 +      $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat -lcrypto
  
- # test driver for the loginrec code - not built by default
- logintest: logintest.o libopenbsd-compat.a libssh.a log-client.o loginrec.o
+ sftp-server$(EXEEXT): libopenbsd-compat.a libssh.a sftp-server.o log-server.o
+       $(LD) -o $@ sftp-server.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 

diff --git a/openssh-libwrap.patch b/openssh-libwrap.patch
index e9e8cf8fca35d47d651eae08aaf6236d8388e408..991f686a17b4853f70eb92d93652336084e8d10f 100644 (file)
--- a/openssh-libwrap.patch
+++ b/openssh-libwrap.patch
@@ -1,7 +1,7 @@
-diff -Nru openssh-2.1.1p2/Makefile.in openssh-2.1.1p2.new/Makefile.in
---- openssh-2.1.1p2/Makefile.in        Thu Jul  6 05:30:34 2000
-+++ openssh-2.1.1p2.new/Makefile.in    Thu Jul  6 05:29:57 2000
-@@ -23,6 +23,7 @@
+diff -ur openssh-2.3.0p1.orig/Makefile.in openssh-2.3.0p1/Makefile.in
+--- openssh-2.3.0p1.orig/Makefile.in   Sun Nov  5 22:13:45 2000
++++ openssh-2.3.0p1/Makefile.in        Tue Nov  7 16:13:15 2000
+@@ -22,6 +22,7 @@
  PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
  CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
  LIBS=@LIBS@
@@ -9,19 +9,19 @@ diff -Nru openssh-2.1.1p2/Makefile.in openssh-2.1.1p2.new/Makefile.in
  AR=@AR@
  RANLIB=@RANLIB@
  INSTALL=@INSTALL@
-@@ -72,7 +73,7 @@
+@@ -73,7 +74,7 @@
        $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  
- sshd: libssh.a        libopenbsd-compat.a $(SSHDOBJS)
+ sshd$(EXEEXT): libssh.a       libopenbsd-compat.a $(SSHDOBJS)
 -      $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 +      $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP)
  
- scp: libopenbsd-compat.a libssh.a scp.o
+ scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o
        $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
-diff -Nru openssh-2.1.1p2/configure.in openssh-2.1.1p2.new/configure.in
---- openssh-2.1.1p2/configure.in       Thu Jul  6 05:30:34 2000
-+++ openssh-2.1.1p2.new/configure.in   Thu Jul  6 05:31:54 2000
-@@ -929,8 +929,11 @@
+diff -ur openssh-2.3.0p1.orig/configure.in openssh-2.3.0p1/configure.in
+--- openssh-2.3.0p1.orig/configure.in  Tue Nov  7 16:11:05 2000
++++ openssh-2.3.0p1/configure.in       Tue Nov  7 16:12:28 2000
+@@ -1121,8 +1121,11 @@
        [  --with-tcp-wrappers     Enable tcpwrappers support],
        [
                if test "x$withval" != "xno" ; then
@@ -34,7 +34,7 @@ diff -Nru openssh-2.1.1p2/configure.in openssh-2.1.1p2.new/configure.in
                        AC_MSG_CHECKING(for libwrap)
                        AC_TRY_LINK(
                                [
-@@ -941,12 +944,14 @@
+@@ -1133,12 +1136,14 @@
                                [
                                        AC_MSG_RESULT(yes)
                                        AC_DEFINE(LIBWRAP)