Upgrade to OpenSSH-2.1.0

Changed files:
    openssh-libwrap.patch -> 1.4
    openssh.spec -> 1.26

diff --git a/openssh-libwrap.patch b/openssh-libwrap.patch
index 3363bad15c5fca1f1f8bf427389d88b481f0d02c..73c51cdd9b9e962796bad2c00669cb40f5515925 100644 (file)
--- a/openssh-libwrap.patch
+++ b/openssh-libwrap.patch
@@ -1,5 +1,6 @@
---- openssh-1.2.3/Makefile.in.orig     Thu Apr  6 19:31:03 2000
-+++ openssh-1.2.3/Makefile.in  Thu Apr  6 19:31:52 2000
+diff -bruN openssh-2.1.0/Makefile.in openssh-2.1.0.new/Makefile.in
+--- openssh-2.1.0/Makefile.in  Tue May  9 06:28:55 2000
++++ openssh-2.1.0.new/Makefile.in      Wed May 10 19:16:45 2000
 @@ -23,6 +23,7 @@
  PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
  CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
@@ -8,24 +9,26 @@
  AR=@AR@
  RANLIB=@RANLIB@
  INSTALL=@INSTALL@
-@@ -59,7 +60,7 @@
-       $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh $(LIBS)
+@@ -71,7 +72,7 @@
+       $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
  
- sshd: libssh.a        $(SSHDOBJS)
--      $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBS)
-+      $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh $(LIBWRAP) $(LIBS) 
+ sshd: libssh.a        libopenbsd-compat.a $(SSHDOBJS)
+-      $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
++      $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP)
  
- scp: libssh.a scp.o
-       $(LD) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS) 
---- openssh-1.2.3/configure.in.orig    Thu Apr  6 19:32:46 2000
-+++ openssh-1.2.3/configure.in Thu Apr  6 19:33:25 2000
-@@ -735,6 +735,9 @@
+ scp: libopenbsd-compat.a libssh.a scp.o
+       $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
+diff -bruN openssh-2.1.0/configure.in openssh-2.1.0.new/configure.in
+--- openssh-2.1.0/configure.in Mon May  8 12:49:37 2000
++++ openssh-2.1.0.new/configure.in     Wed May 10 19:18:23 2000
+@@ -757,7 +757,9 @@
+       [
+               if test "x$withval" != "xno" ; then
+                       saved_LIBS="$LIBS"
+-                      LIBS="$LIBS -lwrap"
++                      LIBWRAP="-lwrap"
++                      AC_SUBSCT(LIBWRAP)
++                      LIBS="$saved_LIBS"
+                       AC_MSG_CHECKING(for libwrap)
+                       AC_TRY_LINK(
                                [
-                                       AC_MSG_RESULT(yes)
-                                       AC_DEFINE(LIBWRAP)
-+                                      LIBWRAP="-lwrap"
-+                                      AC_SUBST(LIBWRAP)
-+                                      LIBS="$saved_LIBS"
-                               ],
-                               [
-                                       AC_MSG_RESULT(no)

diff --git a/openssh.spec b/openssh.spec
index 7511bf620b61267e6ece7fdeaf158713eeda6a61..ac67a6562503f714a792ac3d9bab9284e3ea7593 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,11 +1,11 @@
 Summary:       OpenSSH free Secure Shell (SSH) implementation
 Name:          openssh
-Version:       1.2.3
-Release:       3
+Version:       2.1.0
+Release:       1
 License:       BSD
 Group:         Applications/Networking
 Group(pl):     Aplikacje/Sieciowe
-Source0:       ftp://ftp.franken.de/pub/Linux/openssh/files/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.ca.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
 Source1:       opensshd.conf
 Source2:       openssh.conf
 Source3:       opensshd.init