Index: head/irc/hexchat/Makefile =================================================================== --- head/irc/hexchat/Makefile (revision 430472) +++ head/irc/hexchat/Makefile (revision 430473) @@ -1,103 +1,99 @@ # Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= hexchat PORTVERSION= 2.12.4 CATEGORIES= irc gnome ipv6 MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/archive/ DISTNAME= v${PORTVERSION} MAINTAINER= pkubaj@anongoth.pl COMMENT= IRC chat program with GTK and Text Frontend LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= devel/autoconf-archive>0:devel/autoconf-archive LIB_DEPENDS= libproxy.so:net/libproxy \ libfontconfig.so:x11-fonts/fontconfig \ libdbus-1.so:devel/dbus \ libfreetype.so:print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= autoreconf gmake desktop-file-utils libtool pkgconfig ssl USE_GNOME= cairo gtk20 intltool libxml2 USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-openssl --enable-gtkfe --disable-sysinfo \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ LUA=lua-${LUA_VER} INSTALLS_ICONS= yes INSTALL_TARGET= install-strip MAKE_ARGS= OBJC="${CC}" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lX11 SUB_FILES= pkg-message PORTDOCS= * OPTIONS_DEFINE= CA_BUNDLE CANBERRA DBUS DOCS FISHLIM LUA NLS NOTIFY \ PERL PYTHON SOCKS TEXTFE OPTIONS_DEFAULT= CA_BUNDLE CANBERRA DBUS NOTIFY PERL PYTHON OPTIONS_SUB= yes CA_BUNDLE_DESC= Include CA bundle for SSL verification CANBERRA_DESC= Audio support via Libcanberra FISHLIM_DESC= FiSHLiM plugin TEXTFE_DESC= Text frontend SOCKS_DESC= SOCKS proxy support, FORBIDDEN in FreeBSD 10+ CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra CANBERRA_CONFIGURE_ENABLE=libcanberra DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib DBUS_CONFIGURE_ENABLE= dbus DBUS_USE= GNOME=gconf2 FISHLIM_CONFIGURE_ENABLE=fishlim LUA_CONFIGURE_ENABLE= lua LUA_USES= lua LUA_USE= GCC=any NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_USES_OFF= gettext-tools # doesn't build otherwise NOTIFY_RUN_DEPENDS= notify-send:devel/libnotify NOTIFY_CONFIGURE_ENABLE=libnotify PERL_CONFIGURE_ENABLE= perl PERL_USES= perl5 PYTHON_CONFIGURE_ENABLE=python PYTHON_USES= python SOCKS_LIB_DEPENDS= libsocks.so:net/dante SOCKS_CONFIGURE_ENABLE= socks TEXTFE_CONFIGURE_ENABLE=textfe .include -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - .if ${PORT_OPTIONS:MCA_BUNDLE} CA_BUNDLE= "${LOCALBASE}/share/certs/ca-root-nss.crt" .else CA_BUNDLE= NULL .endif post-patch: @${REINPLACE_CMD} -e 's|%%CA_BUNDLE%%|${CA_BUNDLE}|' \ ${WRKSRC}/src/common/server.c post-install: ${LN} -sf ../share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR} .include Index: head/irc/hexchat/files/patch-src__common__ssl.c =================================================================== --- head/irc/hexchat/files/patch-src__common__ssl.c (revision 430472) +++ head/irc/hexchat/files/patch-src__common__ssl.c (revision 430473) @@ -1,20 +1,38 @@ --- src/common/ssl.c.orig 2016-12-10 14:30:51 UTC +++ src/common/ssl.c +@@ -176,7 +176,7 @@ _SSL_get_cert_info (struct cert_info *ce + return 1; + + alg = OBJ_obj2nid (algor->algorithm); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER + sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm); + #else + sign_alg = X509_get_signature_nid (peer_cert); +@@ -306,7 +306,7 @@ _SSL_socket (SSL_CTX *ctx, int sd) + + SSL_set_fd (ssl, sd); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER + method = ctx->method; + #else + method = SSL_CTX_get_ssl_method (ctx); @@ -328,7 +328,7 @@ _SSL_set_verify (SSL_CTX *ctx, void *ver __SSL_fill_err_buf ("SSL_CTX_set_default_verify_paths"); return (err_buf); } -/* + if (cacert) { if (!SSL_CTX_load_verify_locations (ctx, cacert, NULL)) @@ -337,7 +337,7 @@ _SSL_set_verify (SSL_CTX *ctx, void *ver return (err_buf); } } -*/ + SSL_CTX_set_verify (ctx, SSL_VERIFY_PEER, verify_callback); return (NULL);