upgrade to 2.9.9p2. a security hole was plugged

(ssh protocol v2 access control).

5 files changed, 48 insertions, 48 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index d855868b767..167ef365aa3 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2001/08/17 19:49:08 kim Exp $
+# $NetBSD: Makefile,v 1.55 2001/09/27 05:12:54 itojun Exp $
 
-DISTNAME=		openssh-2.9p2
+DISTNAME=		openssh-2.9.9p2
 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 19b36989938..30c924cdefb 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2001/08/17 19:49:08 kim Exp $
+$NetBSD: distinfo,v 1.7 2001/09/27 05:12:54 itojun Exp $
 
-SHA1 (openssh-2.9p2.tar.gz) = add432005b43f71ccf964bb77b37291273dd4ceb
-Size (openssh-2.9p2.tar.gz) = 662590 bytes
-SHA1 (patch-aa) = 0a3322cbb38c666266a7d44fc8188546b7818926
-SHA1 (patch-ab) = 92eee280f610967ddd56c0f31cd2bf2960f898b4
-SHA1 (patch-ah) = 58a9bbc7c35e7d043c26288affe6fb1a88d9db2e
+SHA1 (openssh-2.9.9p2.tar.gz) = 4b2949dcf87bb484a2dcb6eb03312f97561f819c
+Size (openssh-2.9.9p2.tar.gz) = 697371 bytes
+SHA1 (patch-aa) = 99e51831871fc9f7fc3799c0092e44b0326da9df
+SHA1 (patch-ab) = 15196cd4448f189342dc4c0fa618005832c94cfc
+SHA1 (patch-ah) = 7adbe390d4397b284061a213f08a9c7933fcd954
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index a07a3ab7b46..e12466e114a 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2001/08/17 19:49:09 kim Exp $
+$NetBSD: patch-aa,v 1.17 2001/09/27 05:12:54 itojun Exp $
 
---- configure.orig	Sun Jun 17 07:09:50 2001
-+++ configure	Fri Aug 17 22:06:47 2001
-@@ -1796,7 +1796,7 @@
+--- configure.orig	Wed Sep 26 07:50:31 2001
++++ configure	Thu Sep 27 13:50:35 2001
+@@ -1811,7 +1811,7 @@
  
  	;;
  *-*-netbsd*)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.16 2001/08/17 19:49:09 kim Exp $
  	;;
  *-*-freebsd*)
  	check_for_libcrypt_later=1
-@@ -1828,7 +1828,7 @@
+@@ -1843,7 +1843,7 @@
  *-*-solaris*)
  	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" 
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.16 2001/08/17 19:49:09 kim Exp $
  	cat >> confdefs.h <<\EOF
  #define PAM_SUN_CODEBASE 1
  EOF
-@@ -3160,6 +3160,7 @@
+@@ -3208,6 +3208,7 @@
  
  # Check whether user wants TCP wrappers support
  TCPW_MSG="no" 
@@ -28,8 +28,8 @@ $NetBSD: patch-aa,v 1.16 2001/08/17 19:49:09 kim Exp $
  # Check whether --with-tcp-wrappers or --without-tcp-wrappers was given.
  if test "${with_tcp_wrappers+set}" = set; then
    withval="$with_tcp_wrappers"
-@@ -3173,6 +3174,8 @@
- #line 3174 "configure"
+@@ -3221,6 +3222,8 @@
+ #line 3222 "configure"
  #include "confdefs.h"
  
 +#include <sys/cdefs.h>
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.16 2001/08/17 19:49:09 kim Exp $
  #include <tcpd.h>
  					int deny_severity = 0, allow_severity = 0;
  				
-@@ -3189,6 +3192,7 @@
+@@ -3237,6 +3240,7 @@
  EOF
  
  					TCPW_MSG="yes" 
@@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.16 2001/08/17 19:49:09 kim Exp $
  				
  else
    echo "configure: failed program was:" >&5
-@@ -3200,6 +3204,7 @@
+@@ -3248,6 +3252,7 @@
  			
  fi
  rm -f conftest*
@@ -53,7 +53,7 @@ $NetBSD: patch-aa,v 1.16 2001/08/17 19:49:09 kim Exp $
  		fi
  	
  
-@@ -8881,6 +8886,7 @@
+@@ -9370,6 +9375,7 @@
  s%@TEST_MINUS_S_SH@%$TEST_MINUS_S_SH%g
  s%@LOGIN_PROGRAM_FALLBACK@%$LOGIN_PROGRAM_FALLBACK%g
  s%@LD@%$LD%g
diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab
index bf16a6f0002..29c017e92cd 100644
--- a/security/openssh/patches/patch-ab
+++ b/security/openssh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2001/08/17 19:49:10 kim Exp $
+$NetBSD: patch-ab,v 1.5 2001/09/27 05:12:55 itojun Exp $
 
---- configure.in.orig	Mon May 28 20:21:44 2001
-+++ configure.in	Fri Aug 17 22:06:34 2001
-@@ -131,7 +131,7 @@
+--- configure.in.orig	Wed Sep 26 07:39:38 2001
++++ configure.in	Thu Sep 27 13:51:32 2001
+@@ -138,7 +138,7 @@
          )
  	;;
  *-*-netbsd*)
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/17 19:49:10 kim Exp $
  	;;
  *-*-freebsd*)
  	check_for_libcrypt_later=1
