diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile index 2c95f289fcc7..12f0bc497ab3 100644 --- a/net/x11vnc/Makefile +++ b/net/x11vnc/Makefile @@ -1,40 +1,40 @@ PORTNAME= x11vnc PORTVERSION= 0.9.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MAINTAINER= dinoex@FreeBSD.org COMMENT= VNC server for use with real X displays WWW= https://github.com/LibVNC/x11vnc LICENSE= GPLv2 LIB_DEPENDS= libvncserver.so:net/libvncserver USES= cpe iconv pkgconfig jpeg ssl gmake autoreconf xorg USE_XORG= x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \ xdmcp xi xorgproto # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} CPPFLAGS+= -I${LOCALBASE}/include USE_GITHUB= yes GH_ACCOUNT= LibVNC CPE_VENDOR= x11vnc_project PORTDOCS= AUTHORS ChangeLog NEWS README OPTIONS_DEFINE= NLS AVAHI DOCS OPTIONS_DEFAULT=AVAHI NO_OPTIONS_SORT=yes NLS_USES= gettext AVAHI_LIB_DEPENDS= libavahi-common.so:net/avahi-app AVAHI_CONFIGURE_OFF= --without-avahi post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .include diff --git a/net/x11vnc/files/patch-sslhelper.c b/net/x11vnc/files/patch-sslhelper.c new file mode 100644 index 000000000000..223495a207cb --- /dev/null +++ b/net/x11vnc/files/patch-sslhelper.c @@ -0,0 +1,32 @@ +--- src/sslhelper.c.orig 2019-01-05 13:22:11 UTC ++++ src/sslhelper.c +@@ -732,8 +732,10 @@ static void ssl_xfer(int csock, int s_in, int s_out, i + #include + + static SSL_CTX *ctx = NULL; ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + static RSA *rsa_512 = NULL; + static RSA *rsa_1024 = NULL; ++#endif + static SSL *ssl = NULL; + static X509_STORE *revocation_store = NULL; + +@@ -1063,8 +1065,9 @@ void openssl_init(int isclient) { + sslerrexit(); + } + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ds = dnow(); +- rsa_512 = RSA_generate_key(512, RSA_F4, NULL, NULL); ++ rsa_512 = RSA_generate_key_ex(512, RSA_F4, NULL, NULL); + if (rsa_512 == NULL) { + rfbLog("openssl_init: RSA_generate_key(512) failed.\n"); + sslerrexit(); +@@ -1087,6 +1090,7 @@ void openssl_init(int isclient) { + rfbLog("openssl_init: SSL_CTX_set_tmp_rsa(1024) failed.\n"); + sslerrexit(); + } ++#endif + + mode = 0; + mode |= SSL_MODE_ENABLE_PARTIAL_WRITE;