Attachment #460202 for bug #604192

Lines 1-2 Link Here

(-)a/net-libs/libvncserver/Manifest (+1 lines)
1	DIST LibVNCServer-0.9.10.tar.gz 1415191 SHA256 ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7 SHA512 eb637dfb72dc50fb713a715c9d0cc8824a6871527c2edb497e70c92e2e708021fbd5d8134f2dee6a9e90d1c8fd3fee53c5f5ece790c2804e938011a980ffceae WHIRLPOOL 821234e772d15668b88bd99e72345a7b5d1a9072fd868ddd47fb47a1e4c6b3c1c2de2380622231a968bd98ac05f20a004a80dfbe43db77f8170056121207b9f4	1	DIST LibVNCServer-0.9.10.tar.gz 1415191 SHA256 ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7 SHA512 eb637dfb72dc50fb713a715c9d0cc8824a6871527c2edb497e70c92e2e708021fbd5d8134f2dee6a9e90d1c8fd3fee53c5f5ece790c2804e938011a980ffceae WHIRLPOOL 821234e772d15668b88bd99e72345a7b5d1a9072fd868ddd47fb47a1e4c6b3c1c2de2380622231a968bd98ac05f20a004a80dfbe43db77f8170056121207b9f4
2	DIST libvncserver-0.9.10_p20160127.tar.gz 1407878 SHA256 cac045bc068e567e9639624e66fb0db18205d93c12845366e16b8351b70ebd2e SHA512 3e8079d814c624e7c8f6f4dd91dfdf05e035ec489fc87a797a4a08b4f8998156b420b941b94c48f6b5f783f1a962f802e83d4bbdefc1f4093837331c8247676d WHIRLPOOL 4884303a7071c450f06b93b2b483903d45f871c0d6e1dd55f2a1c141feb3eca97d9fbcd32e8f02bf6413beb6a11e70f53b498f15172bb2f04be1796045095331	2	DIST libvncserver-0.9.10_p20160127.tar.gz 1407878 SHA256 cac045bc068e567e9639624e66fb0db18205d93c12845366e16b8351b70ebd2e SHA512 3e8079d814c624e7c8f6f4dd91dfdf05e035ec489fc87a797a4a08b4f8998156b420b941b94c48f6b5f783f1a962f802e83d4bbdefc1f4093837331c8247676d WHIRLPOOL 4884303a7071c450f06b93b2b483903d45f871c0d6e1dd55f2a1c141feb3eca97d9fbcd32e8f02bf6413beb6a11e70f53b498f15172bb2f04be1796045095331
		3	DIST libvncserver-0.9.12.tar.gz 1414500 SHA256 854fa44d8098afba68a918ce47fdbd52ad5824788519e2d587e725a699974b51 SHA512 7bdd456e681453c9b47a01549ee405c2334ee160f05c0130e1a96b125015bcbde23f983d81b91d3127fce1c331715f6f876802d243334fb45d08dafc3347eaf3 WHIRLPOOL 32a902c7a44a951f78d1cad7978a60541243d1c94e60c037771aa7956144ff95ce8f0472bd8921740278d816882e3f15aa36e598905d6af1a4e2f0337b4a6466




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





Fix a buffer overflow on platforms where sizeof(long) > sizeof(int).
https://bugs.gentoo.org/show_bug.cgi?id=329031

