Updated openssh to 3.1.1

* a lot of bug fixes

6 files changed, 30 insertions, 119 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index a3ce74a5b5e..9d261d45cee 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2002/03/12 06:23:07 itojun Exp $
+# $NetBSD: Makefile,v 1.65 2002/04/23 13:32:56 martti Exp $
 
-DISTNAME=		openssh-3.0.2p1
-PKGNAME=		openssh-3.0.2.1
+DISTNAME=		openssh-3.1p1
+PKGNAME=		openssh-3.1.1
 SVR4_PKGNAME=		ossh
-PKGREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		ftp://gd.tuwien.ac.at/OpenBSD/OpenSSH/portable/ \
 			ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 92ac41620fa..cf630e514e6 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.14 2002/04/02 11:20:11 seb Exp $
+$NetBSD: distinfo,v 1.15 2002/04/23 13:32:56 martti Exp $
 
-SHA1 (openssh-3.0.2p1.tar.gz) = c9a7e02936ace163ea58ec42e8e3f95df27fef2a
-Size (openssh-3.0.2p1.tar.gz) = 781092 bytes
-SHA1 (patch-aa) = 9fd81ee4fae0abc1d399bcc80da5b8c4e36750e1
-SHA1 (patch-ab) = 23c5dd2aa404d16892118f21b7a4d197418f8231
-SHA1 (patch-ac) = e151977f95723c9bdc48dea5e313b89361b5b515
-SHA1 (patch-ah) = 0c75daaa11c6a6e32bce628b8f866008677f155f
+SHA1 (openssh-3.1p1.tar.gz) = e9d5e66b6820df1293550cfe3349a76a5229fb32
+Size (openssh-3.1p1.tar.gz) = 803104 bytes
+SHA1 (patch-aa) = 55661dc26444845376f4245d3538d9ed633906e4
+SHA1 (patch-ab) = 328ebbb3b1f08f50d89e41f2237d57db268bfdd6
+SHA1 (patch-ah) = 98eb4b53cef20acb751dabb7a60be3902c33e604
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 21667217eb7..92cd113bb5b 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.21 2002/04/02 11:20:12 seb Exp $
+$NetBSD: patch-aa,v 1.22 2002/04/23 13:32:57 martti Exp $
 
---- configure.orig	Sun Dec  2 00:38:55 2001
-+++ configure
-@@ -3587,8 +3587,6 @@
+--- configure.orig	Thu Mar  7 02:22:29 2002
++++ configure	Mon Apr 22 20:17:03 2002
+@@ -3594,8 +3594,6 @@
  	CFLAGS="$CFLAGS"
  	;;
  *-*-solaris*)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.21 2002/04/02 11:20:12 seb Exp $
  	need_dash_r=1
  	cat >>confdefs.h <<\_ACEOF
  #define PAM_SUN_CODEBASE 1
-@@ -4051,6 +4049,9 @@
+@@ -4062,6 +4060,9 @@
  	;;
  esac
  
@@ -21,56 +21,18 @@ $NetBSD: patch-aa,v 1.21 2002/04/02 11:20:12 seb Exp $
  # Allow user to specify flags
  
  # Check whether --with-cflags or --without-cflags was given.
-@@ -6246,12 +6247,16 @@
- 				fi
- 			fi
- 			LIBS="-lwrap $LIBS"
--			echo "$as_me:6249: checking for libwrap" >&5
-+			echo "$as_me:6250: checking for libwrap" >&5
- echo $ECHO_N "checking for libwrap... $ECHO_C" >&6
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 6252 "configure"
-+#line 6253 "configure"
+@@ -5893,6 +5894,10 @@
+ #line 5893 "configure"
  #include "confdefs.h"
  
 +#ifdef HAVE_SYS_CDEFS_H
-+#include <sys/cdefs.h>
++#include <sys/cdefs.h> 
 +#endif
 +#include <stdio.h>
  #include <tcpd.h>
  					int deny_severity = 0, allow_severity = 0;
  
