commit: 29bd18220587faa63d90afb87447327f638257c2 Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Fri Feb 17 21:35:03 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Feb 18 13:06:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29bd1822
net-libs/libvncserver: security cleanup Bug: https://bugs.gentoo.org/887067 Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> Closes: https://github.com/gentoo/gentoo/pull/29641 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-libs/libvncserver/Manifest | 1 - .../files/libvncserver-0.9.13-CVE-2020-29260.patch | 27 -------- .../libvncserver-0.9.13-test-fix-includetest.patch | 54 --------------- .../libvncserver-0.9.13-test-fix-tjunittest.patch | 29 --------- .../libvncserver/libvncserver-0.9.13-r1.ebuild | 76 ---------------------- 5 files changed, 187 deletions(-) diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest index 560434399356..779ce1c48b7d 100644 --- a/net-libs/libvncserver/Manifest +++ b/net-libs/libvncserver/Manifest @@ -1,2 +1 @@ -DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643 DIST LibVNCServer-0.9.14.tar.gz 593516 BLAKE2B 6585e15e2ade08211ace0ae40deb07eca04b96dcfe38fb4d2e7d7a7192ca22dda546cb69fc4be6c6b7eb83c8afb0ea14d7cee3779a9e64c138ec861efeb540b8 SHA512 8a0a58e355154cbe1e5807864dc874b063c5e5f5e20d64ae541d49d51b654a35ca9c625adc5c303b6570fa79c19f82d87a37612f9801b453ccf862bd77c06fcc diff --git a/net-libs/libvncserver/files/libvncserver-0.9.13-CVE-2020-29260.patch b/net-libs/libvncserver/files/libvncserver-0.9.13-CVE-2020-29260.patch deleted file mode 100644 index 23ffed8c1774..000000000000 --- a/net-libs/libvncserver/files/libvncserver-0.9.13-CVE-2020-29260.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bef41f6ec4097a8ee094f90a1b34a708fbd757ec Mon Sep 17 00:00:00 2001 -From: Christian Beier <i...@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.black...@gmail.com>, thanks! ---- - libvncclient/vncviewer.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c -index d6b91f02..0a1bdcf6 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.35.1 - diff --git a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch deleted file mode 100644 index 767708288830..000000000000 --- a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-includetest.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 39cff3dd6b5d9ebcf86f01e2c7e0bef62abd9d6f Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexan...@tsoy.me> -Date: Thu, 25 Jun 2020 11:35:04 +0300 -Subject: [PATCH 1/2] test: fix includetest to use CMAKE_MAKE_PROGRAM (#431) - -includetest currently fais if, for example, ninja is used as a CMake -generator. Fix it by using CMAKE_MAKE_PROGRAM in the test. ---- - CMakeLists.txt | 2 +- - test/includetest.sh | 7 ++++--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b6228a2..290deb38 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -680,7 +680,7 @@ endif(LIBVNCSERVER_WITH_WEBSOCKETS) - - add_test(NAME cargs COMMAND test_cargstest) - if(UNIX) -- add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) -+ add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM}) - endif(UNIX) - if(FOUND_LIBJPEG_TURBO) - add_test(NAME turbojpeg COMMAND test_tjunittest) -diff --git a/test/includetest.sh b/test/includetest.sh -index 23d602e6..6b064208 100755 ---- a/test/includetest.sh -+++ b/test/includetest.sh -@@ -5,10 +5,11 @@ - - # expects install prefix like /usr as an argument - PREFIX=$1 -+CMAKE_MAKE_PROGRAM=$2 - - TMPDIR=$(mktemp -d) - --make install DESTDIR=$TMPDIR -+DESTDIR="$TMPDIR" $CMAKE_MAKE_PROGRAM install - - echo \ - " -@@ -19,6 +20,6 @@ int main() - { - return 0; - } --" > $TMPDIR/includetest.c -+" > "$TMPDIR"/includetest.c - --cc -I $TMPDIR/$PREFIX $TMPDIR/includetest.c -+cc -I "$TMPDIR/$PREFIX" "$TMPDIR"/includetest.c --- -2.26.2 - diff --git a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch b/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch deleted file mode 100644 index 98e3a654b471..000000000000 --- a/net-libs/libvncserver/files/libvncserver-0.9.13-test-fix-tjunittest.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8244fab5421fd14d4c75ce488ad18d38b7a6edb4 Mon Sep 17 00:00:00 2001 -From: Christian Beier <i...@christianbeier.net> -Date: Thu, 25 Jun 2020 12:21:50 +0200 -Subject: [PATCH 2/2] CMake: only add turbojpeg test if configured WITH_JPEG - -Closes #430 ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 290deb38..fdca4d81 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -682,9 +682,9 @@ add_test(NAME cargs COMMAND test_cargstest) - if(UNIX) - add_test(NAME includetest COMMAND ${TESTS_DIR}/includetest.sh ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_MAKE_PROGRAM}) - endif(UNIX) --if(FOUND_LIBJPEG_TURBO) -+if(WITH_JPEG AND FOUND_LIBJPEG_TURBO) - add_test(NAME turbojpeg COMMAND test_tjunittest) --endif(FOUND_LIBJPEG_TURBO) -+endif(WITH_JPEG AND FOUND_LIBJPEG_TURBO) - if(LIBVNCSERVER_WITH_WEBSOCKETS) - add_test(NAME wstest COMMAND test_wstest) - endif(LIBVNCSERVER_WITH_WEBSOCKETS) --- -2.26.2 - diff --git a/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild deleted file mode 100644 index 29851d5a4e57..000000000000 --- a/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_P="LibVNCServer-${PV}" - -DESCRIPTION="library for creating vnc servers" -HOMEPAGE="https://libvnc.github.io/"; -SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"; -S="${WORKDIR}/${PN}-${MY_P}" - -# common/d3des.*: https://github.com/LibVNC/libvncserver/issues/88 -LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT" -# no sub slot wanted (yet), see #578958 -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib" -# https://bugs.gentoo.org/690202 -# https://bugs.gentoo.org/435326 -# https://bugs.gentoo.org/550916 -REQUIRED_USE=" - filetransfer? ( threads ) - jpeg? ( zlib ) - png? ( zlib ) - ssl? ( !gnutls? ( threads ) ) -" - -DEPEND=" - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= ) - ssl? ( - !gnutls? ( - >=dev-libs/openssl-1.0.2:0= - ) - gnutls? ( >=net-libs/gnutls-2.12.23-r6:0= ) - ) - jpeg? ( media-libs/libjpeg-turbo:= ) - lzo? ( dev-libs/lzo ) - png? ( >=media-libs/libpng-1.6.10:0= ) - sasl? ( dev-libs/cyrus-sasl ) - systemd? ( sys-apps/systemd:= ) - zlib? ( >=sys-libs/zlib-1.2.8-r1:0= ) -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS.md README.md TODO.md ) - -PATCHES=( - "${FILESDIR}"/${P}-test-fix-includetest.patch - "${FILESDIR}"/${P}-test-fix-tjunittest.patch - "${FILESDIR}"/${P}-CVE-2020-29260.patch -) - -src_configure() { - local mycmakeargs=( - -DWITH_FFMPEG=OFF - -DWITH_GTK=OFF - -DWITH_SDL=OFF - -DWITH_24BPP=$(usex 24bpp ON OFF) - -DWITH_TIGHTVNC_FILETRANSFER=$(usex filetransfer ON OFF) - -DWITH_GCRYPT=$(usex gcrypt ON OFF) - -DWITH_GNUTLS=$(usex gnutls $(usex ssl ON OFF) OFF) - -DWITH_IPv6=$(usex ipv6 ON OFF) - -DWITH_JPEG=$(usex jpeg ON OFF) - -DWITH_LZO=$(usex lzo ON OFF) - -DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF)) - -DWITH_PNG=$(usex png ON OFF) - -DWITH_SASL=$(usex sasl ON OFF) - -DWITH_SYSTEMD=$(usex systemd ON OFF) - -DWITH_THREADS=$(usex threads ON OFF) - -DWITH_ZLIB=$(usex zlib ON OFF) - ) - cmake_src_configure -}
