From ebb69c689e337d7085c8cf7b15bb06cccdf11b33 Mon Sep 17 00:00:00 2001
From: christos <christos>
Date: Mon, 17 Jan 2000 07:24:39 +0000
Subject: make this work under current too.

---
 security/openssh/files/patch-sum  |  4 ++--
 security/openssh/patches/patch-aa | 45 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 4 deletions(-)

(limited to 'security')

diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum
index 9ca8a246602..38c05d1aaf7 100644
--- a/security/openssh/files/patch-sum
+++ b/security/openssh/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 2000/01/17 05:34:33 christos Exp $
+$NetBSD: patch-sum,v 1.2 2000/01/17 07:24:39 christos Exp $
 
-MD5 (patch-aa) = 95183ca577840e5bb48b877e93ae25e4
+MD5 (patch-aa) = e6f1eb1a5fca7347b2f93ce7a5b2420a
 MD5 (patch-ab) = b1be98743ffb76d3e0401dda3a420f25
 MD5 (patch-ac) = 33cece26534692f25fca101e2a5f9340
 MD5 (patch-ad) = affe7f6d4df103015cb788cac15d2670
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
index 6bf7373fa57..bf231e633ca 100644
--- a/security/openssh/patches/patch-aa
+++ b/security/openssh/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2000/01/17 05:34:34 christos Exp $
+$NetBSD: patch-aa,v 1.2 2000/01/17 07:24:40 christos Exp $
 
 --- configure.orig	Sat Jan 15 20:22:59 2000
-+++ configure	Sun Jan 16 23:51:58 2000
++++ configure	Mon Jan 17 02:21:54 2000
+@@ -1293,7 +1293,7 @@
+ 
+ echo $ac_n "checking for OpenSSL/SSLeay directory""... $ac_c" 1>&6
+ echo "configure:1296: checking for OpenSSL/SSLeay directory" >&5
+-for ssldir in /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local $prefix /usr/pkg ; do
++for ssldir in $prefix /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg ; do
+ 	if test -f "$ssldir/include/openssl/crypto.h"; then
+ 		cat >> confdefs.h <<\EOF
+ #define HAVE_OPENSSL 1
 @@ -1321,7 +1321,7 @@
  
  if test "$ssldir" != "/usr"; then
@@ -11,3 +20,35 @@ $NetBSD: patch-aa,v 1.1 2000/01/17 05:34:34 christos Exp $
  fi
  echo "$ac_t""$ssldir" 1>&6
  
+@@ -2224,6 +2224,7 @@
+ cat > conftest.$ac_ext <<EOF
+ #line 2226 "configure"
+ #include "confdefs.h"
++#include <sys/types.h>
+ #include <sys/socket.h>
+ int main() {
+ struct sockaddr_storage s;
+@@ -2252,6 +2253,7 @@
+ cat > conftest.$ac_ext <<EOF
+ #line 2254 "configure"
+ #include "confdefs.h"
++#include <sys/types.h>
+ #include <netinet/in.h>
+ int main() {
+ struct sockaddr_in6 s; s.sin6_family = 0;
+@@ -2280,6 +2282,7 @@
+ cat > conftest.$ac_ext <<EOF
+ #line 2282 "configure"
+ #include "confdefs.h"
++#include <sys/types.h>
+ #include <netinet/in.h>
+ int main() {
+ struct in6_addr s; s.s6_addr[0] = 0;
+@@ -2309,6 +2312,7 @@
+ #line 2310 "configure"
+ #include "confdefs.h"
+ 
++		#include <sys/types.h>
+ 		#include <sys/socket.h>
+ 		#include <netdb.h>
+ 	
-- 
cgit v1.2.3