diff options
| author | prlw1 <prlw1@pkgsrc.org> | 2013-12-17 16:27:18 +0000 |
|---|---|---|
| committer | prlw1 <prlw1@pkgsrc.org> | 2013-12-17 16:27:18 +0000 |
| commit | c97d6764bb9ea1bfcd6321963cb07b47ad114dd2 (patch) | |
| tree | 5eaf2323d80987bc81855f4cc357414d60b47092 /net/libvncserver | |
| parent | 7c1ed6202b51006ec438db7993d228efb0bd7cdb (diff) | |
| download | pkgsrc-c97d6764bb9ea1bfcd6321963cb07b47ad114dd2.tar.gz | |
Don't segfault when using PKG_OPTIONS.libVNCServer=-inet6
Diffstat (limited to 'net/libvncserver')
| -rw-r--r-- | net/libvncserver/Makefile | 4 | ||||
| -rw-r--r-- | net/libvncserver/distinfo | 3 | ||||
| -rw-r--r-- | net/libvncserver/patches/patch-libvncserver_sockets.c | 19 |
3 files changed, 23 insertions, 3 deletions
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index df79ce20c13..beaf4142eb4 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -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 --git a/net/libvncserver/distinfo b/net/libvncserver/distinfo index 5139ee27095..7d985fd87d7 100644 --- a/net/libvncserver/distinfo +++ b/net/libvncserver/distinfo @@ -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 --git a/net/libvncserver/patches/patch-libvncserver_sockets.c b/net/libvncserver/patches/patch-libvncserver_sockets.c new file mode 100644 index 00000000000..f02ddd9a2c1 --- /dev/null +++ b/net/libvncserver/patches/patch-libvncserver_sockets.c @@ -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, |