Update to 3.8p1:

This version features many improvements and bugfixes.

5 files changed, 27 insertions, 27 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 3fca1de4eac..8dc58554494 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.122 2004/02/21 06:26:41 xtraeme Exp $
+# $NetBSD: Makefile,v 1.123 2004/03/12 19:24:47 wiz Exp $
 
-DISTNAME=		openssh-3.7.1p2
-PKGNAME=		openssh-3.7.1.2
-PKGREVISION=		2
+DISTNAME=		openssh-3.8p1
+PKGNAME=		openssh-3.8.1
 SVR4_PKGNAME=		ossh
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 8ad9d94c697..7d9d38362f8 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.29 2003/09/23 17:52:34 jschauma Exp $
+$NetBSD: distinfo,v 1.30 2004/03/12 19:24:47 wiz Exp $
 
-SHA1 (openssh-3.7.1p2.tar.gz) = 9b7d026710a3017c448b0e531eb95be6b2081963
-Size (openssh-3.7.1p2.tar.gz) = 792280 bytes
-SHA1 (patch-aa) = 62918b930d51411b0067e77c43c830c35b07c457
-SHA1 (patch-ab) = 1069fe256b7925fcf404781ef14e5c492f52c21e
-SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506
+SHA1 (openssh-3.8p1.tar.gz) = b30c4ec4945f4e8b1691470495c15caf522fbc16
+Size (openssh-3.8p1.tar.gz) = 826588 bytes
+SHA1 (patch-aa) = bd1a2cb9baa415a3c0ec52646d22378985fe7967
+SHA1 (patch-ab) = 858157467277e224cfd8ecd94a8faaabf63851b1
+SHA1 (patch-ah) = 8f1fa190e4fb115bb5311b4ccd839a649e1b09e5
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 338d9f99448..2f2751d2c04 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.31 2003/10/18 13:20:32 cjep Exp $
---- configure.orig	Tue Sep 23 02:55:43 2003
-+++ configure	Tue Sep 23 13:27:33 2003
-@@ -4646,6 +4646,9 @@
+$NetBSD: patch-aa,v 1.32 2004/03/12 19:24:47 wiz Exp $
+
+--- configure.orig	Tue Feb 24 07:22:59 2004
++++ configure
+@@ -4803,6 +4803,9 @@ EOF
  	;;
  esac
  
@@ -11,8 +12,8 @@ $NetBSD: patch-aa,v 1.31 2003/10/18 13:20:32 cjep Exp $
  # Allow user to specify flags
  
  # Check whether --with-cflags or --without-cflags was given.
-@@ -6491,6 +6494,10 @@
- #line 6491 "configure"
+@@ -6809,6 +6812,10 @@ echo $ECHO_N "checking for libwrap... $E
+ #line 6809 "configure"
  #include "confdefs.h"
  
 +#ifdef HAVE_SYS_CDEFS_H
@@ -22,7 +23,7 @@ $NetBSD: patch-aa,v 1.31 2003/10/18 13:20:32 cjep Exp $
  #include <tcpd.h>
  					int deny_severity = 0, allow_severity = 0;
  
-@@ -17138,7 +17145,7 @@
+@@ -17983,7 +17990,7 @@ echo "OpenSSH has been configured with t
  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 cb659caa00f..52c42ba6e9d 100644
--- a/security/openssh/patches/patch-ab
+++ b/security/openssh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.14 2003/01/19 01:26:40 seb Exp $
+$NetBSD: patch-ab,v 1.15 2004/03/12 19:24:47 wiz Exp $
 
---- configure.ac.orig	Thu Sep 26 00:38:47 2002
+--- configure.ac.orig	Tue Feb 24 06:47:04 2004
 +++ configure.ac
-@@ -341,6 +341,9 @@ mips-sony-bsd|mips-sony-newsos4)
+@@ -438,6 +438,9 @@ mips-sony-bsd|mips-sony-newsos4)
  	;;
  esac
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.14 2003/01/19 01:26:40 seb Exp $
  # Allow user to specify flags
  AC_ARG_WITH(cflags,
  	[  --with-cflags           Specify additional flags to pass to compiler],
-@@ -575,6 +578,10 @@ AC_ARG_WITH(tcp-wrappers,
+@@ -767,6 +770,10 @@ AC_ARG_WITH(tcp-wrappers,
  			AC_MSG_CHECKING(for libwrap)
  			AC_TRY_LINK(
  				[
@@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.14 2003/01/19 01:26:40 seb Exp $
  #include <tcpd.h>
  					int deny_severity = 0, allow_severity = 0;
  				],
-@@ -2449,7 +2456,7 @@ echo "OpenSSH has been configured with t
+@@ -2793,7 +2800,7 @@ echo "OpenSSH has been configured with t
  echo "                     User binaries: $B"
  echo "                   System binaries: $C"
  echo "               Configuration files: $D"
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah
index 2f981f210bd..c252054daf6 100644
--- a/security/openssh/patches/patch-ah
+++ b/security/openssh/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.19 2002/06/25 02:13:13 itojun Exp $
+$NetBSD: patch-ah,v 1.20 2004/03/12 19:24:47 wiz Exp $
 
---- Makefile.in.orig	Fri Jun 21 10:38:53 2002
-+++ Makefile.in	Tue Jun 25 10:50:44 2002
-@@ -21,7 +21,7 @@
+--- Makefile.in.orig	Wed Feb 18 04:35:11 2004
++++ Makefile.in
+@@ -21,7 +21,7 @@ top_srcdir=@top_srcdir@
  DESTDIR=
  VPATH=@srcdir@
  SSH_PROGRAM=@bindir@/ssh
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.19 2002/06/25 02:13:13 itojun Exp $
  SFTP_SERVER=$(libexecdir)/sftp-server
  SSH_KEYSIGN=$(libexecdir)/ssh-keysign
  RAND_HELPER=$(libexecdir)/ssh-rand-helper
-@@ -203,7 +203,7 @@
+@@ -235,7 +235,7 @@ check-config:
  scard-install:
  	(cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)