diff --git a/srcpkgs/x11vnc/patches/patch-src_sslhelper_c.patch b/srcpkgs/x11vnc/patches/patch-src_sslhelper_c.patch deleted file mode 100644 index b3aace789d5..00000000000 --- a/srcpkgs/x11vnc/patches/patch-src_sslhelper_c.patch +++ /dev/null @@ -1,85 +0,0 @@ -$OpenBSD: patch-src_sslhelper_c,v 1.1 2018/08/09 15:04:21 sthen Exp $ - -Index: src/sslhelper.c ---- a/src/sslhelper.c -+++ b/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); diff --git a/srcpkgs/x11vnc/patches/time64.patch b/srcpkgs/x11vnc/patches/time64.patch deleted file mode 100644 index d8a6280f6d5..00000000000 --- a/srcpkgs/x11vnc/patches/time64.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/src/uinput.c.old 2019-01-05 13:22:11.000000000 +0000 -+++ b/src/uinput.c 2020-01-24 04:49:39.479206612 +0000 -@@ -710,6 +710,7 @@ - static void ptr_move(int dx, int dy) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tv; - int d = direct_rel_fd < 0 ? fd : direct_rel_fd; - - if (injectable && strchr(injectable, 'M') == NULL) { -@@ -720,7 +721,9 @@ - - if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d); - -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tv, NULL); -+ ev.input_event_sec = tv.tv_sec; -+ ev.input_event_usec = tv.tv_usec; - ev.type = EV_REL; - ev.code = REL_Y; - ev.value = dy; -@@ -755,6 +758,7 @@ - static void ptr_abs(int x, int y, int p) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tv; - int x0, y0; - int d = direct_abs_fd < 0 ? fd : direct_abs_fd; - -@@ -773,7 +777,9 @@ - - if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d); - -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tv, NULL); -+ ev.input_event_sec = tv.tv_sec; -+ ev.input_event_usec = tv.tv_usec; - ev.type = EV_ABS; - ev.code = ABS_Y; - ev.value = y; -@@ -950,6 +956,7 @@ - static void button_click(int down, int btn) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tv; - int d = direct_btn_fd < 0 ? fd : direct_btn_fd; - - if (injectable && strchr(injectable, 'B') == NULL) { -@@ -959,7 +966,9 @@ - if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d); - - memset(&ev, 0, sizeof(ev)); -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tv, NULL); -+ ev.input_event_sec = tv.tv_sec; -+ ev.input_event_usec = tv.tv_usec; - ev.type = EV_KEY; - ev.value = down; - -@@ -1230,6 +1239,7 @@ - void uinput_key_command(int down, int keysym, rfbClientPtr client) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tv; - int scancode; - allowed_input_t input; - int d = direct_key_fd < 0 ? fd : direct_key_fd; -@@ -1253,7 +1263,9 @@ - if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d); - - memset(&ev, 0, sizeof(ev)); -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tv, NULL); -+ ev.input_event_sec = tv.tv_sec; -+ ev.input_event_usec = tv.tv_usec; - ev.type = EV_KEY; - ev.code = (unsigned char) scancode; - ev.value = down; - diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template index 188b66dfbbf..92a5a676f2a 100644 --- a/srcpkgs/x11vnc/template +++ b/srcpkgs/x11vnc/template @@ -1,7 +1,7 @@ # Template file for 'x11vnc' pkgname=x11vnc -version=0.9.16 -revision=6 +version=0.9.17 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel @@ -12,14 +12,12 @@ license="GPL-2.0-or-later, x11vnc-openssl-exception" homepage="http://www.karlrunge.com/x11vnc/" changelog="https://raw.githubusercontent.com/LibVNC/x11vnc/master/NEWS" distfiles="https://github.com/LibVNC/x11vnc/archive/${version}.tar.gz" -checksum=885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd +checksum=3ab47c042bc1c33f00c7e9273ab674665b85ab10592a8e0425589fe7f3eb1a69 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then makedepends+=" libxcrypt-devel" fi -CFLAGS="-fcommon" - pre_configure() { autoreconf -fi }