commit: 10d026e0af2445f2a4b6f922486795ede8ef4907 Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> AuthorDate: Fri Nov 27 16:50:50 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Dec 7 07:34:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d026e0
x11-misc/x11vnc: security bump for CVE-2020-29074 Bug: https://bugs.gentoo.org/756841 Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> Closes: https://github.com/gentoo/gentoo/pull/18432 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../files/x11vnc-0.9.16-CVE-2020-29074.patch | 25 +++++++ x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild | 81 ++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch new file mode 100644 index 00000000000..12f65b94fb6 --- /dev/null +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch @@ -0,0 +1,25 @@ +From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= <[email protected]> +Date: Wed, 18 Nov 2020 08:40:45 +0100 +Subject: [PATCH] scan: limit access to shared memory segments to current user + +--- + src/scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scan.c b/src/scan.c +index 43e00d2..12994d5 100644 +--- a/src/scan.c ++++ b/src/scan.c +@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h, + + #if HAVE_XSHM + shm->shmid = shmget(IPC_PRIVATE, +- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); ++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); + + if (shm->shmid == -1) { + rfbErr("shmget(%s) failed.\n", name); +-- +2.26.2 + diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild new file mode 100644 index 00000000000..31f1ea9b8f1 --- /dev/null +++ b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="VNC server for real X displays" +HOMEPAGE="https://libvnc.github.io/"; +SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" + +COMMON_DEPEND=" + >=net-libs/libvncserver-0.9.8[ssl=] + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + >=x11-libs/libXtst-1.1.0 + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + xcomposite? ( x11-libs/libXcomposite ) + xdamage? ( x11-libs/libXdamage ) + xfixes? ( x11-libs/libXfixes ) + xinerama? ( x11-libs/libXinerama ) + xrandr? ( x11-libs/libXrandr ) + zeroconf? ( >=net-dns/avahi-0.6.4 ) +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto + x11-libs/libXt +" +# https://bugzilla.redhat.com/show_bug.cgi?id=920554 +RDEPEND="${COMMON_DEPEND} + dev-lang/tk:0 +" + +PATCHES=( + "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 + "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 + "${FILESDIR}"/${P}-libressl.patch + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-CVE-2020-29074.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # --without-v4l because of missing video4linux 2.x support wrt #389079 + local myconf=( + --without-v4l + --without-xkeyboard + --without-fbpm + --without-dpms + $(use_with crypt) + $(use_with fbcon fbdev) + $(use_with ssl) + $(use_with ssl crypto) + $(use_with xcomposite) + $(use_with xdamage) + $(use_with xfixes) + $(use_with xinerama) + $(use_with xrandr) + $(use_with zeroconf avahi) + ) + econf "${myconf[@]}" +} + +src_install() { + default + newinitd "${FILESDIR}/x11vnc.init.d" x11vnc + newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc +}
