From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 4 16:24:52 2006 Return-Path: X-Original-To: freebsd-ports-bugs@freebsd.org Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 285D816A4D0; Wed, 4 Oct 2006 16:24:52 +0000 (UTC) (envelope-from fcash@ocis.net) Received: from smtp.sd73.bc.ca (mailtest.sd73.bc.ca [142.24.13.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4ABA43DC3; Wed, 4 Oct 2006 16:23:55 +0000 (GMT) (envelope-from fcash@ocis.net) Received: from localhost (localhost [127.0.0.1]) by localhost.sd73.bc.ca (Postfix) with ESMTP id 303FE8A0195; Wed, 4 Oct 2006 09:23:55 -0700 (PDT) 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 05366-24-2; Wed, 4 Oct 2006 09:23:52 -0700 (PDT) Received: from s10.sbo (s10.sbo [192.168.0.10]) by smtp.sd73.bc.ca (Postfix) with ESMTP id F31538A0198; Wed, 4 Oct 2006 09:23:51 -0700 (PDT) From: Freddie Cash To: pav@freebsd.org Date: Wed, 4 Oct 2006 09:23:50 -0700 User-Agent: KMail/1.9.4 References: <200610041558.k94FwO74002904@freefall.freebsd.org> <200610040904.48476.fcash@ocis.net> <1159978043.2066.35.camel@pav.hide.vol.cz> In-Reply-To: <1159978043.2066.35.camel@pav.hide.vol.cz> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_WA+IFqv1ZH2Jq6j" Message-Id: <200610040923.50877.fcash@ocis.net> X-Virus-Scanned: by amavisd-new using ClamAV at sd73.bc.ca X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-ports-bugs@freebsd.org Subject: Re: ports/103723: [PATCH] www/dansguardian-devel: update to 2.9.8.0 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: Wed, 04 Oct 2006 16:24:52 -0000 --Boundary-00=_WA+IFqv1ZH2Jq6j Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Wednesday 04 October 2006 09:07 am, Pav Lucistnik wrote: > Freddie Cash p=C3=AD=C5=A1e v st 04. 10. 2006 v 09:04 -0700: > > On Wednesday 04 October 2006 08:58 am, Pav Lucistnik wrote: > > > Synopsis: [PATCH] www/dansguardian-devel: update to 2.9.8.0 > > > State-Changed-From-To: open->feedback > > > State-Changed-By: pav > > > State-Changed-When: Wed Oct 4 15:57:46 UTC 2006 > > > State-Changed-Why: > > > freebsd-ports-bugstching file Makefile using Plan A... > > > patch: **** malformed patch at line 63: # > > > > > > The patch appears to be line wrapped. Can you resend, making sure > > > the patch arrives intact? > > > > How's this? There's a bzip'd copy attached as well, just in case the > > text attachment wraps. > > This one came in correctly, but it looks like being accidentally > generated between devel and non-devel port... Grrrrr, the "port" tool is not nearly as easy to use as it's billed to be. = =20 (Or else I'm just not nearly as smart as I'm billed to be.) :) Here's a manual diff -ruN of dansguardian-devel.orig/ and=20 dansguardian-devel/ =2D-=20 =46reddie Cash fcash@ocis.net --Boundary-00=_WA+IFqv1ZH2Jq6j Content-Type: text/x-diff; charset="utf-8"; name="dansguardian-devel.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="dansguardian-devel.diff" diff -ruN dansguardian-devel.orig/Makefile dansguardian-devel/Makefile --- dansguardian-devel.orig/Makefile Tue Jun 6 07:50:05 2006 +++ dansguardian-devel/Makefile Tue Sep 26 16:27:59 2006 @@ -6,7 +6,7 @@ # PORTNAME= dansguardian -PORTVERSION= 2.9.7.0 +PORTVERSION= 2.9.8.0 #PORTREVISION= 1 CATEGORIES= www MASTER_SITES= # empty, see below @@ -35,6 +35,8 @@ OPTIONS= DG_APACHE "Enable Apache support for access denied page" on \ DG_DMGR "Enable the fancy download manager" on \ + DG_TRICKLE "Enable the trickle download manager" on \ + DG_CLISCAN "Enable support for CLI content scanners" off \ DG_CLAMD "Enable ClamAV daemon support (clamd)" off \ DG_CLAMAV "Enable ClamAV library support (libclamav)" off \ DG_ICAP "Enable ICAP AV content scanner support (testing)" off \ @@ -53,9 +55,20 @@ USE_APACHE= 1.3+ .endif +.if defined(WITH_DG_TRICKLE) +CONFIGURE_ARGS+= --enable-trickledm +.endif + +.if defined(WITH_DG_CLISCAN) +CONFIGURE_ARGS+= --enable-commandline=yes +PLIST_SUB+= CLISCANCONF="" +.else +PLIST_SUB+= CLISCANCONF="@comment" +.endif + .if defined(WITH_DG_CLAMAV) #IGNORE= please use the clamd plugin support. It's much more flexible, usable, tested, and just generally better -CONFIGURE_ARGS+= --enable-clamav=yes +CONFIGURE_ARGS+= --enable-clamav LIB_DEPENDS+= clamav.1:${PORTSDIR}/security/clamav PLIST_SUB+= CLAMAVCONF="" .else @@ -63,7 +76,7 @@ .endif .if defined(WITH_DG_CLAMD) -CONFIGURE_ARGS+= --enable-clamd=yes +CONFIGURE_ARGS+= --enable-clamd RUN_DEPENDS+= ${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav PLIST_SUB+= CLAMDCONF="" .else @@ -86,7 +99,7 @@ PLIST_SUB+= KAVDCONF="@comment " .endif -.if defined(WITH_DG_CLAMD) || defined(WITH_DG_CLAMAV) || defined(WITH_DG_ICAP) || defined(WITH_DG_KASP) +.if defined(WITH_DG_CLAMD) || defined(WITH_DG_CLAMAV) || defined(WITH_DG_ICAP) || defined(WITH_DG_KASP) || defined(WITH_CLISCANCONF) PLIST_SUB+= SCANNERS="" .else PLIST_SUB+= SCANNERS="@comment " diff -ruN dansguardian-devel.orig/distinfo dansguardian-devel/distinfo --- dansguardian-devel.orig/distinfo Tue Jun 6 07:50:05 2006 +++ dansguardian-devel/distinfo Tue Sep 26 15:58:57 2006 @@ -1,3 +1,3 @@ -MD5 (dansguardian-2.9.7.0.tar.gz) = ab487a567065fa3f58981b31e2faa7a8 -SHA256 (dansguardian-2.9.7.0.tar.gz) = fb11b1827632f973a591362e6323ed52866e2a97a6681f4d3317106ead0f79a6 -SIZE (dansguardian-2.9.7.0.tar.gz) = 431030 +MD5 (dansguardian-2.9.8.0.tar.gz) = 2171456df5f04d038c31a34f3a9ddabe +SHA256 (dansguardian-2.9.8.0.tar.gz) = dd112f1169b7469f015b15425a879a01d83311d7659ea763e3913e149e5288f4 +SIZE (dansguardian-2.9.8.0.tar.gz) = 444242 diff -ruN dansguardian-devel.orig/pkg-plist dansguardian-devel/pkg-plist --- dansguardian-devel.orig/pkg-plist Tue Jun 6 07:50:05 2006 +++ dansguardian-devel/pkg-plist Tue Sep 26 16:26:21 2006 @@ -163,6 +163,7 @@ etc/dansguardian/lists/phraselists/goodphrases/weighted_general etc/dansguardian/lists/phraselists/goodphrases/weighted_general_danish etc/dansguardian/lists/phraselists/goodphrases/weighted_general_dutch +etc/dansguardian/lists/phraselists/goodphrases/weighted_general_malay etc/dansguardian/lists/phraselists/goodphrases/weighted_general_portuguese etc/dansguardian/lists/phraselists/goodphrases/weighted_news etc/dansguardian/lists/phraselists/goodphrases/exception @@ -183,18 +184,21 @@ etc/dansguardian/lists/phraselists/peer2peer/weighted etc/dansguardian/lists/phraselists/personals/weighted etc/dansguardian/lists/phraselists/personals/weighted_portuguese +etc/dansguardian/lists/phraselists/pornography/banned +etc/dansguardian/lists/phraselists/pornography/banned_portuguese etc/dansguardian/lists/phraselists/pornography/weighted +etc/dansguardian/lists/phraselists/pornography/weighted_chinese etc/dansguardian/lists/phraselists/pornography/weighted_danish etc/dansguardian/lists/phraselists/pornography/weighted_dutch etc/dansguardian/lists/phraselists/pornography/weighted_french etc/dansguardian/lists/phraselists/pornography/weighted_german etc/dansguardian/lists/phraselists/pornography/weighted_italian +etc/dansguardian/lists/phraselists/pornography/weighted_japanese +etc/dansguardian/lists/phraselists/pornography/weighted_malay etc/dansguardian/lists/phraselists/pornography/weighted_norgwegian etc/dansguardian/lists/phraselists/pornography/weighted_portuguese etc/dansguardian/lists/phraselists/pornography/weighted_russian etc/dansguardian/lists/phraselists/pornography/weighted_spanish -etc/dansguardian/lists/phraselists/pornography/banned -etc/dansguardian/lists/phraselists/pornography/banned_portuguese etc/dansguardian/lists/phraselists/proxies/weighted etc/dansguardian/lists/phraselists/sport/weighted etc/dansguardian/lists/phraselists/violence/weighted @@ -228,10 +232,12 @@ %%SCANNERS%%etc/dansguardian/lists/contentscanners/exceptionvirusurllist etc/dansguardian/downloadmanagers/default.conf etc/dansguardian/downloadmanagers/fancy.conf +etc/dansguardian/downloadmanagers/trickle.conf %%CLAMAVCONF%%etc/dansguardian/contentscanners/clamav.conf %%CLAMDCONF%%etc/dansguardian/contentscanners/clamdscan.conf %%KAVDCONF%%etc/dansguardian/contentscanners/kavdscan.conf %%ICAPCONF%%etc/dansguardian/contentscanners/icapscan.conf +%%CLISCANCONF%%etc/dansguardian/contentscanners/commandlinescan.conf etc/dansguardian/dansguardian.conf etc/dansguardian/dansguardianf1.conf @dirrm %%DATADIR%%/scripts --Boundary-00=_WA+IFqv1ZH2Jq6j--