Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ssvnc/, net-misc/ssvnc/files/, profiles/
Date: Sat, 23 May 2020 09:29:49
Message-Id: 1590226163.c221e57b59ee49a37fb30025dffb3cfaa8bf1ee5.mgorny@gentoo
1 commit: c221e57b59ee49a37fb30025dffb3cfaa8bf1ee5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 23 09:24:24 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat May 23 09:29:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c221e57b
7
8 net-misc/ssvnc: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/701820
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 net-misc/ssvnc/Manifest | 1 -
14 net-misc/ssvnc/files/Makefile.libvncauth | 7 -
15 net-misc/ssvnc/files/Makefile.vncviewer | 8 -
16 net-misc/ssvnc/files/ssvnc-1.0.29-build.patch | 44 -----
17 net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch | 199 ---------------------
18 net-misc/ssvnc/metadata.xml | 8 -
19 net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild | 64 -------
20 profiles/package.mask | 6 -
21 8 files changed, 337 deletions(-)
22
23 diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
24 deleted file mode 100644
25 index 1d3c1401a0c..00000000000
26 --- a/net-misc/ssvnc/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092
30
31 diff --git a/net-misc/ssvnc/files/Makefile.libvncauth b/net-misc/ssvnc/files/Makefile.libvncauth
32 deleted file mode 100644
33 index c24ce4663d5..00000000000
34 --- a/net-misc/ssvnc/files/Makefile.libvncauth
35 +++ /dev/null
36 @@ -1,7 +0,0 @@
37 -AR ?= ar
38 -CPPFLAGS += -I. -I../include -D_GNU_SOURCE
39 -srcs = $(wildcard *.c)
40 -libvncauth.a: $(srcs:.c=.o)
41 - $(AR) rc $@ $^
42 -clean:
43 - rm -f *.[oa]
44
45 diff --git a/net-misc/ssvnc/files/Makefile.vncviewer b/net-misc/ssvnc/files/Makefile.vncviewer
46 deleted file mode 100644
47 index 4b6e745c697..00000000000
48 --- a/net-misc/ssvnc/files/Makefile.vncviewer
49 +++ /dev/null
50 @@ -1,8 +0,0 @@
51 -CFLAGS += -fno-strength-reduce -fno-strict-aliasing
52 -CPPFLAGS += -I. -I../include -D_GNU_SOURCE -DMITSHM
53 -LDLIBS += ../libvncauth/libvncauth.a -lz -ljpeg -lXaw -lXmu -lXt -lXext -lX11
54 -include Makefile.in
55 -all: vncviewer
56 -vncviewer: $(SRCS:.c=.o)
57 -clean:
58 - rm -f *.[oa] vncviewer
59
60 diff --git a/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch
61 deleted file mode 100644
62 index 8d2db6f5cc7..00000000000
63 --- a/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch
64 +++ /dev/null
65 @@ -1,44 +0,0 @@
66 ---- a/Makefile
67 -+++ b/Makefile
68 -@@ -21,11 +21,11 @@
69 -
70 - # N.B. ?= is gnu make specific. Some of the subdir Makefiles are too.
71 - #
72 --PREFIX ?= /usr/local
73 --ROOT ?=
74 -+PREFIX = /usr
75 -+ROOT = $(DESTDIR)
76 - BIN = bin
77 - LIB = lib/ssvnc
78 - MAN = man
79 --MANDIR ?= $(MAN)
80 -+MANDIR = share/$(MAN)
81 - APPS ?= share/applications
82 - BINNAME ?= ssvncviewer
83 -@@ -66,7 +66,6 @@
84 -
85 - install: all
86 - mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1
87 -- strip $(VIEWER)
88 - cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
89 - cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
90 - cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
91 ---- a/vncstorepw/Makefile
92 -+++ b/vncstorepw/Makefile
93 -@@ -14,7 +14,6 @@
94 -
95 - $(CMD): vncauth.o vncstorepw.o d3des.o
96 - PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o
97 -- PATH=$$PATH:$(EPATH) strip $(CMD)
98 - @ls -l $(CMD)
99 -
100 - $(UNWRAP): unwrap.c
101 -@@ -41,7 +40,6 @@
102 - else \
103 - PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lcrypto; \
104 - fi
105 -- PATH=$$PATH:$(EPATH) strip $(ULTDSM)
106 - @ls -l $(ULTDSM)
107 -
108 - test: $(CMD)
109 -
110
111 diff --git a/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch b/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch
112 deleted file mode 100644
113 index 0ee278f9eea..00000000000
114 --- a/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch
115 +++ /dev/null
116 @@ -1,199 +0,0 @@
117 ---- a/vncstorepw/ultravnc_dsm_helper.c
118 -+++ b/vncstorepw/ultravnc_dsm_helper.c
119 -@@ -414,7 +414,9 @@ void enc_do(char *ciph, char *keyfile, c
120 - if (strstr(p, "md5+") == p) {
121 - Digest = EVP_md5(); p += strlen("md5+");
122 - } else if (strstr(p, "sha+") == p) {
123 -- Digest = EVP_sha(); p += strlen("sha+");
124 -+ fprintf(stderr, "%s: obsolete hash algorithm: SHA-0\n",
125 -+ prog, s);
126 -+ exit(1);
127 - } else if (strstr(p, "sha1+") == p) {
128 - Digest = EVP_sha1(); p += strlen("sha1+");
129 - } else if (strstr(p, "ripe+") == p) {
130 -@@ -655,8 +657,10 @@ static void enc_xfer(int sock_fr, int so
131 - */
132 - unsigned char E_keystr[EVP_MAX_KEY_LENGTH];
133 - unsigned char D_keystr[EVP_MAX_KEY_LENGTH];
134 -- EVP_CIPHER_CTX E_ctx, D_ctx;
135 -- EVP_CIPHER_CTX *ctx = NULL;
136 -+ //openssl1.1.patch - Do NOT create two context and only use one
137 -+ // - that's silly.
138 -+ //EVP_CIPHER_CTX *E_ctx, *D_ctx;
139 -+ EVP_CIPHER_CTX *ctx;
140 -
141 - unsigned char buf[BSIZE], out[BSIZE];
142 - unsigned char *psrc = NULL, *keystr;
143 -@@ -698,11 +702,14 @@ static void enc_xfer(int sock_fr, int so
144 - encsym = encrypt ? "+" : "-";
145 -
146 - /* use the encryption/decryption context variables below */
147 -+ ctx = EVP_CIPHER_CTX_new();
148 -+ if (!ctx) {
149 -+ fprintf(stderr, "Failed to create encryption/decryption context.\n");
150 -+ goto finished;
151 -+ }
152 - if (encrypt) {
153 -- ctx = &E_ctx;
154 - keystr = E_keystr;
155 - } else {
156 -- ctx = &D_ctx;
157 - keystr = D_keystr;
158 - }
159 -
160 -@@ -797,7 +804,6 @@ static void enc_xfer(int sock_fr, int so
161 - if (whoops) {
162 - fprintf(stderr, "%s: %s - WARNING: MSRC4 mode and IGNORING random salt\n", prog, encstr);
163 - fprintf(stderr, "%s: %s - WARNING: and initialization vector!!\n", prog, encstr);
164 -- EVP_CIPHER_CTX_init(ctx);
165 - if (pw_in) {
166 - /* for pw=xxxx a md5 hash is used */
167 - EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata,
168 -@@ -816,7 +822,6 @@ static void enc_xfer(int sock_fr, int so
169 -
170 - EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata,
171 - keydata_len, 1, keystr, ivec);
172 -- EVP_CIPHER_CTX_init(ctx);
173 - EVP_CipherInit_ex(ctx, Cipher, NULL, keystr, ivec,
174 - encrypt);
175 - }
176 -@@ -836,9 +841,9 @@ static void enc_xfer(int sock_fr, int so
177 - in_salt = salt;
178 - }
179 -
180 -- if (ivec_size < Cipher->iv_len && !securevnc) {
181 -+ if (ivec_size < EVP_CIPHER_iv_length(Cipher) && !securevnc) {
182 - fprintf(stderr, "%s: %s - WARNING: short IV %d < %d\n",
183 -- prog, encstr, ivec_size, Cipher->iv_len);
184 -+ prog, encstr, ivec_size, EVP_CIPHER_iv_length(Cipher));
185 - }
186 -
187 - /* make the hashed value and place in keystr */
188 -@@ -877,9 +882,6 @@ static void enc_xfer(int sock_fr, int so
189 - }
190 -
191 -
192 -- /* initialize the context */
193 -- EVP_CIPHER_CTX_init(ctx);
194 --
195 -
196 - /* set the cipher & initialize */
197 -
198 -@@ -986,6 +988,7 @@ static void enc_xfer(int sock_fr, int so
199 - /* transfer done (viewer exited or some error) */
200 - finished:
201 -
202 -+ if (ctx) EVP_CIPHER_CTX_free(ctx);
203 - fprintf(stderr, "\n%s: %s - close sock_to\n", prog, encstr);
204 - close(sock_to);
205 -
206 -@@ -1060,14 +1063,14 @@ static int securevnc_server_rsa_save_dia
207 - }
208 -
209 - static char *rsa_md5_sum(unsigned char* rsabuf) {
210 -- EVP_MD_CTX md;
211 -+ EVP_MD_CTX *md = EVP_MD_CTX_create();
212 - char digest[EVP_MAX_MD_SIZE], tmp[16];
213 - char md5str[EVP_MAX_MD_SIZE * 8];
214 - unsigned int i, size = 0;
215 -
216 -- EVP_DigestInit(&md, EVP_md5());
217 -- EVP_DigestUpdate(&md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE);
218 -- EVP_DigestFinal(&md, (unsigned char *)digest, &size);
219 -+ EVP_DigestInit(md, EVP_md5());
220 -+ EVP_DigestUpdate(md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE);
221 -+ EVP_DigestFinal(md, (unsigned char *)digest, &size);
222 -
223 - memset(md5str, 0, sizeof(md5str));
224 - for (i=0; i < size; i++) {
225 -@@ -1075,6 +1078,7 @@ static char *rsa_md5_sum(unsigned char*
226 - sprintf(tmp, "%02x", (int) uc);
227 - strcat(md5str, tmp);
228 - }
229 -+ EVP_MD_CTX_destroy(md);
230 - return strdup(md5str);
231 - }
232 -
233 -@@ -1184,7 +1188,7 @@ static void sslexit(char *msg) {
234 -
235 - static void securevnc_setup(int conn1, int conn2) {
236 - RSA *rsa = NULL;
237 -- EVP_CIPHER_CTX init_ctx;
238 -+ EVP_CIPHER_CTX *init_ctx = EVP_CIPHER_CTX_new();
239 - unsigned char keystr[EVP_MAX_KEY_LENGTH];
240 - unsigned char *rsabuf, *rsasav;
241 - unsigned char *encrypted_keybuf;
242 -@@ -1203,6 +1207,8 @@ static void securevnc_setup(int conn1, i
243 -
244 - ERR_load_crypto_strings();
245 -
246 -+ if (!init_ctx) sslexit("securevnc_setup: EVP_CIPHER_CTX_new() failed");
247 -+
248 - /* alloc and read from server the 270 comprising the rsa public key: */
249 - rsabuf = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1);
250 - rsasav = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1);
251 -@@ -1323,8 +1329,7 @@ static void securevnc_setup(int conn1, i
252 - /*
253 - * Back to the work involving the tmp obscuring key:
254 - */
255 -- EVP_CIPHER_CTX_init(&init_ctx);
256 -- rc = EVP_CipherInit_ex(&init_ctx, EVP_rc4(), NULL, initkey, NULL, 1);
257 -+ rc = EVP_CipherInit_ex(init_ctx, EVP_rc4(), NULL, initkey, NULL, 1);
258 - if (rc == 0) {
259 - sslexit("securevnc_setup: EVP_CipherInit_ex(init_ctx) failed");
260 - }
261 -@@ -1340,13 +1345,13 @@ static void securevnc_setup(int conn1, i
262 - /* decode with the tmp key */
263 - if (n > 0) {
264 - memset(to_viewer, 0, sizeof(to_viewer));
265 -- if (EVP_CipherUpdate(&init_ctx, to_viewer, &len, buf, n) == 0) {
266 -+ if (EVP_CipherUpdate(init_ctx, to_viewer, &len, buf, n) == 0) {
267 - sslexit("securevnc_setup: EVP_CipherUpdate(init_ctx) failed");
268 - exit(1);
269 - }
270 - to_viewer_len = len;
271 - }
272 -- EVP_CIPHER_CTX_cleanup(&init_ctx);
273 -+ EVP_CIPHER_CTX_free(init_ctx);
274 - free(initkey);
275 -
276 - /* print what we would send to the viewer (sent below): */
277 -@@ -1407,7 +1412,7 @@ static void securevnc_setup(int conn1, i
278 -
279 - if (client_auth_req && client_auth) {
280 - RSA *client_rsa = load_client_auth(client_auth);
281 -- EVP_MD_CTX dctx;
282 -+ EVP_MD_CTX *dctx = EVP_MD_CTX_create();
283 - unsigned char digest[EVP_MAX_MD_SIZE], *signature;
284 - unsigned int ndig = 0, nsig = 0;
285 -
286 -@@ -1421,8 +1426,8 @@ static void securevnc_setup(int conn1, i
287 - exit(1);
288 - }
289 -
290 -- EVP_DigestInit(&dctx, EVP_sha1());
291 -- EVP_DigestUpdate(&dctx, keystr, SECUREVNC_KEY_SIZE);
292 -+ EVP_DigestInit(dctx, EVP_sha1());
293 -+ EVP_DigestUpdate(dctx, keystr, SECUREVNC_KEY_SIZE);
294 - /*
295 - * Without something like the following MITM is still possible.
296 - * This is because the MITM knows keystr and can use it with
297 -@@ -1433,7 +1438,7 @@ static void securevnc_setup(int conn1, i
298 - * he doesn't have Viewer_ClientAuth.pkey.
299 - */
300 - if (0) {
301 -- EVP_DigestUpdate(&dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE);
302 -+ EVP_DigestUpdate(dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE);
303 - if (!keystore_verified) {
304 - fprintf(stderr, "securevnc_setup:\n");
305 - fprintf(stderr, "securevnc_setup: Warning: even *WITH* Client Authentication in SecureVNC,\n");
306 -@@ -1456,7 +1461,8 @@ static void securevnc_setup(int conn1, i
307 - fprintf(stderr, "securevnc_setup:\n");
308 - }
309 - }
310 -- EVP_DigestFinal(&dctx, (unsigned char *)digest, &ndig);
311 -+ EVP_DigestFinal(dctx, (unsigned char *)digest, &ndig);
312 -+ EVP_MD_CTX_destroy(dctx);
313 -
314 - signature = (unsigned char *) calloc(RSA_size(client_rsa), 1);
315 - RSA_sign(NID_sha1, digest, ndig, signature, &nsig, client_rsa);
316
317 diff --git a/net-misc/ssvnc/metadata.xml b/net-misc/ssvnc/metadata.xml
318 deleted file mode 100644
319 index 10e612cde18..00000000000
320 --- a/net-misc/ssvnc/metadata.xml
321 +++ /dev/null
322 @@ -1,8 +0,0 @@
323 -<?xml version="1.0" encoding="UTF-8"?>
324 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
325 -<pkgmetadata>
326 - <!-- maintainer-needed -->
327 - <upstream>
328 - <remote-id type="sourceforge">ssvnc</remote-id>
329 - </upstream>
330 -</pkgmetadata>
331
332 diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
333 deleted file mode 100644
334 index fbd99ff1512..00000000000
335 --- a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
336 +++ /dev/null
337 @@ -1,64 +0,0 @@
338 -# Copyright 1999-2019 Gentoo Authors
339 -# Distributed under the terms of the GNU General Public License v2
340 -
341 -EAPI=7
342 -inherit toolchain-funcs
343 -
344 -DESCRIPTION="VNC viewer that adds encryption security to VNC connections"
345 -HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html"
346 -SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz"
347 -
348 -LICENSE="GPL-2"
349 -SLOT="0"
350 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
351 -IUSE="java"
352 -
353 -RDEPEND="
354 - sys-libs/zlib:0=
355 - virtual/jpeg:0
356 - dev-libs/openssl:0=
357 - dev-lang/tk:0=
358 - net-misc/stunnel
359 - java? ( virtual/jre:* )
360 - x11-terms/xterm
361 - x11-libs/libXaw
362 - x11-libs/libX11
363 - x11-libs/libXext
364 - x11-libs/libXmu
365 - x11-libs/libXt
366 -"
367 -DEPEND="${RDEPEND}
368 - java? ( virtual/jdk )
369 -"
370 -
371 -PATCHES=(
372 - "${FILESDIR}"/${PN}-1.0.29-build.patch
373 - "${FILESDIR}"/${PN}-1.0.29-openssl1.1.patch
374 -)
375 -
376 -src_prepare() {
377 - default
378 -
379 - sed -i \
380 - -e "/^LIB/s:lib/:$(get_libdir)/:" \
381 - -e "$(use java || echo '/^JSRC/s:=.*:=:')" \
382 - Makefile || die
383 - sed -i \
384 - -e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \
385 - vncstorepw/Makefile || die
386 -
387 - cp "${FILESDIR}"/Makefile.libvncauth vnc_unixsrc/libvncauth/Makefile || die
388 - cd "${S}"/vnc_unixsrc/vncviewer || die
389 - sed -n '/^SRCS/,/^$/p' Imakefile > Makefile.in || die
390 - cp "${FILESDIR}"/Makefile.vncviewer Makefile || die
391 -}
392 -
393 -src_compile() {
394 - tc-export AR CC CXX RANLIB
395 - emake all
396 -}
397 -
398 -src_install() {
399 - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
400 - einstalldocs
401 -}
402
403 diff --git a/profiles/package.mask b/profiles/package.mask
404 index db42aa9a723..87f0fae5e65 100644
405 --- a/profiles/package.mask
406 +++ b/profiles/package.mask
407 @@ -670,12 +670,6 @@ dev-python/potr
408 dev-python/fabric
409 dev-python/invoke
410
411 -# Michał Górny <mgorny@g.o> (2020-04-16)
412 -# Unmaintained. Last release in 2011. Multiple vulnerabilities
413 -# via bundled code.
414 -# Removal in 30 days. Bug #701820.
415 -net-misc/ssvnc
416 -
417 # Matt Turner <mattst88@g.o> (2020-04-12)
418 # In conjunction with Firefox's sandbox, breaks loading of i965 driver.
419 # Bug #716574