[pkgsrc/trunk]: pkgsrc/net/libvncserver Don't segfault when using PKG_OPTIONS...

[prlw1 <prlw1%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28b5bd79048d
branches:  trunk
changeset: 627891:28b5bd79048d
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Tue Dec 17 16:27:18 2013 +0000

description:
Don't segfault when using PKG_OPTIONS.libVNCServer=-inet6

diffstat:

 net/libvncserver/Makefile                             |   4 ++--
 net/libvncserver/distinfo                             |   3 ++-
 net/libvncserver/patches/patch-libvncserver_sockets.c |  19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 70d05432adf5 -r 28b5bd79048d net/libvncserver/Makefile
--- a/net/libvncserver/Makefile Tue Dec 17 15:05:23 2013 +0000
+++ b/net/libvncserver/Makefile Tue Dec 17 16:27:18 2013 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2013/01/26 21:36:41 adam Exp $
+# $NetBSD: Makefile,v 1.19 2013/12/17 16:27:18 prlw1 Exp $
 #
 
 DISTNAME=              LibVNCServer-0.9.9
 PKGNAME=               libVNCServer-0.9.9
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
 
diff -r 70d05432adf5 -r 28b5bd79048d net/libvncserver/distinfo
--- a/net/libvncserver/distinfo Tue Dec 17 15:05:23 2013 +0000
+++ b/net/libvncserver/distinfo Tue Dec 17 16:27:18 2013 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2013/02/27 18:24:51 jperkin Exp $
+$NetBSD: distinfo,v 1.10 2013/12/17 16:27:18 prlw1 Exp $
 
 SHA1 (LibVNCServer-0.9.9.tar.gz) = 2004c6ae493baeff3da40b61e0a0f73c83182dad
 RMD160 (LibVNCServer-0.9.9.tar.gz) = e62e0903124abb85746bcac6498214fe09c3b4d7
 Size (LibVNCServer-0.9.9.tar.gz) = 1678609 bytes
+SHA1 (patch-libvncserver_sockets.c) = 6af391ad441f561632ba2fea747006fa702776a1
 SHA1 (patch-libvncserver_websockets.c) = 6b9e25e3f54af967d8f6581a2c1e3250b8772693
diff -r 70d05432adf5 -r 28b5bd79048d net/libvncserver/patches/patch-libvncserver_sockets.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libvncserver/patches/patch-libvncserver_sockets.c     Tue Dec 17 16:27:18 2013 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-libvncserver_sockets.c,v 1.1 2013/12/17 16:27:18 prlw1 Exp $
+
+Don't segfault when using PKG_OPTIONS.libVNCServer=-inet6
+From commit 66282f5800
+
+--- libvncserver/sockets.c.orig        2012-05-04 14:19:00.000000000 +0000
++++ libvncserver/sockets.c
+@@ -402,9 +402,9 @@ rfbProcessNewConnection(rfbScreenInfoPtr
+       rfbLogPerror("rfbProcessNewConnection: error in select");
+       return FALSE;
+     }
+-    if (FD_ISSET(rfbScreen->listenSock, &listen_fds)) 
++    if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds)) 
+       chosen_listen_sock = rfbScreen->listenSock;
+-    if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds)) 
++    if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds)) 
+       chosen_listen_sock = rfbScreen->listen6Sock;
+ 
+     if ((sock = accept(chosen_listen_sock,