Index: head/irc/hexchat/Makefile =================================================================== --- head/irc/hexchat/Makefile (revision 428679) +++ head/irc/hexchat/Makefile (revision 428680) @@ -1,101 +1,103 @@ # Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= hexchat -PORTVERSION= 2.12.3 +PORTVERSION= 2.12.4 CATEGORIES= irc gnome ipv6 -MASTER_SITES= http://dl.hexchat.net/${PORTNAME}/ +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 -USES= gmake desktop-file-utils libtool pkgconfig tar:xz ssl +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 DOAT DOCS FISHLIM LUA NLS NOTIFY \ +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 -DOAT_DESC= Do At plugin 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 -DOAT_CONFIGURE_ENABLE= doat 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/distinfo =================================================================== --- head/irc/hexchat/distinfo (revision 428679) +++ head/irc/hexchat/distinfo (revision 428680) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477276791 -SHA256 (hexchat-2.12.3.tar.xz) = 6f2b22372c7a9ed8ffab817079638e8f4178f5f8ba63c89cb3baa01be614f2ba -SIZE (hexchat-2.12.3.tar.xz) = 1577736 +TIMESTAMP = 1481549280 +SHA256 (v2.12.4.tar.gz) = eb9ebe45b1c9e39543517b48d63caa2f2736e82a8dbbd1da96132070752f8084 +SIZE (v2.12.4.tar.gz) = 2780008 Index: head/irc/hexchat/files/patch-src__common__server.c =================================================================== --- head/irc/hexchat/files/patch-src__common__server.c (revision 428679) +++ head/irc/hexchat/files/patch-src__common__server.c (revision 428680) @@ -1,11 +1,11 @@ ---- src/common/server.c.orig 2014-11-25 18:42:31.000000000 +0100 -+++ src/common/server.c 2015-05-21 15:48:24.162789182 +0200 -@@ -875,7 +875,7 @@ +--- src/common/server.c.orig 2016-12-10 14:30:51 UTC ++++ src/common/server.c +@@ -743,7 +743,7 @@ server_connect_success (server *serv) /* it'll be a memory leak, if connection isn't terminated by server_cleanup() */ serv->ssl = _SSL_socket (serv->ctx, serv->sok); - if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, NULL))) -+ if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, %%CA_BUNDLE%%))) ++ if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, "/usr/local/share/certs/ca-root-nss.crt"))) { EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, err, NULL, NULL, NULL, 0); Index: head/irc/hexchat/files/patch-src__common__ssl.c =================================================================== --- head/irc/hexchat/files/patch-src__common__ssl.c (revision 428679) +++ head/irc/hexchat/files/patch-src__common__ssl.c (revision 428680) @@ -1,20 +1,20 @@ ---- src/common/ssl.c.orig 2014-11-25 18:42:31.000000000 +0100 -+++ src/common/ssl.c 2015-05-21 15:58:31.403630733 +0200 -@@ -320,7 +320,7 @@ +--- src/common/ssl.c.orig 2016-12-10 14:30:51 UTC ++++ src/common/ssl.c +@@ -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)) -@@ -329,7 +329,7 @@ +@@ -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); Index: head/irc/hexchat/pkg-plist =================================================================== --- head/irc/hexchat/pkg-plist (revision 428679) +++ head/irc/hexchat/pkg-plist (revision 428680) @@ -1,69 +1,68 @@ bin/hexchat %%TEXTFE%%bin/hexchat-text include/hexchat-plugin.h lib/hexchat/plugins/checksum.so -%%DOAT%%lib/hexchat/plugins/doat.so %%FISHLIM%%lib/hexchat/plugins/fishlim.so %%PERL%%lib/hexchat/plugins/perl.so %%PYTHON%%lib/hexchat/plugins/python.so libdata/pkgconfig/hexchat-plugin.pc man/man1/hexchat.1.gz share/appdata/hexchat.appdata.xml share/applications/hexchat.desktop %%DBUS%%share/dbus-1/services/org.hexchat.service.service share/icons/hicolor/48x48/apps/hexchat.png share/icons/hicolor/scalable/apps/hexchat.svg %%NLS%%share/locale/af/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/am/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/ast/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/az/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/be/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/bg/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/ca/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/cs/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/da/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/de/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/el/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/es/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/et/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/eu/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/fi/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/fr/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/gl/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/gu/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/hi/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/hu/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/id/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/it/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/ja_JP/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/kn/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/ko/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/lt/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/lv/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/mk/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/ml/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/ms/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/nb/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/nl/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/no/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/pa/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/pl/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/pt/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/ru/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/rw/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/sk/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/sl/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/sq/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/sr/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/sv/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/th/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/tr/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/uk/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/vi/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/wa/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/hexchat.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/hexchat.mo share/pixmaps/hexchat.png