-@@ -151,7 +151,7 @@
+@@ -158,7 +158,7 @@
  *-*-solaris*)
  	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" 
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/17 19:49:10 kim Exp $
  	AC_DEFINE(PAM_SUN_CODEBASE)
  	AC_DEFINE(LOGIN_NEEDS_UTMPX)
  	AC_DEFINE(LOGIN_NEEDS_TERM)
-@@ -432,6 +432,7 @@
+@@ -454,6 +454,7 @@
  
  # Check whether user wants TCP wrappers support
  TCPW_MSG="no" 
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/17 19:49:10 kim Exp $
  AC_ARG_WITH(tcp-wrappers,
  	[  --with-tcp-wrappers     Enable tcpwrappers support],
  	[
-@@ -441,6 +442,8 @@
+@@ -463,6 +464,8 @@
  			AC_MSG_CHECKING(for libwrap)
  			AC_TRY_LINK(
  				[
@@ -37,7 +37,7 @@ $NetBSD: patch-ab,v 1.4 2001/08/17 19:49:10 kim Exp $
  #include <tcpd.h>
  					int deny_severity = 0, allow_severity = 0;
  				],
-@@ -449,14 +452,17 @@
+@@ -471,14 +474,17 @@
  					AC_MSG_RESULT(yes)
  					AC_DEFINE(LIBWRAP)
  					TCPW_MSG="yes" 
@@ -54,4 +54,4 @@ $NetBSD: patch-ab,v 1.4 2001/08/17 19:49:10 kim Exp $
 +AC_SUBST(TCPW_LIB)
  
  dnl    Checks for library functions.
- AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell glob inet_aton inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop)
+ AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getopt getnameinfo getrlimit getrusage getttyent glob inet_aton inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty readpassphrase realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes vsnprintf vhangup waitpid _getpty __b64_ntop)
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah
index eed283fb1b6..9e154c818e3 100644
--- a/security/openssh/patches/patch-ah
+++ b/security/openssh/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.13 2001/08/17 19:49:10 kim Exp $
+$NetBSD: patch-ah,v 1.14 2001/09/27 05:12:55 itojun Exp $
 
---- Makefile.in.orig	Fri Apr 27 03:31:08 2001
-+++ Makefile.in	Fri Aug 17 21:43:33 2001
-@@ -8,6 +8,7 @@
+--- Makefile.in.orig	Tue Sep 18 14:06:22 2001
++++ Makefile.in	Thu Sep 27 13:59:36 2001
+@@ -9,6 +9,7 @@
  mandir=@mandir@
  mansubdir=@mansubdir@
  sysconfdir=@sysconfdir@
@@ -10,7 +10,7 @@ $NetBSD: patch-ah,v 1.13 2001/08/17 19:49:10 kim Exp $
  piddir=@piddir@
  srcdir=@srcdir@
  top_srcdir=@top_srcdir@
-@@ -15,7 +16,7 @@
+@@ -16,7 +17,7 @@
  DESTDIR=
  VPATH=@srcdir@
  SSH_PROGRAM=@bindir@/ssh
@@ -19,7 +19,7 @@ $NetBSD: patch-ah,v 1.13 2001/08/17 19:49:10 kim Exp $
  SFTP_SERVER=$(libexecdir)/sftp-server
  
  PATHS= -DETCDIR=\"$(sysconfdir)\" \
-@@ -29,6 +30,7 @@
+@@ -30,6 +31,7 @@
  CFLAGS=@CFLAGS@
  CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
  LIBS=@LIBS@
@@ -27,25 +27,25 @@ $NetBSD: patch-ah,v 1.13 2001/08/17 19:49:10 kim Exp $
  AR=@AR@
  RANLIB=@RANLIB@
  INSTALL=@INSTALL@
-@@ -96,7 +98,7 @@
+@@ -97,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 $(WRAP) $(LIBS)
  
- scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o scp-common.o
- 	$(LD) -o $@ scp.o scp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-@@ -164,7 +166,7 @@
- distprep: catman-do
+ scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o
+ 	$(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
+@@ -173,7 +175,7 @@
  	autoreconf
+ 	(cd scard ; $(MAKE) -f Makefile.in distprep)
  
--install: $(TARGETS) install-files host-key
-+install: $(TARGETS) install-files
+-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
++install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
+ install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
  
- install-files:
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-@@ -173,6 +175,7 @@
+ scard-install:
+@@ -187,6 +189,7 @@
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
  	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
@@ -53,7 +53,7 @@ $NetBSD: patch-ah,v 1.13 2001/08/17 19:49:10 kim Exp $
  	$(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh
  	$(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
  	$(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
-@@ -199,23 +202,11 @@
+@@ -213,23 +216,11 @@
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  		$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
  	fi
@@ -78,9 +78,9 @@ $NetBSD: patch-ah,v 1.13 2001/08/17 19:49:10 kim Exp $
 -		fi ; \
 +		$(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(examplesdir)/ssh_prng_cmds; \
  	fi
- 	if [ ! -f $(DESTDIR)$(sysconfdir)/primes ]; then \
- 		$(INSTALL) -m 644 primes.out $(DESTDIR)$(sysconfdir)/primes; \
-@@ -248,10 +239,10 @@
+ 	if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
+ 		if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
+@@ -267,10 +258,10 @@
  	./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
  
  uninstallall:	uninstall