From owner-svn-ports-all@FreeBSD.ORG Mon Jan 28 11:13:39 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AB562779; Mon, 28 Jan 2013 11:13:39 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9E648F28; Mon, 28 Jan 2013 11:13:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SBDdGs041602; Mon, 28 Jan 2013 11:13:39 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SBDcI0041597; Mon, 28 Jan 2013 11:13:38 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201301281113.r0SBDcI0041597@svn.freebsd.org> From: Renato Botelho Date: Mon, 28 Jan 2013 11:13:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311114 - in head/www/dansguardian-devel: . 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.14 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: Mon, 28 Jan 2013 11:13:39 -0000 Author: garga Date: Mon Jan 28 11:13:38 2013 New Revision: 311114 URL: http://svnweb.freebsd.org/changeset/ports/311114 Log: - Update to 2.12.0.3 [1] - Use USE_PKGCONFIG - Devel tarball is available at sourceforge, so use it and remove instructions for manual download PR: ports/175526 [1] Submitted by: Marcello Coutinho [1] Added: head/www/dansguardian-devel/files/patch-src__ConnectionHandler.cpp (contents, props changed) head/www/dansguardian-devel/files/patch-src__OptionContainer.cpp (contents, props changed) Modified: head/www/dansguardian-devel/Makefile head/www/dansguardian-devel/distinfo Modified: head/www/dansguardian-devel/Makefile ============================================================================== --- head/www/dansguardian-devel/Makefile Mon Jan 28 11:03:50 2013 (r311113) +++ head/www/dansguardian-devel/Makefile Mon Jan 28 11:13:38 2013 (r311114) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= dansguardian -PORTVERSION= 2.12.0.2 +PORTVERSION= 2.12.0.3 CATEGORIES= www -MASTER_SITES= # empty, see below +MASTER_SITES= SF/dansguardian MAINTAINER= garga@FreeBSD.org COMMENT= A fast, feature-rich web content filter for Squid proxy servers @@ -13,7 +13,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${P LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre USE_RC_SUBR= dansguardian -USE_GNOME= pkgconfig +USE_PKGCONFIG= yes USE_BZIP2= yes CONFLICTS= dansguardian-2.10.* @@ -114,11 +114,6 @@ PLIST_SUB+= EMAILCONF="@comment " CONFIGURE_ARGS+= --with-dgdebug .endif -# User needs to manually download the distfile -.if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})) && !defined(PACKAGE_BUILDING) -IGNORE= commercial source download is restricted. Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make -.endif - post-patch: .if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e '/install-data-am/ s|install-dist_docDATA||' \ Modified: head/www/dansguardian-devel/distinfo ============================================================================== --- head/www/dansguardian-devel/distinfo Mon Jan 28 11:03:50 2013 (r311113) +++ head/www/dansguardian-devel/distinfo Mon Jan 28 11:13:38 2013 (r311114) @@ -1,2 +1,2 @@ -SHA256 (dansguardian-2.12.0.2.tar.bz2) = 8f89077bf68e6d864c506193efc1d7a98e660650adb4edcb68b54c46f07f2fa0 -SIZE (dansguardian-2.12.0.2.tar.bz2) = 577994 +SHA256 (dansguardian-2.12.0.3.tar.bz2) = c74e9a32b97f9a9a056fced3da23fe48fca2bc6aa9af670afe9a53dc819414f5 +SIZE (dansguardian-2.12.0.3.tar.bz2) = 577701 Added: head/www/dansguardian-devel/files/patch-src__ConnectionHandler.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dansguardian-devel/files/patch-src__ConnectionHandler.cpp Mon Jan 28 11:13:38 2013 (r311114) @@ -0,0 +1,14 @@ +--- ./src/ConnectionHandler.cpp.orig 2012-09-29 17:06:45.000000000 -0300 ++++ ./src/ConnectionHandler.cpp 2013-01-16 03:04:07.000000000 -0200 +@@ -1488,8 +1488,11 @@ + + //if we cant write the certificate its not the end of the world but it is slow + if (!writecert){ ++#ifdef DGDEBUG + std::cout << dbgPeerPort << " -Couldn't save certificate to on disk cache" << std::endl; ++#endif + syslog(LOG_ERR,"Couldn't save certificate to on disk cache"); ++ + } + #ifdef DGDEBUG + Added: head/www/dansguardian-devel/files/patch-src__OptionContainer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dansguardian-devel/files/patch-src__OptionContainer.cpp Mon Jan 28 11:13:38 2013 (r311114) @@ -0,0 +1,11 @@ +--- ./src/OptionContainer.cpp.orig 2013-01-25 02:31:02.000000000 +0000 ++++ ./src/OptionContainer.cpp 2013-01-25 02:31:25.000000000 +0000 +@@ -612,7 +612,7 @@ + } + + // if the more than one port is being used, validate the combination of auth plugins +- if (authplugins.size() > 1) { ++ if (authplugins.size() > 1 and filter_ports.size() > 1) { + std::deque::iterator it = authplugins.begin(); + String firstPlugin; + bool sslused = false;