Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/vino/files/, profiles/, net-misc/vino/
Date: Mon, 09 May 2022 22:10:05
Message-Id: 1652134158.669e3142e69e02e46aa5a3824349ba28d3566a49.mattst88@gentoo
1 commit: 669e3142e69e02e46aa5a3824349ba28d3566a49
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 8 18:11:39 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon May 9 22:09:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669e3142
7
8 net-misc/vino: Remove
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 net-misc/vino/Manifest | 2 -
13 net-misc/vino/files/CVE-2014-6053.patch | 31 -------------
14 net-misc/vino/files/CVE-2018-7225.patch | 64 --------------------------
15 net-misc/vino/files/CVE-2019-15681.patch | 26 -----------
16 net-misc/vino/metadata.xml | 11 -----
17 net-misc/vino/vino-3.22.0-r3.ebuild | 77 --------------------------------
18 profiles/package.mask | 1 -
19 7 files changed, 212 deletions(-)
20
21 diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
22 deleted file mode 100644
23 index 56fb2cd63fb7..000000000000
24 --- a/net-misc/vino/Manifest
25 +++ /dev/null
26 @@ -1,2 +0,0 @@
27 -DIST vino-3.22.0-patchset.tar.xz 158480 BLAKE2B fb8b50abde8cb4728410302c1d3a57bc4d344a33ac0bd9f1265fd24eb142dcd52e870845b902c9b63e98134f87873ebf6abfcfcd1efadb72b0cc72b04f9bf4be SHA512 cf96f5dce96d5c060462698c9d8df6f6d94eb9d624cb689c1262830840ed8f3617485f2274832076c273625e92a89732f9c2ae99dbcbf495e5293cf88408064f
28 -DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f
29
30 diff --git a/net-misc/vino/files/CVE-2014-6053.patch b/net-misc/vino/files/CVE-2014-6053.patch
31 deleted file mode 100644
32 index 8830c30f870d..000000000000
33 --- a/net-misc/vino/files/CVE-2014-6053.patch
34 +++ /dev/null
35 @@ -1,31 +0,0 @@
36 -From b1bfadcbfd88970c6d48672e2dbcca8713c91411 Mon Sep 17 00:00:00 2001
37 -From: Nicolas Ruff <nruff@××××××.com>
38 -Date: Mon, 18 Aug 2014 15:16:16 +0200
39 -Subject: [PATCH 1/3] Check malloc() return value on client->server
40 - ClientCutText message. Client can send up to 2**32-1 bytes of text, and such
41 - a large allocation is likely to fail in case of high memory pressure. This
42 - would in a server crash (write at address 0).
43 -
44 ----
45 - server/libvncserver/rfbserver.c | 5 +++++
46 - 1 file changed, 5 insertions(+)
47 -
48 -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
49 -index a880b53..2615dc3 100644
50 ---- a/server/libvncserver/rfbserver.c
51 -+++ b/server/libvncserver/rfbserver.c
52 -@@ -853,6 +853,11 @@ rfbProcessClientNormalMessage(rfbClientPtr cl)
53 - msg.cct.length = Swap32IfLE(msg.cct.length);
54 -
55 - str = (char *)malloc(msg.cct.length);
56 -+ if (str == NULL) {
57 -+ rfbLogPerror("rfbProcessClientNormalMessage: not enough memory");
58 -+ rfbCloseClient(cl);
59 -+ return;
60 -+ }
61 -
62 - if ((n = ReadExact(cl, str, msg.cct.length)) <= 0) {
63 - if (n != 0)
64 ---
65 -2.20.1
66 -
67
68 diff --git a/net-misc/vino/files/CVE-2018-7225.patch b/net-misc/vino/files/CVE-2018-7225.patch
69 deleted file mode 100644
70 index 1b1186b4fe78..000000000000
71 --- a/net-misc/vino/files/CVE-2018-7225.patch
72 +++ /dev/null
73 @@ -1,64 +0,0 @@
74 -From d8a663541ef358a13fed2fbb39e7d323454369dc Mon Sep 17 00:00:00 2001
75 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@××××××.com>
76 -Date: Mon, 26 Feb 2018 13:48:00 +0100
77 -Subject: [PATCH 2/3] Limit client cut text length to 1 MB
78 -
79 -This patch constrains a client cut text length to 1 MB. Otherwise
80 -a client could make server allocate 2 GB of memory and that seems to
81 -be to much to classify it as a denial of service.
82 -
83 -The limit also prevents from an integer overflow followed by copying
84 -an uninitilized memory when processing msg.cct.length value larger
85 -than SIZE_MAX or INT_MAX - sz_rfbClientCutTextMsg.
86 -
87 -This patch also corrects accepting length value of zero (malloc(0) is
88 -interpreted on differnet systems differently).
89 -
90 -CVE-2018-7225
91 -<https://github.com/LibVNC/libvncserver/issues/218>
92 ----
93 - server/libvncserver/rfbserver.c | 21 ++++++++++++++++++++-
94 - 1 file changed, 20 insertions(+), 1 deletion(-)
95 -
96 -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
97 -index 2615dc3..2224edb 100644
98 ---- a/server/libvncserver/rfbserver.c
99 -+++ b/server/libvncserver/rfbserver.c
100 -@@ -59,6 +59,9 @@
101 - #define DEBUGPROTO(x)
102 - #endif
103 -
104 -+/* PRIu32 */
105 -+#include <inttypes.h>
106 -+
107 - rfbClientPtr pointerClient = NULL; /* Mutex for pointer events */
108 -
109 - static void rfbProcessClientProtocolVersion(rfbClientPtr cl);
110 -@@ -852,7 +855,23 @@ rfbProcessClientNormalMessage(rfbClientPtr cl)
111 -
112 - msg.cct.length = Swap32IfLE(msg.cct.length);
113 -
114 -- str = (char *)malloc(msg.cct.length);
115 -+ /* uint32_t input is passed to malloc()'s size_t argument,
116 -+ * to rfbReadExact()'s int argument, to rfbStatRecordMessageRcvd()'s int
117 -+ * argument increased of sz_rfbClientCutTextMsg, and to setXCutText()'s int
118 -+ * argument. Here we impose a limit of 1 MB so that the value fits
119 -+ * into all of the types to prevent from misinterpretation and thus
120 -+ * from accessing uninitialized memory (CVE-2018-7225) and also to
121 -+ * prevent from a denial-of-service by allocating to much memory in
122 -+ * the server. */
123 -+ if (msg.cct.length > 1<<20) {
124 -+ rfbLog("rfbClientCutText: too big cut text length requested: %" PRIu32 "\n",
125 -+ msg.cct.length);
126 -+ rfbCloseClient(cl);
127 -+ return;
128 -+ }
129 -+
130 -+ /* Allow zero-length client cut text. */
131 -+ str = (char *)calloc(msg.cct.length ? msg.cct.length : 1, 1);
132 - if (str == NULL) {
133 - rfbLogPerror("rfbProcessClientNormalMessage: not enough memory");
134 - rfbCloseClient(cl);
135 ---
136 -2.20.1
137 -
138
139 diff --git a/net-misc/vino/files/CVE-2019-15681.patch b/net-misc/vino/files/CVE-2019-15681.patch
140 deleted file mode 100644
141 index 31bb47ee9b27..000000000000
142 --- a/net-misc/vino/files/CVE-2019-15681.patch
143 +++ /dev/null
144 @@ -1,26 +0,0 @@
145 -From d9f3fa0ede556c6a751a8ca6c8bc37e769715233 Mon Sep 17 00:00:00 2001
146 -From: Christian Beier <dontmind@×××××××××.org>
147 -Date: Mon, 19 Aug 2019 22:32:25 +0200
148 -Subject: [PATCH 3/3] rfbserver: don't leak stack memory to the remote
149 -
150 -Thanks go to Pavel Cheremushkin of Kaspersky for reporting.
151 ----
152 - server/libvncserver/rfbserver.c | 2 ++
153 - 1 file changed, 2 insertions(+)
154 -
155 -diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
156 -index 2224edb..ca4f59b 100644
157 ---- a/server/libvncserver/rfbserver.c
158 -+++ b/server/libvncserver/rfbserver.c
159 -@@ -1565,6 +1565,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len)
160 - rfbServerCutTextMsg sct;
161 - rfbClientIteratorPtr iterator;
162 -
163 -+ memset((char *)&sct, 0, sizeof(sct));
164 -+
165 - iterator = rfbGetClientIterator(rfbScreen);
166 - while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
167 - /* Client is not authenticated, ignore. See GNOME bug 678434. */
168 ---
169 -2.20.1
170 -
171
172 diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml
173 deleted file mode 100644
174 index 117499b97b35..000000000000
175 --- a/net-misc/vino/metadata.xml
176 +++ /dev/null
177 @@ -1,11 +0,0 @@
178 -<?xml version="1.0" encoding="UTF-8"?>
179 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
180 -<pkgmetadata>
181 -<maintainer type="project">
182 - <email>gnome@g.o</email>
183 - <name>Gentoo GNOME Desktop</name>
184 -</maintainer>
185 -<use>
186 - <flag name="telepathy">Enable desktop sharing through a telepathy client</flag>
187 -</use>
188 -</pkgmetadata>
189
190 diff --git a/net-misc/vino/vino-3.22.0-r3.ebuild b/net-misc/vino/vino-3.22.0-r3.ebuild
191 deleted file mode 100644
192 index 2b7a49e24349..000000000000
193 --- a/net-misc/vino/vino-3.22.0-r3.ebuild
194 +++ /dev/null
195 @@ -1,77 +0,0 @@
196 -# Copyright 1999-2020 Gentoo Authors
197 -# Distributed under the terms of the GNU General Public License v2
198 -
199 -EAPI=6
200 -GNOME2_EAUTORECONF="yes"
201 -inherit gnome2 systemd
202 -
203 -DESCRIPTION="An integrated VNC server for GNOME"
204 -HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
205 -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
206 -
207 -LICENSE="GPL-2+"
208 -SLOT="0"
209 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
210 -IUSE="crypt debug gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
211 -# bug #394611; tight encoding requires zlib encoding
212 -REQUIRED_USE="jpeg? ( zlib )"
213 -
214 -# cairo used in vino-fb
215 -# libSM and libICE used in eggsmclient-xsmp
216 -RDEPEND="
217 - >=dev-libs/glib-2.26:2
218 - >=dev-libs/libgcrypt-1.1.90:0=
219 - >=x11-libs/gtk+-3:3
220 -
221 - x11-libs/cairo:=
222 - x11-libs/libICE
223 - x11-libs/libSM
224 - x11-libs/libX11
225 - x11-libs/libXdamage
226 - x11-libs/libXext
227 - x11-libs/libXfixes
228 - x11-libs/libXtst
229 - x11-libs/pango[X]
230 -
231 - >=x11-libs/libnotify-0.7.0:=
232 -
233 - crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
234 - gnome-keyring? ( app-crypt/libsecret )
235 - jpeg? ( virtual/jpeg:0= )
236 - ssl? ( >=net-libs/gnutls-2.2.0:= )
237 - telepathy? (
238 - dev-libs/dbus-glib
239 - >=net-libs/telepathy-glib-0.18 )
240 - zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
241 - zlib? ( sys-libs/zlib:= )
242 -"
243 -DEPEND="${RDEPEND}
244 - app-crypt/libsecret
245 - dev-util/glib-utils
246 - >=dev-util/intltool-0.50
247 - gnome-base/gnome-common
248 - virtual/pkgconfig
249 -"
250 -# libsecret is always required at build time per bug 322763
251 -# eautoreconf needs gnome-common
252 -
253 -PATCHES=(
254 - "${WORKDIR}"/patches/ # Patches from master branch at 2020-02-15 state; needs autoreconf
255 - "${FILESDIR}"/CVE-2014-6053.patch
256 - "${FILESDIR}"/CVE-2018-7225.patch
257 - "${FILESDIR}"/CVE-2019-15681.patch
258 -)
259 -
260 -src_configure() {
261 - gnome2_src_configure \
262 - $(use_enable ipv6) \
263 - $(use_with crypt gcrypt) \
264 - $(usex debug --enable-debug=yes ' ') \
265 - $(use_with gnome-keyring secret) \
266 - $(use_with jpeg) \
267 - $(use_with ssl gnutls) \
268 - $(use_with telepathy) \
269 - $(use_with zeroconf avahi) \
270 - $(use_with zlib) \
271 - --with-systemduserunitdir="$(systemd_get_userunitdir)"
272 -}
273
274 diff --git a/profiles/package.mask b/profiles/package.mask
275 index 60787568c7df..86dc874cfa3c 100644
276 --- a/profiles/package.mask
277 +++ b/profiles/package.mask
278 @@ -355,7 +355,6 @@ x11-misc/gcolor2
279 # Dead package upstream. No reverse dependencies.
280 # Removal on 2022-05-10
281 net-misc/vinagre
282 -net-misc/vino
283
284 # David Seifert <soap@g.o> (2022-04-10)
285 # Unmaintained, last release upstream 16 years ago, Fedora dropped it,