[gentoo-commits] repo/gentoo:master commit in: net-libs/libvncserver/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/libvncserver/files/

[Göktürk Yüksek]

commit:     66fa0447808e2a6bdffda047b6604beb5bc1fc43
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jan  8 12:29:04 2017 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 02:32:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66fa0447

net-libs/libvncserver: remove unused patches

 .../files/libvncserver-0.9.9-segfault.patch        | 76 ----------------------
 .../libvncserver/files/libvncserver-memcpy.patch   | 24 -------
 2 files changed, 100 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
deleted file mode 100644
index 6da3b018..00000000
--- 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" <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
-

diff --git a/net-libs/libvncserver/files/libvncserver-memcpy.patch b/net-libs/libvncserver/files/libvncserver-memcpy.patch
deleted file mode 100644
index 9d30e7e..00000000
--- 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;

[gentoo-commits] repo/gentoo:master commit in: net-libs/libvncserver/files/

[Sam James]

commit:     0f2d52caeae7b364e291c73fd9ceabd90dd1b7fa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 04:43:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 04:56:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f2d52ca

net-libs/libvncserver: add patch metadata

Bug: https://bugs.gentoo.org/893608
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libvncserver-0.9.14-crypto-openssl-fix.patch           | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch b/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch
index d4c76773b02c..85179ee5ae61 100644
--- a/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch
+++ b/net-libs/libvncserver/files/libvncserver-0.9.14-crypto-openssl-fix.patch
@@ -1,3 +1,6 @@
+https://github.com/LibVNC/libvncserver/commit/b686f379c34114cf938fe88291f58014337558f6
+https://bugs.gentoo.org/893608
+
 From b686f379c34114cf938fe88291f58014337558f6 Mon Sep 17 00:00:00 2001
 From: Gaurav Ujjwal <gujjwal00@gmail.com>
 Date: Mon, 23 Jan 2023 00:03:03 +0530
@@ -6,12 +9,6 @@ Subject: [PATCH] common/crypto_openssl: pad DH key buffers with leading zeros
 
 Re: https://github.com/LibVNC/libvncserver/issues/493
 Re: https://github.com/bk138/multivnc/issues/202
----
- common/crypto_openssl.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/common/crypto_openssl.c b/common/crypto_openssl.c
-index 50e8073a..dc1ee093 100644
 --- a/common/crypto_openssl.c
 +++ b/common/crypto_openssl.c
 @@ -156,6 +156,15 @@ int encrypt_aes128ecb(void *out, int *out_len, const unsigned char key[16], cons