>Number:         10939
>Category:       pkg
>Synopsis:       update security/openssh to 2.2.0p1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 03 07:38:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Jun-ichiro itojun Hagino
>Release:        latest 1.5E
>Organization:
	itojun.org
>Environment:
System: NetBSD starfruit.itojun.org 1.5E NetBSD 1.5E (STARFRUIT) #109: Sun Sep 3 23:04:55 JST 2000 itojun@starfruit.itojun.org:/usr/home/itojun/NetBSD/src/sys/arch/i386/compile/STARFRUIT i386


>Description:
	the attached patch updates security/openssh to 2.2.0p1.
	(submitted as a PR due to pkgsrc freeze)
>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssh/Makefile,v
retrieving revision 1.24
diff -c -r1.24 Makefile
*** Makefile	2000/08/31 13:08:37	1.24
--- Makefile	2000/09/03 14:35:01
***************
*** 1,7 ****
  # $NetBSD: Makefile,v 1.24 2000/08/31 13:08:37 fredb Exp $
  #
  
! DISTNAME=		openssh-2.1.1p4
  CATEGORIES=		security
  MASTER_SITES=		http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files/ \
  			http://www.firedrake.org/openssh/files/ \
--- 1,7 ----
  # $NetBSD: Makefile,v 1.24 2000/08/31 13:08:37 fredb Exp $
  #
  
! DISTNAME=		openssh-2.2.0p1
  CATEGORIES=		security
  MASTER_SITES=		http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files/ \
  			http://www.firedrake.org/openssh/files/ \
Index: files/md5
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssh/files/md5,v
retrieving revision 1.8
diff -c -r1.8 md5
*** files/md5	2000/07/22 08:22:02	1.8
--- files/md5	2000/09/03 14:35:01
***************
*** 1,3 ****
! $NetBSD: md5,v 1.8 2000/07/22 08:22:02 jlam Exp $
  
! MD5 (openssh-2.1.1p4.tar.gz) = 9525a5a130470290b4adba1f58a7ca8b
--- 1,3 ----
! $NetBSD$
  
! MD5 (openssh-2.2.0p1.tar.gz) = 8da6e2ad58be86e195cbdf82f7803feb
Index: files/patch-sum
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssh/files/patch-sum,v
retrieving revision 1.17
diff -c -r1.17 patch-sum
*** files/patch-sum	2000/08/11 05:37:09	1.17
--- files/patch-sum	2000/09/03 14:35:01
***************
*** 1,7 ****
  $NetBSD: patch-sum,v 1.17 2000/08/11 05:37:09 jlam Exp $
  
  MD5 (patch-aa) = 62c8080b999943e9a5fffb32ef38ee74
! MD5 (patch-ae) = 62afcf06805bd3ae1337e4f9cf15fd93
  MD5 (patch-ah) = 4259ece36472f4c21a6344ce61e6b344
  MD5 (patch-aj) = 5397d9fbfe54544fd186831cfe979329
  MD5 (patch-an) = eccf8c19bcee913de49eb2b38999e609
--- 1,7 ----
  $NetBSD: patch-sum,v 1.17 2000/08/11 05:37:09 jlam Exp $
  
  MD5 (patch-aa) = 62c8080b999943e9a5fffb32ef38ee74
! MD5 (patch-ae) = 28ce6ff1172d621287cd1015bd473d61
  MD5 (patch-ah) = 4259ece36472f4c21a6344ce61e6b344
  MD5 (patch-aj) = 5397d9fbfe54544fd186831cfe979329
  MD5 (patch-an) = eccf8c19bcee913de49eb2b38999e609
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssh/patches/patch-ae,v
retrieving revision 1.4
diff -c -r1.4 patch-ae
*** patches/patch-ae	2000/07/22 08:22:02	1.4
--- patches/patch-ae	2000/09/03 14:35:01
***************
*** 1,20 ****
! $NetBSD: patch-ae,v 1.4 2000/07/22 08:22:02 jlam Exp $
  
! --- ssh-add.1.orig	Sat May  6 22:03:18 2000
! +++ ssh-add.1	Fri Jul 21 01:24:49 2000
! @@ -64,6 +64,7 @@
!  .Nm
!  when no other files have been specified.
   .Pp
  +.El
   .Sh ENVIRONMENT
-  .Bl -tag -width Ds
-  .It Ev "DISPLAY" and "SSH_ASKPASS"
- @@ -89,6 +90,7 @@
-  may be necessary to redirect the input from
-  .Pa /dev/null
-  to make this work.)
- +.El
-  .Sh AUTHOR
-  Tatu Ylonen <ylo@cs.hut.fi>
-  .Pp
--- 1,8 ----
! $NetBSD$
  
! --- ssh-add.1.orig	Sun Sep  3 23:30:28 2000
! +++ ssh-add.1	Sun Sep  3 23:31:18 2000
! @@ -68,2 +68,3 @@
   .Pp
  +.El
   .Sh ENVIRONMENT
>Release-Note:
>Audit-Trail:
>Unformatted: