diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch')
-rw-r--r-- | net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch b/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch new file mode 100644 index 000000000000..6da3b018af22 --- /dev/null +++ b/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch @@ -0,0 +1,76 @@ +From 66282f58000c8863e104666c30cb67b1d5cbdee3 Mon Sep 17 00:00:00 2001 +From: "Kyle J. McKay" <mackyle@gmail.com> +Date: Fri, 18 May 2012 00:30:11 -0700 +Subject: [PATCH] libvncserver/sockets.c: do not segfault when + listenSock/listen6Sock == -1 + +--- + libvncserver/sockets.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c +index 84c9c98..3ff2aac 100644 +--- a/libvncserver/sockets.c ++++ b/libvncserver/sockets.c +@@ -402,9 +402,9 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen) + 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, +-- +1.8.5.5 + +From 584542ba97d35706a9e5c001b5cdf64296b5dd7f Mon Sep 17 00:00:00 2001 +From: Oliver Loch <o.loch@gmx.net> +Date: Wed, 8 Aug 2012 22:09:13 +0200 +Subject: [PATCH] Patched sockets.c to allow the use of IPv6 without IPv4. + +As requested only those lines are indented that have been changed. +--- + libvncserver/sockets.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c +index 3ff2aac..15b40ac 100644 +--- a/libvncserver/sockets.c ++++ b/libvncserver/sockets.c +@@ -176,7 +176,9 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen) + rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd); + #endif + } +- else if(rfbScreen->port>0) { ++ else ++ { ++ if(rfbScreen->port>0) { + FD_ZERO(&(rfbScreen->allFds)); + + if ((rfbScreen->listenSock = rfbListenOnTCPPort(rfbScreen->port, iface)) < 0) { +@@ -187,8 +189,10 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen) + + FD_SET(rfbScreen->listenSock, &(rfbScreen->allFds)); + rfbScreen->maxFd = rfbScreen->listenSock; ++ } + + #ifdef LIBVNCSERVER_IPv6 ++ if (rfbScreen->ipv6port>0) { + if ((rfbScreen->listen6Sock = rfbListenOnTCP6Port(rfbScreen->ipv6port, rfbScreen->listen6Interface)) < 0) { + /* ListenOnTCP6Port has its own detailed error printout */ + return; +@@ -197,6 +201,7 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen) + + FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds)); + rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd); ++ } + #endif + + } +-- +1.8.5.5 + |