--- libvncserver/tightvnc-filetransfer/filetransfermsg.c
+++ libvncserver/tightvnc-filetransfer/filetransfermsg.c
@@ -393,7 +393,8 @@
 CreateFileDownloadZeroSizeDataMsg(unsigned long mTime)
 {
 	FileTransferMsg fileDownloadZeroSizeDataMsg;
-	int length = sz_rfbFileDownloadDataMsg + sizeof(int);
+	uint32_t mTime32 = (uint32_t)mTime;
+	int length = sz_rfbFileDownloadDataMsg + sizeof(mTime32);
 	rfbFileDownloadDataMsg *pFDD = NULL;
 	char *pFollow = NULL;
 	
@@ -413,7 +414,7 @@
 	pFDD->compressedSize = Swap16IfLE(0);
 	pFDD->realSize = Swap16IfLE(0);
 	
-	memcpy(pFollow, &mTime, sizeof(unsigned long));
+	memcpy(pFollow, &mTime, sizeof(mTime32));
 
 	fileDownloadZeroSizeDataMsg.data	= pData;
 	fileDownloadZeroSizeDataMsg.length	= length;




# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI=6

inherit autotools eutils multilib-minimal vcs-snapshot

DESCRIPTION="library for creating vnc servers"
HOMEPAGE="http://libvncserver.sourceforge.net/"
SRC_URI="https://github.com/LibVNC/${PN}/archive/07d5101f6a94c8221226ae66e33c903a1bc8b4ad.tar.gz -> ${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl +png ssl static-libs systemd test threads +zlib"
REQUIRED_USE="!gnutls? ( ssl? ( threads ) )"

DEPEND="
	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
	gnutls? (
		>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
		>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
	)
	!gnutls? (
		ssl? (
			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
		)
	)
	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
	systemd? ( sys-apps/systemd:= )
	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
RDEPEND="${DEPEND}"

DOCS=( AUTHORS ChangeLog NEWS README TODO )

src_prepare() {
	default

	sed -i -r \
		-e "/^SUBDIRS/s:\<$(usex test '' 'test|')client_examples|examples\>::g" \
		Makefile.am || die

	eautoreconf
}

multilib_src_configure() {
	ECONF_SOURCE=${S} \
	econf \
		--disable-silent-rules \
		$(use_enable static-libs static) \
		$(use_with 24bpp) \
		$(use_with gnutls) \
		$(usex gnutls --with-gcrypt $(use_with gcrypt)) \
		$(usex gnutls --without-ssl $(use_with ssl)) \
		$(use_with ipv6) \
		$(use_with jpeg) \
		$(use_with png) \
		$(use_with threads pthread) \
		$(use_with zlib)
}

multilib_src_install_all() {
	einstalldocs
	prune_libtool_files
}

Return to bug 604192

Lines 1-76 Link Here

(-)a/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch (-76 lines)
1	From 66282f58000c8863e104666c30cb67b1d5cbdee3 Mon Sep 17 00:00:00 2001
2	From: "Kyle J. McKay" <mackyle@gmail.com>
3	Date: Fri, 18 May 2012 00:30:11 -0700
4	Subject: [PATCH] libvncserver/sockets.c: do not segfault when
5	listenSock/listen6Sock == -1
6
7	---
8	libvncserver/sockets.c \| 4 ++--
9	1 file changed, 2 insertions(+), 2 deletions(-)
10
11	diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c
12	index 84c9c98..3ff2aac 100644
13	--- a/libvncserver/sockets.c
14	+++ b/libvncserver/sockets.c
15	@@ -402,9 +402,9 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
16	rfbLogPerror("rfbProcessNewConnection: error in select");
17	return FALSE;
18	}
19	- if (FD_ISSET(rfbScreen->listenSock, &listen_fds))
20	+ if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds))
21	chosen_listen_sock = rfbScreen->listenSock;
22	- if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
23	+ if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
24	chosen_listen_sock = rfbScreen->listen6Sock;
25
26	if ((sock = accept(chosen_listen_sock,
27	--
28	1.8.5.5
29
30	From 584542ba97d35706a9e5c001b5cdf64296b5dd7f Mon Sep 17 00:00:00 2001
31	From: Oliver Loch <o.loch@gmx.net>
32	Date: Wed, 8 Aug 2012 22:09:13 +0200
33	Subject: [PATCH] Patched sockets.c to allow the use of IPv6 without IPv4.
34
35	As requested only those lines are indented that have been changed.
36	---
37	libvncserver/sockets.c \| 7 ++++++-
38	1 file changed, 6 insertions(+), 1 deletion(-)
39
40	diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c
41	index 3ff2aac..15b40ac 100644
42	--- a/libvncserver/sockets.c
43	+++ b/libvncserver/sockets.c
44	@@ -176,7 +176,9 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
45	rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
46	#endif
47	}
48	- else if(rfbScreen->port>0) {
49	+ else
50	+ {
51	+ if(rfbScreen->port>0) {
52	FD_ZERO(&(rfbScreen->allFds));
53
54	if ((rfbScreen->listenSock = rfbListenOnTCPPort(rfbScreen->port, iface)) < 0) {
55	@@ -187,8 +189,10 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
56
57	FD_SET(rfbScreen->listenSock, &(rfbScreen->allFds));
58	rfbScreen->maxFd = rfbScreen->listenSock;
59	+ }
60
61	#ifdef LIBVNCSERVER_IPv6
62	+ if (rfbScreen->ipv6port>0) {
63	if ((rfbScreen->listen6Sock = rfbListenOnTCP6Port(rfbScreen->ipv6port, rfbScreen->listen6Interface)) < 0) {
64	/* ListenOnTCP6Port has its own detailed error printout */
65	return;
66	@@ -197,6 +201,7 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
67
68	FD_SET(rfbScreen->listen6Sock, &(rfbScreen->allFds));
69	rfbScreen->maxFd = max((int)rfbScreen->listen6Sock,rfbScreen->maxFd);
70	+ }
71	#endif
72
73	}
74	--
75	1.8.5.5
76

Lines 1-24 Link Here

(-)a/net-libs/libvncserver/files/libvncserver-memcpy.patch (-24 lines)
1	Fix a buffer overflow on platforms where sizeof(long) > sizeof(int).
2	https://bugs.gentoo.org/show_bug.cgi?id=329031
3
4	--- libvncserver/tightvnc-filetransfer/filetransfermsg.c
5	+++ libvncserver/tightvnc-filetransfer/filetransfermsg.c
6	@@ -393,7 +393,8 @@
7	CreateFileDownloadZeroSizeDataMsg(unsigned long mTime)
8	{
9	FileTransferMsg fileDownloadZeroSizeDataMsg;
10	- int length = sz_rfbFileDownloadDataMsg + sizeof(int);
11	+ uint32_t mTime32 = (uint32_t)mTime;
12	+ int length = sz_rfbFileDownloadDataMsg + sizeof(mTime32);
13	rfbFileDownloadDataMsg *pFDD = NULL;
14	char *pFollow = NULL;
15
16	@@ -413,7 +414,7 @@
17	pFDD->compressedSize = Swap16IfLE(0);
18	pFDD->realSize = Swap16IfLE(0);
19
20	- memcpy(pFollow, &mTime, sizeof(unsigned long));
21	+ memcpy(pFollow, &mTime, sizeof(mTime32));
22
23	fileDownloadZeroSizeDataMsg.data = pData;
24	fileDownloadZeroSizeDataMsg.length = length;

Line 0 Link Here

(-)a/net-libs/libvncserver/libvncserver-0.9.12.ebuild (-1 / +68 lines)
0	-	1	# Copyright 1999-2016 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3	# $Id$
		4
		5	EAPI=6
		6
		7	inherit autotools eutils multilib-minimal vcs-snapshot
		8
		9	DESCRIPTION="library for creating vnc servers"
		10	HOMEPAGE="http://libvncserver.sourceforge.net/"
		11	SRC_URI="https://github.com/LibVNC/${PN}/archive/07d5101f6a94c8221226ae66e33c903a1bc8b4ad.tar.gz -> ${P}.tar.gz"
		12
		13	LICENSE="GPL-2"
		14	SLOT="0"
		15	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
		16	IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl +png ssl static-libs systemd test threads +zlib"
		17	REQUIRED_USE="!gnutls? ( ssl? ( threads ) )"
		18
		19	DEPEND="
		20	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
		21	gnutls? (
		22	>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
		23	>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
		24	)
		25	!gnutls? (
		26	ssl? (
		27	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
		28	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
		29	)
		30	)
		31	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
		32	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
		33	systemd? ( sys-apps/systemd:= )
		34	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
		35	RDEPEND="${DEPEND}"
		36
		37	DOCS=( AUTHORS ChangeLog NEWS README TODO )
		38
		39	src_prepare() {
		40	default
		41
		42	sed -i -r \
		43	-e "/^SUBDIRS/s:\<$(usex test '' 'test\|')client_examples\|examples\>::g" \
		44	Makefile.am \|\| die
		45
		46	eautoreconf
		47	}
		48
		49	multilib_src_configure() {
		50	ECONF_SOURCE=${S} \
		51	econf \
		52	--disable-silent-rules \
		53	$(use_enable static-libs static) \
		54	$(use_with 24bpp) \
		55	$(use_with gnutls) \
		56	$(usex gnutls --with-gcrypt $(use_with gcrypt)) \
		57	$(usex gnutls --without-ssl $(use_with ssl)) \
		58	$(use_with ipv6) \
		59	$(use_with jpeg) \
		60	$(use_with png) \
		61	$(use_with threads pthread) \
		62	$(use_with zlib)
		63	}
		64
		65	multilib_src_install_all() {
66	einstalldocs
67	prune_libtool_files
68	}