-@@ -6289,17 +6294,20 @@
- _ACEOF
- 
- 					TCPW_MSG="yes"
-+					TCPW_LIB="-lwrap"
- 
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--					{ { echo "$as_me:6297: error: *** libwrap missing" >&5
-+					TCPW_LIB=""
-+					{ { echo "$as_me:6304: error: *** libwrap missing" >&5
- echo "$as_me: error: *** libwrap missing" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+			LIBS="$saved_LIBS"
- 		fi
- 
- fi;
-@@ -15590,6 +15598,7 @@
- s,@TEST_MINUS_S_SH@,$TEST_MINUS_S_SH,;t t
- s,@LOGIN_PROGRAM_FALLBACK@,$LOGIN_PROGRAM_FALLBACK,;t t
- s,@LD@,$LD,;t t
-+s,@TCPW_LIB@,$TCPW_LIB,;t t
- s,@NO_SFTP@,$NO_SFTP,;t t
- s,@rsh_path@,$rsh_path,;t t
- s,@xauth_path@,$xauth_path,;t t
-@@ -16069,7 +16078,7 @@
+@@ -16007,7 +16012,7 @@
  echo "                 User binaries: $B"
  echo "               System binaries: $C"
  echo "           Configuration files: $D"
diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab
index d2d797543d2..74d06a4a22a 100644
--- a/security/openssh/patches/patch-ab
+++ b/security/openssh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2002/04/02 11:20:13 seb Exp $
+$NetBSD: patch-ab,v 1.9 2002/04/23 13:32:57 martti Exp $
 
---- configure.ac.orig	Sat Nov  3 20:09:33 2001
-+++ configure.ac
-@@ -150,8 +150,6 @@
+--- configure.ac.orig	Wed Feb 27 06:12:35 2002
++++ configure.ac	Mon Apr 22 20:04:45 2002
+@@ -152,8 +152,6 @@
  	CFLAGS="$CFLAGS"
  	;;
  *-*-solaris*)
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.8 2002/04/02 11:20:13 seb Exp $
  	need_dash_r=1
  	AC_DEFINE(PAM_SUN_CODEBASE)
  	AC_DEFINE(LOGIN_NEEDS_UTMPX)
-@@ -283,6 +281,9 @@
+@@ -286,6 +284,9 @@
  	;;
  esac
  
@@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.8 2002/04/02 11:20:13 seb Exp $
  # Allow user to specify flags
  AC_ARG_WITH(cflags,
  	[  --with-cflags           Specify additional flags to pass to compiler],
-@@ -550,6 +551,10 @@
+@@ -519,6 +520,10 @@
  			AC_MSG_CHECKING(for libwrap)
  			AC_TRY_LINK(
  				[
@@ -32,26 +32,7 @@ $NetBSD: patch-ab,v 1.8 2002/04/02 11:20:13 seb Exp $
  #include <tcpd.h>
  					int deny_severity = 0, allow_severity = 0;
  				],
-@@ -558,14 +563,18 @@
- 					AC_MSG_RESULT(yes)
- 					AC_DEFINE(LIBWRAP)
- 					TCPW_MSG="yes"
-+					TCPW_LIB="-lwrap"
- 				],
- 				[
-+					TCPW_LIB=""
- 					AC_MSG_ERROR([*** libwrap missing])
- 				]
- 			)
-+			LIBS="$saved_LIBS"
- 		fi
- 	]
- )
-+AC_SUBST(TCPW_LIB)
- 
- dnl    Checks for library functions.
- AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa \
-@@ -2194,7 +2203,7 @@
+@@ -2282,7 +2287,7 @@
  echo "                 User binaries: $B"
  echo "               System binaries: $C"
  echo "           Configuration files: $D"
diff --git a/security/openssh/patches/patch-ac b/security/openssh/patches/patch-ac
deleted file mode 100644
index f87effd2701..00000000000
--- a/security/openssh/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2002/03/07 16:45:36 tron Exp $
-
---- channels.c.orig	Fri Oct 12 03:35:05 2001
-+++ channels.c	Thu Mar  7 17:34:38 2002
-@@ -145,7 +145,7 @@
- {
- 	Channel *c;
- 
--	if (id < 0 || id > channels_alloc) {
-+	if (id < 0 || id >= channels_alloc) {
- 		log("channel_lookup: %d: bad id", id);
- 		return NULL;
- 	}
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah
index 9273ba39db9..2e624876ce6 100644
--- a/security/openssh/patches/patch-ah
+++ b/security/openssh/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.16 2002/02/05 04:17:32 jlam Exp $
+$NetBSD: patch-ah,v 1.17 2002/04/23 13:32:58 martti Exp $
 
---- Makefile.in.orig	Sun Nov 11 18:34:23 2001
-+++ Makefile.in
+--- Makefile.in.orig	Tue Feb 26 19:24:22 2002
++++ Makefile.in	Mon Apr 22 20:10:00 2002
 @@ -16,7 +16,7 @@
  DESTDIR=
  VPATH=@srcdir@
@@ -10,25 +10,8 @@ $NetBSD: patch-ah,v 1.16 2002/02/05 04:17:32 jlam Exp $
 +#ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
  SFTP_SERVER=$(libexecdir)/sftp-server
  
- PATHS= -DETCDIR=\"$(sysconfdir)\" \
-@@ -30,6 +30,7 @@
- CFLAGS=@CFLAGS@
- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
-+TCPW_LIB=@TCPW_LIB@
- 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 $(TCPW_LIB) $(LIBS)
- 
- scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o
- 	$(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-@@ -182,7 +183,7 @@
+ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
+@@ -189,7 +189,7 @@
  scard-install:
  	(cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)