summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-09-16 13:52:30 +0000
committergrant <grant@pkgsrc.org>2003-09-16 13:52:30 +0000
commitaaa76f9d3afbd97e60a68404713ca8b64f1ef221 (patch)
treedb9a1117fa076949bfdcbbb7375d4953ea65119f
parent8560a0862bdbe6f0f2ad8106ac8bd4a9d27f522f (diff)
downloadpkgsrc-aaa76f9d3afbd97e60a68404713ca8b64f1ef221.tar.gz
Update openssh to 3.7p1.
Large number of changes since 3.6.1p2, the most pertinent being: * do not expand buffer before attempting to reallocate it (buffer.c) note that NetBSD-current already includes this fix. other changes include: * portability fixes * regression test fixes * add GSSAPI support and remove kerberos support from ssh1, retaining kerberos passwd auth for ssh1 and 2 * man page fixes * general bug fixes see the ChangeLog for full details.
-rw-r--r--security/openssh/Makefile7
-rw-r--r--security/openssh/distinfo8
-rw-r--r--security/openssh/patches/patch-aa16
3 files changed, 15 insertions, 16 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index b45fcc76209..ff3124a7911 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2003/09/11 04:13:02 jlam Exp $
+# $NetBSD: Makefile,v 1.109 2003/09/16 13:52:30 grant Exp $
-DISTNAME= openssh-3.6.1p2
-PKGNAME= openssh-3.6.1.2
-PKGREVISION= 1
+DISTNAME= openssh-3.7p1
+PKGNAME= openssh-3.7.1
SVR4_PKGNAME= ossh
CATEGORIES= security
MASTER_SITES= ftp://ftp7.usa.openbsd.org/pub/os/OpenBSD/OpenSSH/portable/ \
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 229674464ba..ceb3e7069cb 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2003/06/10 21:00:45 jschauma Exp $
+$NetBSD: distinfo,v 1.26 2003/09/16 13:52:31 grant Exp $
-SHA1 (openssh-3.6.1p2.tar.gz) = dafe5b6ee2c8ced12c2ee8961530b4e51c2f0bcf
-Size (openssh-3.6.1p2.tar.gz) = 879629 bytes
-SHA1 (patch-aa) = 20abe6938aba07ab7b6c7eab5d24a303f0cd2298
+SHA1 (openssh-3.7p1.tar.gz) = f8dbe7059fff3213358817371c6c69ff12d91aa2
+Size (openssh-3.7p1.tar.gz) = 790563 bytes
+SHA1 (patch-aa) = 6d9fda6b4258a295cef814021b06fa7b3709f59e
SHA1 (patch-ab) = 1069fe256b7925fcf404781ef14e5c492f52c21e
SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 279229ebf29..b25a3d80b4b 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.28 2003/06/10 21:00:46 jschauma Exp $
+$NetBSD: patch-aa,v 1.29 2003/09/16 13:52:31 grant Exp $
---- configure.orig Tue Apr 29 02:37:28 2003
-+++ configure Tue Jun 10 13:38:01 2003
-@@ -4939,6 +4939,9 @@
+--- configure.orig 2003-09-16 16:19:17.000000000 +1000
++++ configure
+@@ -4583,6 +4583,9 @@ EOF
;;
esac
@@ -12,9 +12,9 @@ $NetBSD: patch-aa,v 1.28 2003/06/10 21:00:46 jschauma Exp $
# Allow user to specify flags
# Check whether --with-cflags or --without-cflags was given.
-@@ -7030,6 +7033,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
+@@ -6428,6 +6431,10 @@ echo $ECHO_N "checking for libwrap... $E
+ #line 6428 "configure"
+ #include "confdefs.h"
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.28 2003/06/10 21:00:46 jschauma Exp $
#include <tcpd.h>
int deny_severity = 0, allow_severity = 0;
-@@ -19123,7 +19130,7 @@
+@@ -16950,7 +16957,7 @@ echo "OpenSSH has been configured with t
echo " User binaries: $B"
echo " System binaries: $C"
echo " Configuration files: $D"