snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Activity

x11vnc: unbreak libressl-2.3 (OpenBSD patch)

This commit is contained in:
Michael Gehring 2016-03-31 01:48:31 +02:00
parent 4068c55709
commit d0795d347c
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
srcpkgs/x11vnc/patches/patch-x11vnc_enc_h Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-x11vnc_enc_h,v 1.2 2015/09/16 10:43:18 sthen Exp $
LibreSSL 2.3 gets rid of SHA-0 (EVP_sha).
OpenSSL has no targetted way to disable this, thus OPENSSL_NO_SHA0 is
LibreSSL-only at prsent.
--- x11vnc/enc.h.orig Wed Sep 16 04:32:40 2015
+++ x11vnc/enc.h Wed Sep 16 04:35:00 2015
@@ -454,8 +454,10 @@ extern void enc_do(char *ciph, char *keyfile, char *lp
p++;
if (strstr(p, "md5+") == p) {
Digest = EVP_md5(); p += strlen("md5+");
+#ifndef OPENSSL_NO_SHA0
} else if (strstr(p, "sha+") == p) {
Digest = EVP_sha(); p += strlen("sha+");
+#endif
} else if (strstr(p, "sha1+") == p) {
Digest = EVP_sha1(); p += strlen("sha1+");
} else if (strstr(p, "ripe+") == p) {
@@ -1407,7 +1409,7 @@ static void securevnc_setup(int conn1, int conn2) {
fprintf(stderr, "securevnc_setup: RAND_pseudo_bytes() rc=%d\n", rc);
if (getenv("RANDSTR")) {
char *s = getenv("RANDSTR");
- fprintf(stderr, "securevnc_setup: seeding with RANDSTR len=%d\n", strlen(s));
+ fprintf(stderr, "securevnc_setup: seeding with RANDSTR len=%zd\n", strlen(s));
RAND_add(s, strlen(s), strlen(s));
}
}

1
srcpkgs/x11vnc/template
View File

@ -2,7 +2,6 @@
pkgname=x11vnc
version=0.9.13
revision=10
broken="http://build.voidlinux.eu/builders/armv6l-musl_builder/builds/9737/steps/shell_3/logs/stdio" # EVP_sha
build_style=gnu-configure
makedepends="zlib-devel libX11-devel libXtst-devel libXinerama-devel libXdamage-devel libXrandr-devel libressl-devel libjpeg-turbo-devel"
short_desc="VNC server for real X displays"