From ba702190306f2985a24b9c22a2be306c549f96e7 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 14 Mar 2002 13:07:32 +0000
Subject: Fix compilation on 1.4.2 (sync with patch-ab). Addresses pkg/15849.

---
 security/openssh/distinfo         |  4 ++--
 security/openssh/patches/patch-aa | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index c13ddb722fb..e6957af143f 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2002/03/07 17:37:35 david Exp $
+$NetBSD: distinfo,v 1.13 2002/03/14 13:07:32 wiz Exp $
 
 SHA1 (openssh-3.0.2p1.tar.gz) = c9a7e02936ace163ea58ec42e8e3f95df27fef2a
 Size (openssh-3.0.2p1.tar.gz) = 781092 bytes
-SHA1 (patch-aa) = 275e035cbed29ec3e72d7b3c9290cec8068d742b
+SHA1 (patch-aa) = dd6937ab8edf0c874365118ba223958bbb4fe871
 SHA1 (patch-ab) = 271811fc88fbed42f22fa1dc503dc88953b5d76f
 SHA1 (patch-ac) = e151977f95723c9bdc48dea5e313b89361b5b515
 SHA1 (patch-ah) = 0c75daaa11c6a6e32bce628b8f866008677f155f
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index c6247982231..13551d6fa04 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.19 2002/02/05 04:17:32 jlam Exp $
+$NetBSD: patch-aa,v 1.20 2002/03/14 13:07:33 wiz Exp $
 
---- configure.orig	Sat Dec  1 18:38:55 2001
+--- configure.orig	Sun Dec  2 00:38:55 2001
 +++ configure
 @@ -3587,8 +3587,6 @@
  	CFLAGS="$CFLAGS"
@@ -21,7 +21,16 @@ $NetBSD: patch-aa,v 1.19 2002/02/05 04:17:32 jlam Exp $
  # Allow user to specify flags
  
  # Check whether --with-cflags or --without-cflags was given.
-@@ -6289,17 +6290,20 @@
+@@ -6252,6 +6253,8 @@
+ #line 6252 "configure"
+ #include "confdefs.h"
+ 
++#include <sys/cdefs.h>
++#include <stdio.h>
+ #include <tcpd.h>
+ 					int deny_severity = 0, allow_severity = 0;
+ 
+@@ -6289,17 +6294,20 @@
  _ACEOF
  
  					TCPW_MSG="yes"
@@ -42,7 +51,7 @@ $NetBSD: patch-aa,v 1.19 2002/02/05 04:17:32 jlam Exp $
  		fi
  
  fi;
-@@ -15590,6 +15594,7 @@
+@@ -15590,6 +15598,7 @@
  s,@TEST_MINUS_S_SH@,$TEST_MINUS_S_SH,;t t
  s,@LOGIN_PROGRAM_FALLBACK@,$LOGIN_PROGRAM_FALLBACK,;t t
  s,@LD@,$LD,;t t
@@ -50,7 +59,7 @@ $NetBSD: patch-aa,v 1.19 2002/02/05 04:17:32 jlam Exp $
  s,@NO_SFTP@,$NO_SFTP,;t t
  s,@rsh_path@,$rsh_path,;t t
  s,@xauth_path@,$xauth_path,;t t
-@@ -16069,7 +16074,7 @@
+@@ -16069,7 +16078,7 @@
  echo "                 User binaries: $B"
  echo "               System binaries: $C"
  echo "           Configuration files: $D"
-- 
cgit v1.2.3