From owner-svn-ports-all@FreeBSD.ORG Thu May 21 18:18:38 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B21CA6AA; Thu, 21 May 2015 18:18:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A033412B1; Thu, 21 May 2015 18:18:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4LIIc2E047622; Thu, 21 May 2015 18:18:38 GMT (envelope-from nemysis@FreeBSD.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4LIIbXq047611; Thu, 21 May 2015 18:18:37 GMT (envelope-from nemysis@FreeBSD.org) Message-Id: <201505211818.t4LIIbXq047611@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nemysis set sender to nemysis@FreeBSD.org using -f From: Rusmir Dusko Date: Thu, 21 May 2015 18:18:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386949 - in head/irc/hexchat: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2015 18:18:38 -0000 Author: nemysis Date: Thu May 21 18:18:37 2015 New Revision: 386949 URL: https://svnweb.freebsd.org/changeset/ports/386949 Log: - Update to 2.10.2, announce message is here: http://hexchat.readthedocs.org/en/latest/changelog.html - Change master site from http://dl.hexchat.org/ to http://dl.hexchat.net - Remove obsolete REINPLACE, hexchat.appdata.xml install properly - Recreate patches, changed by upstream Modified: head/irc/hexchat/Makefile head/irc/hexchat/distinfo head/irc/hexchat/files/patch-src__common__server.c head/irc/hexchat/files/patch-src__common__ssl.c Modified: head/irc/hexchat/Makefile ============================================================================== --- head/irc/hexchat/Makefile Thu May 21 18:08:49 2015 (r386948) +++ head/irc/hexchat/Makefile Thu May 21 18:18:37 2015 (r386949) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= hexchat -PORTVERSION= 2.10.1 +PORTVERSION= 2.10.2 CATEGORIES= irc gnome ipv6 -MASTER_SITES= http://dl.hexchat.org/${PORTNAME}/ +MASTER_SITES= http://dl.hexchat.net/${PORTNAME}/ MAINTAINER= nemysis@FreeBSD.org COMMENT= IRC chat program with GTK and Text Frontend @@ -80,8 +80,6 @@ USE_GNOME+= gconf2 .endif post-patch: - @${REINPLACE_CMD} -e '/^appdata_DATA/s|hexchat.appdata.xml||' \ - ${WRKSRC}/data/misc/Makefile.in @${REINPLACE_CMD} -e 's|%%CA_BUNDLE%%|${CA_BUNDLE}|' \ ${WRKSRC}/src/common/server.c Modified: head/irc/hexchat/distinfo ============================================================================== --- head/irc/hexchat/distinfo Thu May 21 18:08:49 2015 (r386948) +++ head/irc/hexchat/distinfo Thu May 21 18:18:37 2015 (r386949) @@ -1,2 +1,2 @@ -SHA256 (hexchat-2.10.1.tar.xz) = ffccee6a3470d2f9539e75bd0dd2e3f35c65737004cb02e6d2106c1d5dcde9a9 -SIZE (hexchat-2.10.1.tar.xz) = 1618372 +SHA256 (hexchat-2.10.2.tar.xz) = 87ebf365c576656fa3f23f51d319b3a6d279e4a932f2f8961d891dd5a5e1b52c +SIZE (hexchat-2.10.2.tar.xz) = 1529732 Modified: head/irc/hexchat/files/patch-src__common__server.c ============================================================================== --- head/irc/hexchat/files/patch-src__common__server.c Thu May 21 18:08:49 2015 (r386948) +++ head/irc/hexchat/files/patch-src__common__server.c Thu May 21 18:18:37 2015 (r386949) @@ -1,11 +1,11 @@ ---- ./src/common/server.c.orig 2013-09-12 00:18:19.000000000 +0200 -+++ ./src/common/server.c 2014-04-12 16:12:48.778585855 +0200 -@@ -862,7 +862,7 @@ +--- 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 @@ /* it'll be a memory leak, if connection isn't terminated by server_cleanup() */ - serv->ssl = _SSL_socket (ctx, serv->sok); -- if ((err = _SSL_set_verify (ctx, ssl_cb_verify, NULL))) -+ if ((err = _SSL_set_verify (ctx, ssl_cb_verify, %%CA_BUNDLE%%))) + 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%%))) { EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, err, NULL, NULL, NULL, 0); Modified: head/irc/hexchat/files/patch-src__common__ssl.c ============================================================================== --- head/irc/hexchat/files/patch-src__common__ssl.c Thu May 21 18:08:49 2015 (r386948) +++ head/irc/hexchat/files/patch-src__common__ssl.c Thu May 21 18:18:37 2015 (r386949) @@ -1,6 +1,6 @@ ---- src/common/ssl.c.orig 2014-07-28 19:47:50 UTC -+++ src/common/ssl.c -@@ -310,7 +310,7 @@ +--- 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 @@ __SSL_fill_err_buf ("SSL_CTX_set_default_verify_paths"); return (err_buf); } @@ -9,7 +9,7 @@ if (cacert) { if (!SSL_CTX_load_verify_locations (ctx, cacert, NULL)) -@@ -319,7 +319,7 @@ +@@ -329,7 +329,7 @@ return (err_buf); } }