From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 20 18:20:20 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF5EE16A423 for ; Mon, 20 Mar 2006 18:20:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C35D43D55 for ; Mon, 20 Mar 2006 18:20:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2KIKJUj015921 for ; Mon, 20 Mar 2006 18:20:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2KIKJSk015920; Mon, 20 Mar 2006 18:20:19 GMT (envelope-from gnats) Resent-Date: Mon, 20 Mar 2006 18:20:19 GMT Resent-Message-Id: <200603201820.k2KIKJSk015920@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Freddie Cash Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7FA116A401 for ; Mon, 20 Mar 2006 18:15:03 +0000 (UTC) (envelope-from root@sd73.bc.ca) Received: from smtp.sd73.bc.ca (smtp.sd73.bc.ca [142.24.13.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50FAB43D6D for ; Mon, 20 Mar 2006 18:15:03 +0000 (GMT) (envelope-from root@sd73.bc.ca) Received: from localhost (localhost [127.0.0.1]) by localhost.sd73.bc.ca (Postfix) with ESMTP id 5BCF28A0029 for ; Mon, 20 Mar 2006 10:19:31 -0800 (PST) Received: from smtp.sd73.bc.ca ([127.0.0.1]) by localhost (smtp.sd73.bc.ca [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 08248-01-21 for ; Mon, 20 Mar 2006 10:19:24 -0800 (PST) Received: from imap.sd73.bc.ca (smtp.sd73.bc.ca [10.10.10.15]) by smtp.sd73.bc.ca (Postfix) with ESMTP id E03A98A0074 for ; Mon, 20 Mar 2006 10:19:23 -0800 (PST) Received: by imap.sd73.bc.ca (Postfix, from userid 0) id DEF3E18CC4C; Mon, 20 Mar 2006 10:14:54 -0800 (PST) Message-Id: <20060320181454.DEF3E18CC4C@imap.sd73.bc.ca> Date: Mon, 20 Mar 2006 10:14:54 -0800 (PST) From: Freddie Cash To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/94744: [MAINTAINER] www/dansguardian: update to 2.9.6.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 18:20:20 -0000 >Number: 94744 >Category: ports >Synopsis: [MAINTAINER] www/dansguardian: update to 2.9.6.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Mar 20 18:20:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Freddie Cash >Release: FreeBSD 6.0-STABLE i386 >Organization: School District 73 >Environment: System: FreeBSD imap.sd73.bc.ca 6.0-STABLE FreeBSD 6.0-STABLE #1: Fri Nov 4 10:41:38 PST >Description: - Update to 2.9.6.1 Changed the OPTIONS around a bit to make it more configurable, and to put the default enabled options first. Not sure if BROKEN is the correct macro to use for non-operational configs. Let me know if there is something better for this. There are some commented out sections to the Makefile. These are to make it even more configurable in the future. The DansGuardian devs are working to make the configure script/makefiles only create directories for the installed options, and to only install config files for enabled options. Once that is complete, the commented lines can be uncommented. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- dansguardian-2.9.6.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/dansguardian-devel.orig/Makefile /usr/ports/www/dansguardian-devel/Makefile --- /usr/ports/www/dansguardian-devel.orig/Makefile Mon Feb 20 09:36:33 2006 +++ /usr/ports/www/dansguardian-devel/Makefile Fri Mar 17 16:09:39 2006 @@ -6,7 +6,7 @@ # PORTNAME= dansguardian -PORTVERSION= 2.9.5.0 +PORTVERSION= 2.9.6.1 CATEGORIES= www MASTER_SITES= # empty, see below DISTNAME= ${PORTNAME}-${PORTVERSION} @@ -32,12 +32,12 @@ MAN8= dansguardian.8 -OPTIONS= DG_APACHE "Enable Apache support" on \ - DG_CLAMAV "Enable ClamAV support (libclamav)" off \ +OPTIONS= DG_APACHE "Enable Apache support for access denied page" on \ + DG_DMGR "Enable the fancy download manager" on \ DG_CLAMD "Enable ClamAV daemon support (clamd)" off \ - DG_ICAP "Enable ICAP AV content scanner support" off \ - DG_KASP "Enable Kaspersky AV support" off \ - DG_DMGR "Enable the fancy download manager" off + DG_CLAMAV "Enable ClamAV support (libclamav) (broken)" off \ + DG_ICAP "Enable ICAP AV content scanner support (broken)" off \ + DG_KASP "Enable Kaspersky AV support (broken)" off DG_URL= http://dansguardian.org/index.php?page=copyright2 CONFDIR= ${PREFIX}/etc/dansguardian @@ -53,13 +53,23 @@ .endif .if defined(WITH_DG_CLAMAV) -CONFIGURE_ARGS+= --enable-clamav=yes -LIB_DEPENDS+= clamav.1:${PORTSDIR}/security/clamav +#.if defined(WITH_DG_FORCE_CLAMAV) +#CONFIGURE_ARGS+= --enable-clamav=yes +#LIB_DEPENDS+= clamav.1:${PORTSDIR}/security/clamav +#PLIST_SUB+= CLAMAVCONF="" +#.else +#PLIST_SUB+= CLAMAVCONF="@comment " +#.endif +#.else +BROKEN= Please use the clamd plugin support. It's much more flexible, usable, tested, and just generally better .endif .if defined(WITH_DG_CLAMD) CONFIGURE_ARGS+= --enable-clamd=yes -RUN_DEPENDS+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 +RUN_DEPENDS+= ${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav +PLIST_SUB+= CLAMDCONF="" +.else +PLIST_SUB+= CLAMDCONF="@comment " .endif .if defined(WITH_DG_ICAP) @@ -72,6 +82,9 @@ .if defined(WITH_DG_DMGR) CONFIGURE_ARGS+= --enable-fancydm +#PLIST_SUB+= DMGR="" +#.else +#PLIST_SUB+= DMGR="@comment " .endif # User needs to manually download the distfile diff -ruN --exclude=CVS /usr/ports/www/dansguardian-devel.orig/distinfo /usr/ports/www/dansguardian-devel/distinfo --- /usr/ports/www/dansguardian-devel.orig/distinfo Mon Feb 20 09:36:33 2006 +++ /usr/ports/www/dansguardian-devel/distinfo Fri Mar 17 08:47:34 2006 @@ -1,3 +1,3 @@ -MD5 (dansguardian-2.9.5.0.tar.gz) = 40da3170df0b1f2def892316e13bcd9c -SHA256 (dansguardian-2.9.5.0.tar.gz) = 1dae71135b94f2b3ae9cf6d5cf066afcd6954b2444c60f9fe4febc8b946d9f2d -SIZE (dansguardian-2.9.5.0.tar.gz) = 411920 +MD5 (dansguardian-2.9.6.1.tar.gz) = f71621831c588fff3d3bd9b85987ead7 +SHA256 (dansguardian-2.9.6.1.tar.gz) = 4eb5ceff9bd5c7d657b05d7a2bb039a363b5ad17851067e82c8875391dfc78db +SIZE (dansguardian-2.9.6.1.tar.gz) = 418893 diff -ruN --exclude=CVS /usr/ports/www/dansguardian-devel.orig/pkg-plist /usr/ports/www/dansguardian-devel/pkg-plist --- /usr/ports/www/dansguardian-devel.orig/pkg-plist Mon Feb 20 09:36:33 2006 +++ /usr/ports/www/dansguardian-devel/pkg-plist Mon Mar 20 08:53:28 2006 @@ -7,6 +7,7 @@ @exec mkdir -p etc/dansguardian/lists/blacklists @exec mkdir -p etc/dansguardian/lists/blacklists/ads @exec mkdir -p etc/dansguardian/lists/contentscanners +@exec mkdir -p etc/dansguardian/lists/downloadmanagers @exec mkdir -p etc/dansguardian/lists/phraselists @exec mkdir -p etc/dansguardian/lists/phraselists/badwords @exec mkdir -p etc/dansguardian/lists/phraselists/chat @@ -138,8 +139,13 @@ etc/dansguardian/authplugins/ip.conf etc/dansguardian/authplugins/proxy-basic.conf etc/dansguardian/lists/authplugins/ipgroups +etc/dansguardian/lists/exceptionextensionlist +etc/dansguardian/lists/exceptionfilesitelist +etc/dansguardian/lists/exceptionmimetypelist etc/dansguardian/lists/blacklists/ads/domains etc/dansguardian/lists/blacklists/ads/urls +etc/dansguardian/lists/downloadmanagers/managedextensionlist +etc/dansguardian/lists/downloadmanagers/managedmimetypelist etc/dansguardian/lists/phraselists/badwords/weighted_dutch etc/dansguardian/lists/phraselists/badwords/weighted_french etc/dansguardian/lists/phraselists/badwords/weighted_german @@ -220,8 +226,7 @@ etc/dansguardian/lists/contentscanners/exceptionvirusurllist etc/dansguardian/downloadmanagers/default.conf etc/dansguardian/downloadmanagers/fancy.conf -etc/dansguardian/contentscanners/clamav.conf -etc/dansguardian/contentscanners/clamdscan.conf +%%CLAMDCONF%%etc/dansguardian/contentscanners/clamdscan.conf etc/dansguardian/dansguardian.conf etc/dansguardian/dansguardianf1.conf @dirrm %%DATADIR%%/scripts @@ -251,6 +256,7 @@ @dirrm %%DATADIR%%/languages @dirrm %%DATADIR%% @dirrm etc/dansguardian/lists/contentscanners +@dirrm etc/dansguardian/lists/downloadmanagers @dirrm etc/dansguardian/lists/phraselists/badwords @dirrm etc/dansguardian/lists/phraselists/chat @dirrm etc/dansguardian/lists/phraselists/drugadvocacy --- dansguardian-2.9.6.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: