Fix USE_INET6 build:

	- revise patch-aq so it doesn't conflict with ipv6 patches.
	- adjust checksums
	- set up alternate patch-sum-v6 patchfile used when
	  v6 patches are added.

4 files changed, 34 insertions, 17 deletions

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index fd9449eb520..9f7bcf4202e 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 1999/09/03 22:00:53 tron Exp $
+# $NetBSD: Makefile,v 1.58 1999/09/06 05:30:19 sommerfeld Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -93,6 +93,7 @@ PATCH_SITES+=		ftp://ftp.kyoto.wide.ad.jp/IPv6/ssh/
 PATCHFILES+=		ssh-1.2.27-IPv6-1.5-patch.gz
 PATCH_DIST_STRIP+=	-p1
 PATCHDIR=		${WRKDIR}/.patches
+PATCH_SUM_FILE=		${FILESDIR}/patch-sum-v6
 .else
 MASTER_SITES+=		ftp://ftp.kyoto.wide.ad.jp/IPv6/ssh/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
diff --git a/security/ssh/files/patch-sum b/security/ssh/files/patch-sum
index 08afec890b4..5c034132e2b 100644
--- a/security/ssh/files/patch-sum
+++ b/security/ssh/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 1999/08/17 15:24:41 sommerfeld Exp $
+$NetBSD: patch-sum,v 1.5 1999/09/06 05:30:21 sommerfeld Exp $
 
 MD5 (patch-aa) = dca3a23f5066125131e34fba33baa4ae
 MD5 (patch-ab) = 712a7ffc9d2686153df92e32ce6b43bb
@@ -12,6 +12,6 @@ MD5 (patch-am) = fd4e766e57c58645714fdab8ed55da5d
 MD5 (patch-an) = 135b09a36c66aaf25a476dcb659efcf7
 MD5 (patch-ao) = 98e2eb418ee7f5ad544c32c7d5569ea2
 MD5 (patch-ap) = 99049fb6deb9bab8950723b7430a89a4
-MD5 (patch-aq) = b0a282a2efb91234aeddca67351f95a4
+MD5 (patch-aq) = 3ee230bc6e75ce01e9fa532b51061c43
 MD5 (patch-au) = aabad95304cea849e30389ad00e6d243
 MD5 (patch-av) = b3f9909bd6a5cc387e929d16f89884c0
diff --git a/security/ssh/files/patch-sum-v6 b/security/ssh/files/patch-sum-v6
new file mode 100644
index 00000000000..41c28e170eb
--- /dev/null
+++ b/security/ssh/files/patch-sum-v6
@@ -0,0 +1,19 @@
+$NetBSD: patch-sum-v6,v 1.1 1999/09/06 05:30:21 sommerfeld Exp $
+
+MD5 (patch-aa) = dca3a23f5066125131e34fba33baa4ae
+MD5 (patch-ab) = 712a7ffc9d2686153df92e32ce6b43bb
+MD5 (patch-ac) = 4b849ebd3f8b211dd2f888bcdb3f59f2
+MD5 (patch-ad) = 60483c735ff0e3c47e640002be0cee75
+MD5 (patch-ae) = e654824aa0394aa47d474011902411a9
+MD5 (patch-af) = 577e03bb92268c10b74ae3e60caf9147
+MD5 (patch-aj) = f6d02ebe8508202660d77c04b7aeeba2
+MD5 (patch-al) = 0cb4bff88a26d1a09e0669b5879b91f7
+MD5 (patch-am) = fd4e766e57c58645714fdab8ed55da5d
+MD5 (patch-an) = 135b09a36c66aaf25a476dcb659efcf7
+MD5 (patch-ao) = 98e2eb418ee7f5ad544c32c7d5569ea2
+MD5 (patch-ap) = 99049fb6deb9bab8950723b7430a89a4
+MD5 (patch-aq) = 3ee230bc6e75ce01e9fa532b51061c43
+MD5 (patch-au) = aabad95304cea849e30389ad00e6d243
+MD5 (patch-av) = b3f9909bd6a5cc387e929d16f89884c0
+MD5 (patch-ba) = fa984b71e26f7a9b32f9c1e38baaaa36
+MD5 (patch-bb) = bfcd6c515d2ab62c510bed6afceeedee
diff --git a/security/ssh/patches/patch-aq b/security/ssh/patches/patch-aq
index 0988e21039c..f2806791d04 100644
--- a/security/ssh/patches/patch-aq
+++ b/security/ssh/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.3 1999/08/17 15:24:42 sommerfeld Exp $
+$NetBSD: patch-aq,v 1.4 1999/09/06 05:30:21 sommerfeld Exp $
 
 --- newchannels.c.orig	Wed May 12 07:19:27 1999
-+++ newchannels.c	Tue Aug 17 10:49:25 1999
++++ newchannels.c	Mon Sep  6 01:09:00 1999
 @@ -274,7 +274,7 @@
  #include "authfd.h"
  #include "emulate.h"
@@ -42,23 +42,20 @@ $NetBSD: patch-aq,v 1.3 1999/08/17 15:24:42 sommerfeld Exp $
                {
                  struct request_info req;
                  struct servent *serv;
-@@ -1919,6 +1921,7 @@
-   struct sockaddr_in sin;
-   char buf[255], *cp, *remote_host;
-   struct hostent *hp;
-+  int on = 1;
- 
-   /* Get remote channel number. */
-   remote_channel = packet_get_int();
-@@ -2110,6 +2113,7 @@
+@@ -2110,7 +2112,11 @@
  
   success:
    /* We have successfully obtained a connection to the real X display. */
-+  setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
- 
+-
++  {
++    int on = 1;
++    setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
++  }
++  
  #if defined(O_NONBLOCK) && !defined(O_NONBLOCK_BROKEN)
        (void)fcntl(sock, F_SETFL, O_NONBLOCK);
-@@ -2412,6 +2416,10 @@
+ #else /* O_NONBLOCK && !O_NONBLOCK_BROKEN */
+@@ -2412,6 +2418,10 @@
       ssh-agent connections on your system */
    old_umask = umask(S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);