x11vnc: update to 0.9.15.
This commit is contained in:
prspkt
maxice8
parent
4c7a7fbb58
commit
ae9f40df0c
3 changed files with 97 additions and 39 deletions
85
srcpkgs/x11vnc/patches/patch-src_sslhelper_c.patch
Normal file
85
srcpkgs/x11vnc/patches/patch-src_sslhelper_c.patch
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
$OpenBSD: patch-src_sslhelper_c,v 1.1 2018/08/09 15:04:21 sthen Exp $
|
||||
|
||||
Index: src/sslhelper.c
|
||||
--- src/sslhelper.c.orig
|
||||
+++ src/sslhelper.c
|
||||
@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, in
|
||||
static int crl_callback(X509_STORE_CTX *callback_ctx) {
|
||||
const ASN1_INTEGER *revoked_serial;
|
||||
X509_STORE_CTX *store_ctx;
|
||||
-#if OPENSSL_VERSION_NUMBER > 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
X509_OBJECT *obj;
|
||||
#else
|
||||
X509_OBJECT obj;
|
||||
@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
|
||||
* the current certificate in order to verify it's integrity. */
|
||||
store_ctx = X509_STORE_CTX_new();
|
||||
X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
|
||||
-#if OPENSSL_VERSION_NUMBER > 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
obj = X509_OBJECT_new();
|
||||
rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);
|
||||
crl = X509_OBJECT_get0_X509_CRL(obj);
|
||||
@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
|
||||
rfbLog("Invalid signature on CRL\n");
|
||||
X509_STORE_CTX_set_error(callback_ctx,
|
||||
X509_V_ERR_CRL_SIGNATURE_FAILURE);
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
X509_OBJECT_free(obj);
|
||||
#else
|
||||
X509_OBJECT_free_contents(&obj);
|
||||
@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
|
||||
rfbLog("Found CRL has invalid nextUpdate field\n");
|
||||
X509_STORE_CTX_set_error(callback_ctx,
|
||||
X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
X509_OBJECT_free(obj);
|
||||
#else
|
||||
X509_OBJECT_free_contents(&obj);
|
||||
@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
|
||||
rfbLog("Found CRL is expired - "
|
||||
"revoking all certificates until you get updated CRL\n");
|
||||
X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED);
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
X509_OBJECT_free(obj);
|
||||
#else
|
||||
X509_OBJECT_free_contents(&obj);
|
||||
#endif
|
||||
return 0; /* Reject connection */
|
||||
}
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
X509_OBJECT_free(obj);
|
||||
#else
|
||||
X509_OBJECT_free_contents(&obj);
|
||||
@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
|
||||
* the current certificate in order to check for revocation. */
|
||||
store_ctx = X509_STORE_CTX_new();
|
||||
X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
|
||||
-#if OPENSSL_VERSION_NUMBER > 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
obj = X509_OBJECT_new();
|
||||
rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);
|
||||
crl = X509_OBJECT_get0_X509_CRL(obj);
|
||||
@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
|
||||
"revoked per CRL from issuer %s\n", serial, serial, cp);
|
||||
OPENSSL_free(cp);
|
||||
X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED);
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
X509_OBJECT_free(obj);
|
||||
#else
|
||||
X509_OBJECT_free_contents(&obj);
|
||||
@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
|
||||
return 0; /* Reject connection */
|
||||
}
|
||||
}
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
X509_OBJECT_free(obj);
|
||||
#else
|
||||
X509_OBJECT_free_contents(&obj);
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
$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,17 +1,19 @@
|
|||
# Template file for 'x11vnc'
|
||||
pkgname=x11vnc
|
||||
version=0.9.13
|
||||
revision=14
|
||||
version=0.9.15
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
makedepends="zlib-devel libX11-devel libXtst-devel libXinerama-devel libXdamage-devel libXrandr-devel libressl-devel libjpeg-turbo-devel"
|
||||
hostmakedepends="automake libtool pkg-config"
|
||||
makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
|
||||
libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
|
||||
short_desc="VNC server for real X displays"
|
||||
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
|
||||
license="GPL-2"
|
||||
maintainer="Leah Neukirchen <leah@vuxu.org>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="http://www.karlrunge.com/x11vnc/"
|
||||
distfiles="${SOURCEFORGE_SITE}/libvncserver/${pkgname}/${pkgname}-${version}.tar.gz"
|
||||
checksum=f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b
|
||||
changelog="https://raw.githubusercontent.com/LibVNC/x11vnc/master/NEWS"
|
||||
distfiles="https://github.com/LibVNC/${pkgname}/archive/${version}.tar.gz"
|
||||
checksum=3e43bd875edc3c7f52a0d3676c4ec7de910fcd210240ee20b4522deb2bf84cff
|
||||
|
||||
post_install() {
|
||||
rm -r ${DESTDIR}/usr/include/rfb
|
||||
rm -r ${DESTDIR}/usr/share/x11vnc
|
||||
pre_configure() {
|
||||
autoreconf -fi
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue