diff options
author | Michał Górny <mgorny@gentoo.org> | 2020-05-23 11:24:24 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2020-05-23 11:29:23 +0200 |
commit | c221e57b59ee49a37fb30025dffb3cfaa8bf1ee5 (patch) | |
tree | 67ae78dab6dd66f0245da24be0598290f8db6b91 /net-misc | |
parent | dev-ruby/gettext-setup: add missing dependency on git (diff) | |
download | gentoo-c221e57b59ee49a37fb30025dffb3cfaa8bf1ee5.tar.gz gentoo-c221e57b59ee49a37fb30025dffb3cfaa8bf1ee5.tar.bz2 gentoo-c221e57b59ee49a37fb30025dffb3cfaa8bf1ee5.zip |
net-misc/ssvnc: Remove last-rited pkg
Closes: https://bugs.gentoo.org/701820
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/ssvnc/Manifest | 1 | ||||
-rw-r--r-- | net-misc/ssvnc/files/Makefile.libvncauth | 7 | ||||
-rw-r--r-- | net-misc/ssvnc/files/Makefile.vncviewer | 8 | ||||
-rw-r--r-- | net-misc/ssvnc/files/ssvnc-1.0.29-build.patch | 44 | ||||
-rw-r--r-- | net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch | 199 | ||||
-rw-r--r-- | net-misc/ssvnc/metadata.xml | 8 | ||||
-rw-r--r-- | net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild | 64 |
7 files changed, 0 insertions, 331 deletions
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest deleted file mode 100644 index 1d3c1401a0c9..000000000000 --- a/net-misc/ssvnc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092 diff --git a/net-misc/ssvnc/files/Makefile.libvncauth b/net-misc/ssvnc/files/Makefile.libvncauth deleted file mode 100644 index c24ce4663d5d..000000000000 --- a/net-misc/ssvnc/files/Makefile.libvncauth +++ /dev/null @@ -1,7 +0,0 @@ -AR ?= ar -CPPFLAGS += -I. -I../include -D_GNU_SOURCE -srcs = $(wildcard *.c) -libvncauth.a: $(srcs:.c=.o) - $(AR) rc $@ $^ -clean: - rm -f *.[oa] diff --git a/net-misc/ssvnc/files/Makefile.vncviewer b/net-misc/ssvnc/files/Makefile.vncviewer deleted file mode 100644 index 4b6e745c697a..000000000000 --- a/net-misc/ssvnc/files/Makefile.vncviewer +++ /dev/null @@ -1,8 +0,0 @@ -CFLAGS += -fno-strength-reduce -fno-strict-aliasing -CPPFLAGS += -I. -I../include -D_GNU_SOURCE -DMITSHM -LDLIBS += ../libvncauth/libvncauth.a -lz -ljpeg -lXaw -lXmu -lXt -lXext -lX11 -include Makefile.in -all: vncviewer -vncviewer: $(SRCS:.c=.o) -clean: - rm -f *.[oa] vncviewer diff --git a/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch deleted file mode 100644 index 8d2db6f5cc7f..000000000000 --- a/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -21,11 +21,11 @@ - - # N.B. ?= is gnu make specific. Some of the subdir Makefiles are too. - # --PREFIX ?= /usr/local --ROOT ?= -+PREFIX = /usr -+ROOT = $(DESTDIR) - BIN = bin - LIB = lib/ssvnc - MAN = man --MANDIR ?= $(MAN) -+MANDIR = share/$(MAN) - APPS ?= share/applications - BINNAME ?= ssvncviewer -@@ -66,7 +66,6 @@ - - install: all - mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1 -- strip $(VIEWER) - cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB) - cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB) - cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB) ---- a/vncstorepw/Makefile -+++ b/vncstorepw/Makefile -@@ -14,7 +14,6 @@ - - $(CMD): vncauth.o vncstorepw.o d3des.o - PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o -- PATH=$$PATH:$(EPATH) strip $(CMD) - @ls -l $(CMD) - - $(UNWRAP): unwrap.c -@@ -41,7 +40,6 @@ - else \ - PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lcrypto; \ - fi -- PATH=$$PATH:$(EPATH) strip $(ULTDSM) - @ls -l $(ULTDSM) - - test: $(CMD) - 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 deleted file mode 100644 index 0ee278f9eea3..000000000000 --- a/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch +++ /dev/null @@ -1,199 +0,0 @@ ---- a/vncstorepw/ultravnc_dsm_helper.c -+++ b/vncstorepw/ultravnc_dsm_helper.c -@@ -414,7 +414,9 @@ void enc_do(char *ciph, char *keyfile, c - if (strstr(p, "md5+") == p) { - Digest = EVP_md5(); p += strlen("md5+"); - } else if (strstr(p, "sha+") == p) { -- Digest = EVP_sha(); p += strlen("sha+"); -+ fprintf(stderr, "%s: obsolete hash algorithm: SHA-0\n", -+ prog, s); -+ exit(1); - } else if (strstr(p, "sha1+") == p) { - Digest = EVP_sha1(); p += strlen("sha1+"); - } else if (strstr(p, "ripe+") == p) { -@@ -655,8 +657,10 @@ static void enc_xfer(int sock_fr, int so - */ - unsigned char E_keystr[EVP_MAX_KEY_LENGTH]; - unsigned char D_keystr[EVP_MAX_KEY_LENGTH]; -- EVP_CIPHER_CTX E_ctx, D_ctx; -- EVP_CIPHER_CTX *ctx = NULL; -+ //openssl1.1.patch - Do NOT create two context and only use one -+ // - that's silly. -+ //EVP_CIPHER_CTX *E_ctx, *D_ctx; -+ EVP_CIPHER_CTX *ctx; - - unsigned char buf[BSIZE], out[BSIZE]; - unsigned char *psrc = NULL, *keystr; -@@ -698,11 +702,14 @@ static void enc_xfer(int sock_fr, int so - encsym = encrypt ? "+" : "-"; - - /* use the encryption/decryption context variables below */ -+ ctx = EVP_CIPHER_CTX_new(); -+ if (!ctx) { -+ fprintf(stderr, "Failed to create encryption/decryption context.\n"); -+ goto finished; -+ } - if (encrypt) { -- ctx = &E_ctx; - keystr = E_keystr; - } else { -- ctx = &D_ctx; - keystr = D_keystr; - } - -@@ -797,7 +804,6 @@ static void enc_xfer(int sock_fr, int so - if (whoops) { - fprintf(stderr, "%s: %s - WARNING: MSRC4 mode and IGNORING random salt\n", prog, encstr); - fprintf(stderr, "%s: %s - WARNING: and initialization vector!!\n", prog, encstr); -- EVP_CIPHER_CTX_init(ctx); - if (pw_in) { - /* for pw=xxxx a md5 hash is used */ - EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata, -@@ -816,7 +822,6 @@ static void enc_xfer(int sock_fr, int so - - EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata, - keydata_len, 1, keystr, ivec); -- EVP_CIPHER_CTX_init(ctx); - EVP_CipherInit_ex(ctx, Cipher, NULL, keystr, ivec, - encrypt); - } -@@ -836,9 +841,9 @@ static void enc_xfer(int sock_fr, int so - in_salt = salt; - } - -- if (ivec_size < Cipher->iv_len && !securevnc) { -+ if (ivec_size < EVP_CIPHER_iv_length(Cipher) && !securevnc) { - fprintf(stderr, "%s: %s - WARNING: short IV %d < %d\n", -- prog, encstr, ivec_size, Cipher->iv_len); -+ prog, encstr, ivec_size, EVP_CIPHER_iv_length(Cipher)); - } - - /* make the hashed value and place in keystr */ -@@ -877,9 +882,6 @@ static void enc_xfer(int sock_fr, int so - } - - -- /* initialize the context */ -- EVP_CIPHER_CTX_init(ctx); -- - - /* set the cipher & initialize */ - -@@ -986,6 +988,7 @@ static void enc_xfer(int sock_fr, int so - /* transfer done (viewer exited or some error) */ - finished: - -+ if (ctx) EVP_CIPHER_CTX_free(ctx); - fprintf(stderr, "\n%s: %s - close sock_to\n", prog, encstr); - close(sock_to); - -@@ -1060,14 +1063,14 @@ static int securevnc_server_rsa_save_dia - } - - static char *rsa_md5_sum(unsigned char* rsabuf) { -- EVP_MD_CTX md; -+ EVP_MD_CTX *md = EVP_MD_CTX_create(); - char digest[EVP_MAX_MD_SIZE], tmp[16]; - char md5str[EVP_MAX_MD_SIZE * 8]; - unsigned int i, size = 0; - -- EVP_DigestInit(&md, EVP_md5()); -- EVP_DigestUpdate(&md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE); -- EVP_DigestFinal(&md, (unsigned char *)digest, &size); -+ EVP_DigestInit(md, EVP_md5()); -+ EVP_DigestUpdate(md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE); -+ EVP_DigestFinal(md, (unsigned char *)digest, &size); - - memset(md5str, 0, sizeof(md5str)); - for (i=0; i < size; i++) { -@@ -1075,6 +1078,7 @@ static char *rsa_md5_sum(unsigned char* - sprintf(tmp, "%02x", (int) uc); - strcat(md5str, tmp); - } -+ EVP_MD_CTX_destroy(md); - return strdup(md5str); - } - -@@ -1184,7 +1188,7 @@ static void sslexit(char *msg) { - - static void securevnc_setup(int conn1, int conn2) { - RSA *rsa = NULL; -- EVP_CIPHER_CTX init_ctx; -+ EVP_CIPHER_CTX *init_ctx = EVP_CIPHER_CTX_new(); - unsigned char keystr[EVP_MAX_KEY_LENGTH]; - unsigned char *rsabuf, *rsasav; - unsigned char *encrypted_keybuf; -@@ -1203,6 +1207,8 @@ static void securevnc_setup(int conn1, i - - ERR_load_crypto_strings(); - -+ if (!init_ctx) sslexit("securevnc_setup: EVP_CIPHER_CTX_new() failed"); -+ - /* alloc and read from server the 270 comprising the rsa public key: */ - rsabuf = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1); - rsasav = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1); -@@ -1323,8 +1329,7 @@ static void securevnc_setup(int conn1, i - /* - * Back to the work involving the tmp obscuring key: - */ -- EVP_CIPHER_CTX_init(&init_ctx); -- rc = EVP_CipherInit_ex(&init_ctx, EVP_rc4(), NULL, initkey, NULL, 1); -+ rc = EVP_CipherInit_ex(init_ctx, EVP_rc4(), NULL, initkey, NULL, 1); - if (rc == 0) { - sslexit("securevnc_setup: EVP_CipherInit_ex(init_ctx) failed"); - } -@@ -1340,13 +1345,13 @@ static void securevnc_setup(int conn1, i - /* decode with the tmp key */ - if (n > 0) { - memset(to_viewer, 0, sizeof(to_viewer)); -- if (EVP_CipherUpdate(&init_ctx, to_viewer, &len, buf, n) == 0) { -+ if (EVP_CipherUpdate(init_ctx, to_viewer, &len, buf, n) == 0) { - sslexit("securevnc_setup: EVP_CipherUpdate(init_ctx) failed"); - exit(1); - } - to_viewer_len = len; - } -- EVP_CIPHER_CTX_cleanup(&init_ctx); -+ EVP_CIPHER_CTX_free(init_ctx); - free(initkey); - - /* print what we would send to the viewer (sent below): */ -@@ -1407,7 +1412,7 @@ static void securevnc_setup(int conn1, i - - if (client_auth_req && client_auth) { - RSA *client_rsa = load_client_auth(client_auth); -- EVP_MD_CTX dctx; -+ EVP_MD_CTX *dctx = EVP_MD_CTX_create(); - unsigned char digest[EVP_MAX_MD_SIZE], *signature; - unsigned int ndig = 0, nsig = 0; - -@@ -1421,8 +1426,8 @@ static void securevnc_setup(int conn1, i - exit(1); - } - -- EVP_DigestInit(&dctx, EVP_sha1()); -- EVP_DigestUpdate(&dctx, keystr, SECUREVNC_KEY_SIZE); -+ EVP_DigestInit(dctx, EVP_sha1()); -+ EVP_DigestUpdate(dctx, keystr, SECUREVNC_KEY_SIZE); - /* - * Without something like the following MITM is still possible. - * This is because the MITM knows keystr and can use it with -@@ -1433,7 +1438,7 @@ static void securevnc_setup(int conn1, i - * he doesn't have Viewer_ClientAuth.pkey. - */ - if (0) { -- EVP_DigestUpdate(&dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE); -+ EVP_DigestUpdate(dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE); - if (!keystore_verified) { - fprintf(stderr, "securevnc_setup:\n"); - fprintf(stderr, "securevnc_setup: Warning: even *WITH* Client Authentication in SecureVNC,\n"); -@@ -1456,7 +1461,8 @@ static void securevnc_setup(int conn1, i - fprintf(stderr, "securevnc_setup:\n"); - } - } -- EVP_DigestFinal(&dctx, (unsigned char *)digest, &ndig); -+ EVP_DigestFinal(dctx, (unsigned char *)digest, &ndig); -+ EVP_MD_CTX_destroy(dctx); - - signature = (unsigned char *) calloc(RSA_size(client_rsa), 1); - RSA_sign(NID_sha1, digest, ndig, signature, &nsig, client_rsa); diff --git a/net-misc/ssvnc/metadata.xml b/net-misc/ssvnc/metadata.xml deleted file mode 100644 index 10e612cde180..000000000000 --- a/net-misc/ssvnc/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">ssvnc</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild deleted file mode 100644 index fbd99ff15127..000000000000 --- a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="VNC viewer that adds encryption security to VNC connections" -HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html" -SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="java" - -RDEPEND=" - sys-libs/zlib:0= - virtual/jpeg:0 - dev-libs/openssl:0= - dev-lang/tk:0= - net-misc/stunnel - java? ( virtual/jre:* ) - x11-terms/xterm - x11-libs/libXaw - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt -" -DEPEND="${RDEPEND} - java? ( virtual/jdk ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.29-build.patch - "${FILESDIR}"/${PN}-1.0.29-openssl1.1.patch -) - -src_prepare() { - default - - sed -i \ - -e "/^LIB/s:lib/:$(get_libdir)/:" \ - -e "$(use java || echo '/^JSRC/s:=.*:=:')" \ - Makefile || die - sed -i \ - -e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \ - vncstorepw/Makefile || die - - cp "${FILESDIR}"/Makefile.libvncauth vnc_unixsrc/libvncauth/Makefile || die - cd "${S}"/vnc_unixsrc/vncviewer || die - sed -n '/^SRCS/,/^$/p' Imakefile > Makefile.in || die - cp "${FILESDIR}"/Makefile.vncviewer Makefile || die -} - -src_compile() { - tc-export AR CC CXX RANLIB - emake all -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - einstalldocs -} |