All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/libvncserver: bump to version 0.9.14
@ 2022-12-23 17:13 Fabrice Fontaine
  2022-12-27 21:33 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-12-23 17:13 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

- Drop patches (already in version)
- examples and tests can be disabled since
  https://github.com/LibVNC/libvncserver/commit/0b8990784a81823eecc9089263ac1966d17bf399

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...enssl.c-fix-build-with-libressl-3.5..patch | 66 -------------------
 ...ee-vncRec-memory-in-rfbClientCleanup.patch | 28 --------
 package/libvncserver/libvncserver.hash        |  2 +-
 package/libvncserver/libvncserver.mk          |  9 ++-
 4 files changed, 5 insertions(+), 100 deletions(-)
 delete mode 100644 package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch
 delete mode 100644 package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch

diff --git a/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch b/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch
deleted file mode 100644
index 110976c4bb..0000000000
--- a/package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch
+++ /dev/null
@@ -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
diff --git a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch b/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch
deleted file mode 100644
index 7658c112f3..0000000000
--- a/package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch
+++ /dev/null
@@ -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)
diff --git a/package/libvncserver/libvncserver.hash b/package/libvncserver/libvncserver.hash
index 8e61a3d0ea..225c42e46a 100644
--- a/package/libvncserver/libvncserver.hash
+++ b/package/libvncserver/libvncserver.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a  LibVNCServer-0.9.13.tar.gz
+sha256  83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5  LibVNCServer-0.9.14.tar.gz
 sha256  4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f  COPYING
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index 8f24e2d098..700e26a8d6 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBVNCSERVER_VERSION = 0.9.13
+LIBVNCSERVER_VERSION = 0.9.14
 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz
 LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive
 LIBVNCSERVER_LICENSE = GPL-2.0+
@@ -14,14 +14,13 @@ LIBVNCSERVER_INSTALL_STAGING = YES
 LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo
 LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON
 
-# 0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch
-LIBVNCSERVER_IGNORE_CVES += CVE-2020-29260
-
 # only used for examples
 LIBVNCSERVER_CONF_OPTS += \
+	-DWITH_EXAMPLES=OFF \
 	-DWITH_FFMPEG=OFF \
 	-DWITH_GTK=OFF \
-	-DWITH_SDL=OFF
+	-DWITH_SDL=OFF \
+	-DWITH_TESTS=OFF
 
 ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libvncserver: bump to version 0.9.14
  2022-12-23 17:13 [Buildroot] [PATCH 1/1] package/libvncserver: bump to version 0.9.14 Fabrice Fontaine
@ 2022-12-27 21:33 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-12-27 21:33 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

On Fri, 23 Dec 2022 18:13:51 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> - Drop patches (already in version)
> - examples and tests can be disabled since
>   https://github.com/LibVNC/libvncserver/commit/0b8990784a81823eecc9089263ac1966d17bf399
> 
> https://github.com/LibVNC/libvncserver/releases/tag/LibVNCServer-0.9.14
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...enssl.c-fix-build-with-libressl-3.5..patch | 66 -------------------
>  ...ee-vncRec-memory-in-rfbClientCleanup.patch | 28 --------
>  package/libvncserver/libvncserver.hash        |  2 +-
>  package/libvncserver/libvncserver.mk          |  9 ++-
>  4 files changed, 5 insertions(+), 100 deletions(-)
>  delete mode 100644 package/libvncserver/0001-common-crypto_openssl.c-fix-build-with-libressl-3.5..patch
>  delete mode 100644 package/libvncserver/0002-libvncclient-free-vncRec-memory-in-rfbClientCleanup.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-27 21:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-23 17:13 [Buildroot] [PATCH 1/1] package/libvncserver: bump to version 0.9.14 Fabrice Fontaine
2022-12-27 21:33 ` Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.