summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/openssh/Makefile6
-rw-r--r--security/openssh/files/md54
-rw-r--r--security/openssh/files/patch-sum4
-rw-r--r--security/openssh/patches/patch-ae18
4 files changed, 12 insertions, 20 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 2f0cff79a05..a49ffa8c393 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2000/08/31 13:08:37 fredb Exp $
+# $NetBSD: Makefile,v 1.25 2000/09/04 00:47:49 itojun Exp $
#
-DISTNAME= openssh-2.1.1p4
+DISTNAME= openssh-2.2.0p1
CATEGORIES= security
MASTER_SITES= http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files/ \
http://www.firedrake.org/openssh/files/ \
@@ -29,7 +29,7 @@ OPENSSL_VERSION!= awk '/.*OPENSSL_VERSION_NUMBER.*/ { print $$3 }' \
${OPENSSLV_H}
OPENSSL_VERSION_095a= 0x0090581fL
.if (${OPENSSL_VERSION} != ${OPENSSL_VERSION_095a})
-DEPENDS+= openssl>=0.9.5a:../../security/openssl
+DEPENDS+= openssl-0.9.5a:../../security/openssl
SSLBASE= ${LOCALBASE}
.else
SSLBASE= /usr
diff --git a/security/openssh/files/md5 b/security/openssh/files/md5
index 6999e123b9c..c44456a5d87 100644
--- a/security/openssh/files/md5
+++ b/security/openssh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 2000/07/22 08:22:02 jlam Exp $
+$NetBSD: md5,v 1.9 2000/09/04 00:47:50 itojun Exp $
-MD5 (openssh-2.1.1p4.tar.gz) = 9525a5a130470290b4adba1f58a7ca8b
+MD5 (openssh-2.2.0p1.tar.gz) = 8da6e2ad58be86e195cbdf82f7803feb
diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum
index e8eebb4bf4c..e9246a5d2f4 100644
--- a/security/openssh/files/patch-sum
+++ b/security/openssh/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.17 2000/08/11 05:37:09 jlam Exp $
+$NetBSD: patch-sum,v 1.18 2000/09/04 00:47:50 itojun Exp $
MD5 (patch-aa) = 62c8080b999943e9a5fffb32ef38ee74
-MD5 (patch-ae) = 62afcf06805bd3ae1337e4f9cf15fd93
+MD5 (patch-ae) = efdaabad2d0ac4c40c5b7d4cb833feaf
MD5 (patch-ah) = 4259ece36472f4c21a6344ce61e6b344
MD5 (patch-aj) = 5397d9fbfe54544fd186831cfe979329
MD5 (patch-an) = eccf8c19bcee913de49eb2b38999e609
diff --git a/security/openssh/patches/patch-ae b/security/openssh/patches/patch-ae
index b548b8809ec..9031cf082cc 100644
--- a/security/openssh/patches/patch-ae
+++ b/security/openssh/patches/patch-ae
@@ -1,20 +1,12 @@
-$NetBSD: patch-ae,v 1.4 2000/07/22 08:22:02 jlam Exp $
+$NetBSD: patch-ae,v 1.5 2000/09/04 00:47:50 itojun 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.
+--- ssh-add.1.orig Tue Aug 29 09:33:51 2000
++++ ssh-add.1 Mon Sep 4 09:39:21 2000
+@@ -68,2 +68,3 @@
.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
+@@ -93,2 +94,3 @@
to make this work.)
+.El
.Sh AUTHOR
- Tatu Ylonen <ylo@cs.hut.fi>
- .Pp