mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libvncserver: bump to version 0.9.14

Browse Source 
- Drop patches (already in version)
- examples and tests can be disabled since
  0b8990784a

https://github.com/LibVNC/libvncserver/releases/tag/LibVNCServer-0.9.14

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
2022-12-23 18:13:51 +01:00
committed by Thomas Petazzoni
parent 56763ca012
commit 90a543de88
4 changed files with 5 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch
View File

@@ -1,66 +0,0 @@
From 97fbbd678b2012e64acddd523677bc55a177bc58 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 12 May 2022 20:41:50 +0200
Subject: [PATCH] common/crypto_openssl.c: fix build with libressl >= 3.5.0
(#522)
Fix the following build failure with libressl >= 3.5.0:
/nvmedata/autobuild/instance-26/output-1/build/libvncserver-0.9.13/common/crypto_openssl.c: In function 'dh_generate_keypair':
/nvmedata/autobuild/instance-26/output-1/build/libvncserver-0.9.13/common/crypto_openssl.c:149:7: error: dereferencing pointer to incomplete type 'DH' {aka 'struct dh_st'}
149 | dh->p = BN_bin2bn(prime, keylen, NULL);
| ^~
Fixes:
- http://autobuild.buildroot.org/results/49b3940b9d0432cb5fb0c5d22dfa017b18c6e233
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://github.com/LibVNC/libvncserver/commit/97fbbd678b2012e64acddd523677bc55a177bc58]
---
common/crypto_openssl.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/common/crypto_openssl.c b/common/crypto_openssl.c
index 60d4bd4df..51d7ec2d9 100644
--- a/common/crypto_openssl.c
+++ b/common/crypto_openssl.c
@@ -138,14 +138,16 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen,
{
int result = 0;
DH *dh;
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || \
+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000)
const BIGNUM *pub_key = NULL;
const BIGNUM *priv_key = NULL;
#endif
if(!(dh = DH_new()))
goto out;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000)
dh->p = BN_bin2bn(prime, keylen, NULL);
dh->g = BN_bin2bn(gen, gen_len, NULL);
#else
@@ -154,7 +156,8 @@ int dh_generate_keypair(uint8_t *priv_out, uint8_t *pub_out, const uint8_t *gen,
#endif
if(!DH_generate_key(dh))
goto out;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000)
if(BN_bn2bin(dh->priv_key, priv_out) == 0)
goto out;
if(BN_bn2bin(dh->pub_key, pub_out) == 0)
@@ -181,7 +184,8 @@ int dh_compute_shared_key(uint8_t *shared_out, const uint8_t *priv, const uint8_
if(!(dh = DH_new()))
goto out;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER < 0x30500000)
dh->p = BN_bin2bn(prime, keylen, NULL);
dh->priv_key = BN_bin2bn(priv, keylen, NULL);
#else

28
package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch
View File

@@ -1,28 +0,0 @@
From bef41f6ec4097a8ee094f90a1b34a708fbd757ec Mon Sep 17 00:00:00 2001
From: Christian Beier <info@christianbeier.net>
Date: Sat, 21 Nov 2020 12:52:31 +0100
Subject: [PATCH] libvncclient: free vncRec memory in rfbClientCleanup()
Otherwise we leak memory. Spotted by Ramin Farajpour Cami
<ramin.blackhat@gmail.com>, thanks!
[Retrieved from:
https://github.com/LibVNC/libvncserver/commit/bef41f6ec4097a8ee094f90a1b34a708fbd757ec]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
libvncclient/vncviewer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c
index d6b91f02b..0a1bdcf6a 100644
--- a/libvncclient/vncviewer.c
+++ b/libvncclient/vncviewer.c
@@ -534,6 +534,8 @@ void rfbClientCleanup(rfbClient* client) {
client->clientData = next;
}
+ free(client->vncRec);
+
if (client->sock != RFB_INVALID_SOCKET)
rfbCloseSocket(client->sock);
if (client->listenSock != RFB_INVALID_SOCKET)

2
package/libvncserver/libvncserver.hash
View File

@@ -1,3 +1,3 @@
# Locally computed: # Locally computed:
sha256 0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a LibVNCServer-0.9.13.tar.gz sha256 83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5 LibVNCServer-0.9.14.tar.gz
sha256 4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f COPYING sha256 4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f COPYING

9
package/libvncserver/libvncserver.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBVNCSERVER_VERSION = 0.9.13 LIBVNCSERVER_VERSION = 0.9.14
LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz
LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive
LIBVNCSERVER_LICENSE = GPL-2.0+ LIBVNCSERVER_LICENSE = GPL-2.0+
@@ -14,14 +14,13 @@ LIBVNCSERVER_INSTALL_STAGING = YES
LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo
LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON
# 0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch
LIBVNCSERVER_IGNORE_CVES += CVE-2020-29260
# only used for examples # only used for examples
LIBVNCSERVER_CONF_OPTS += \ LIBVNCSERVER_CONF_OPTS += \
-DWITH_EXAMPLES=OFF \
-DWITH_FFMPEG=OFF \ -DWITH_FFMPEG=OFF \
-DWITH_GTK=OFF \ -DWITH_GTK=OFF \
-DWITH_SDL=OFF -DWITH_SDL=OFF \
-DWITH_TESTS=OFF
ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON