[patch] 0004-net-libs-libvncserver-0.9.12-bump-rm-old-patches.patch

0004-net-libs-libvncserver-0.9.12-bump-rm-old-patches.patch (text/plain), 8.35 KB, created by Alex Xu (Hello71) on 2017-01-15 16:20:49 UTC

From 68cebabdebf50ad9fb0e91a2f484eeae0a0a0a65 Mon Sep 17 00:00:00 2001
From: Alex Xu <[e-mail]>
Date: Sun, 15 Jan 2017 11:19:24 -0500
Subject: [PATCH 4/4] net-libs/libvncserver: 0.9.12 bump, rm old patches

---
 net-libs/libvncserver/Manifest                     |  1 +
 .../files/libvncserver-0.9.9-segfault.patch        | 76 ----------------------
 .../libvncserver/files/libvncserver-memcpy.patch   | 24 -------
 net-libs/libvncserver/libvncserver-0.9.12.ebuild   | 68 +++++++++++++++++++
 4 files changed, 69 insertions(+), 100 deletions(-)
 delete mode 100644 net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch
 delete mode 100644 net-libs/libvncserver/files/libvncserver-memcpy.patch
 create mode 100644 net-libs/libvncserver/libvncserver-0.9.12.ebuild

diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index eb03d4e993..49e121d039 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,2 +1,3 @@
 DIST LibVNCServer-0.9.10.tar.gz 1415191 SHA256 ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7 SHA512 eb637dfb72dc50fb713a715c9d0cc8824a6871527c2edb497e70c92e2e708021fbd5d8134f2dee6a9e90d1c8fd3fee53c5f5ece790c2804e938011a980ffceae WHIRLPOOL 821234e772d15668b88bd99e72345a7b5d1a9072fd868ddd47fb47a1e4c6b3c1c2de2380622231a968bd98ac05f20a004a80dfbe43db77f8170056121207b9f4
 DIST libvncserver-0.9.10_p20160127.tar.gz 1407878 SHA256 cac045bc068e567e9639624e66fb0db18205d93c12845366e16b8351b70ebd2e SHA512 3e8079d814c624e7c8f6f4dd91dfdf05e035ec489fc87a797a4a08b4f8998156b420b941b94c48f6b5f783f1a962f802e83d4bbdefc1f4093837331c8247676d WHIRLPOOL 4884303a7071c450f06b93b2b483903d45f871c0d6e1dd55f2a1c141feb3eca97d9fbcd32e8f02bf6413beb6a11e70f53b498f15172bb2f04be1796045095331
+DIST libvncserver-0.9.12.tar.gz 1414500 SHA256 854fa44d8098afba68a918ce47fdbd52ad5824788519e2d587e725a699974b51 SHA512 7bdd456e681453c9b47a01549ee405c2334ee160f05c0130e1a96b125015bcbde23f983d81b91d3127fce1c331715f6f876802d243334fb45d08dafc3347eaf3 WHIRLPOOL 32a902c7a44a951f78d1cad7978a60541243d1c94e60c037771aa7956144ff95ce8f0472bd8921740278d816882e3f15aa36e598905d6af1a4e2f0337b4a6466
diff --git a/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch b/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch
deleted file mode 100644
index 6da3b018af..0000000000
--- a/net-libs/libvncserver/files/libvncserver-0.9.9-segfault.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 66282f58000c8863e104666c30cb67b1d5cbdee3 Mon Sep 17 00:00:00 2001
-From: "Kyle J. McKay" <[e-mail]>
-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 <[e-mail]>
-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
-
diff --git a/net-libs/libvncserver/files/libvncserver-memcpy.patch b/net-libs/libvncserver/files/libvncserver-memcpy.patch
deleted file mode 100644
index 9d30e7e312..0000000000
--- a/net-libs/libvncserver/files/libvncserver-memcpy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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;
diff --git a/net-libs/libvncserver/libvncserver-0.9.12.ebuild b/net-libs/libvncserver/libvncserver-0.9.12.ebuild
new file mode 100644
index 0000000000..614cecd73c
--- /dev/null
+++ b/net-libs/libvncserver/libvncserver-0.9.12.ebuild
@@ -0,0 +1,68 @@
+# 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
+}
-- 
2.11.0