From 486e6f68d81cd2d8d4ccb4e397ef640c5f9f3126 Mon Sep 17 00:00:00 2001
From: bouyer <bouyer@pkgsrc.org>
Date: Wed, 23 Oct 2002 21:12:36 +0000
Subject: Fix more bugs in the ip4-only section of the IPv6 patch.

---
 net/vncviewer/distinfo         |  4 ++--
 net/vncviewer/patches/patch-ab | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'net/vncviewer')

diff --git a/net/vncviewer/distinfo b/net/vncviewer/distinfo
index e41db20df9b..a642d53a849 100644
--- a/net/vncviewer/distinfo
+++ b/net/vncviewer/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/10/23 16:53:34 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2002/10/23 21:12:36 bouyer Exp $
 
 SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
 Size (vnc-3.3.3r2_unixsrc.tgz) = 2072772 bytes
 SHA1 (vnc-3.3.3r2-v6-20010421.diff.gz) = d2af7e0fb0074200f490f6463fb250901368875e
 Size (vnc-3.3.3r2-v6-20010421.diff.gz) = 6510 bytes
 SHA1 (patch-aa) = 1f2a6e6cb65c8b206e357fa974627c4f0b45f510
-SHA1 (patch-ab) = 366bad1410e7b49e7a742420033a47cc22b115fb
+SHA1 (patch-ab) = b387f2ee2e78ced366e312f90bb9bad809f9e3ba
diff --git a/net/vncviewer/patches/patch-ab b/net/vncviewer/patches/patch-ab
index 7cc6338d5db..08223a7bffa 100644
--- a/net/vncviewer/patches/patch-ab
+++ b/net/vncviewer/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2002/10/23 16:53:34 bouyer Exp $
+$NetBSD: patch-ab,v 1.2 2002/10/23 21:12:37 bouyer Exp $
 
---- vncviewer/sockets.c.orig	Wed Oct 23 18:48:55 2002
-+++ vncviewer/sockets.c	Wed Oct 23 18:50:54 2002
+--- vncviewer/sockets.c.orig	Wed Oct 23 20:17:57 2002
++++ vncviewer/sockets.c	Wed Oct 23 20:23:48 2002
 @@ -210,7 +210,11 @@
      return -1;
    }
@@ -14,9 +14,15 @@ $NetBSD: patch-ab,v 1.1 2002/10/23 16:53:34 bouyer Exp $
      fprintf(stderr,programName);
      perror(": ConnectToTcpAddr: connect");
      close(sock);
-@@ -374,18 +378,20 @@
+@@ -369,26 +373,27 @@
+ #else
+   /* just for IPv4 */
+   struct hostent *hp;
+-  struct sockaddr_in *sin;
++  struct sockaddr_in *sin  = (struct sockaddr_in *)sa;
+   struct in_addr *addr = &sin->sin_addr;
  
-   sin = (struct sockaddr_in *)sa;
+-  sin = (struct sockaddr_in *)sa;
    sin->sin_family = AF_INET;
 +#ifndef SVR4
    sin->sin_len = sizeof(struct sockaddr_in);
@@ -37,4 +43,8 @@ $NetBSD: patch-ab,v 1.1 2002/10/23 16:53:34 bouyer Exp $
 +    memcpy(addr, hp->h_addr, sizeof(struct in_addr));
    }
  
-   return False;
+-  return False;
++  return True;
+ #endif
+ }
+ 
-- 
cgit v1.2.3