From fcash@ocis.net  Wed Sep 27 22:16:48 2006
Return-Path: <fcash@ocis.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BAE6016A47E
	for <freebsd-gnats-submit@freebsd.org>; Wed, 27 Sep 2006 22:16:48 +0000 (UTC)
	(envelope-from fcash@ocis.net)
Received: from smtp.sd73.bc.ca (smtp.sd73.bc.ca [142.24.13.140])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1B08043D6E
	for <freebsd-gnats-submit@freebsd.org>; Wed, 27 Sep 2006 22:16:35 +0000 (GMT)
	(envelope-from fcash@ocis.net)
Received: from localhost (localhost [127.0.0.1])
	by localhost.sd73.bc.ca (Postfix) with ESMTP id 77DC88A00D1
	for <freebsd-gnats-submit@freebsd.org>; Wed, 27 Sep 2006 15:16:35 -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 10723-16 for <freebsd-gnats-submit@freebsd.org>;
 Wed, 27 Sep 2006 15:16:27 -0700 (PDT)
Received: from s10.sbo (s10.sbo [192.168.0.10])
	by smtp.sd73.bc.ca (Postfix) with ESMTP id 2E09A8A0100
	for <freebsd-gnats-submit@freebsd.org>; Wed, 27 Sep 2006 15:16:27 -0700 (PDT)
Message-Id: <200609271516.26034.fcash@ocis.net>
Date: Wed, 27 Sep 2006 15:16:25 -0700
From: Freddie Cash <fcash@ocis.net>
To: freebsd-gnats-submit@freebsd.org
Subject: [PATCH] www/dansguardian: update to 2.9.8.0

>Number:         103723
>Category:       ports
>Synopsis:       [PATCH] www/dansguardian-devel: update to 2.9.8.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 27 22:20:22 GMT 2006
>Closed-Date:    Wed Oct 04 16:36:43 GMT 2006
>Last-Modified:  Wed Oct  4 16:40:20 GMT 2006
>Originator:     Freddie Cash
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD imap.sd73.bc.ca 6.1-RELEASE FreeBSD 6.1-RELEASE #1: Thu May 25 17:54:30 PDT 2006
>Description:
- Update to 2.9.8.0

Port maintainer (fcash@sd73.bc.ca) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- dansguardian-2.9.8.0.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	Tue Jun  6 07:50:05 2006
 +++ /usr/ports/www/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 --exclude=CVS /usr/ports/www/dansguardian-devel.orig/distinfo
 /usr/ports/www/dansguardian-devel/distinfo ---
 /usr/ports/www/dansguardian-devel.orig/distinfo	Tue Jun  6 07:50:05 2006
 +++ /usr/ports/www/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 --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	Tue Jun  6 07:50:05
 2006 +++ /usr/ports/www/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_portugue
se 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
--- dansguardian-2.9.8.0.patch ends here ---

-------------------------------------------------------

-- 
Freddie Cash
fcash@ocis.net

--Boundary-00=_5gvGFDlPLrzycHt
Content-Type: text/plain;
  name="[PATCH] www/dansguardian: update to 2.9.8.0"
Content-Transfer-Encoding: 7bit


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Sep 27 22:20:37 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103723 

From: Freddie Cash <fcash@ocis.net>
To: bug-followup@freebsd.org
Cc: Edwin Groothuis <edwin@freebsd.org>
Subject: Re: ports/103723: [PATCH] www/dansguardian: update to 2.9.8.0
Date: Wed, 27 Sep 2006 15:55:33 -0700

 On Wednesday 27 September 2006 03:20 pm, Edwin Groothuis wrote:
 > Maintainer of www/dansguardian,
 >
 > Please note that PR ports/103723 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/103723
 
 Sorry, this patch is to update www/dansguardian-devel, not 
 www/dansguardian.  I'm the maintainer of the port, so the patch is good, 
 but it's logged against the wrong port.  Having issues with the porttools 
 port submit feature.
 
 -- 
 Freddie Cash
 fcash@ocis.net
State-Changed-From-To: feedback->open 
State-Changed-By: ehaupt 
State-Changed-When: Wed Oct 4 09:45:39 CEST 2006 
State-Changed-Why:  
Feedback received. Fix synopsis: 

[PATCH] www/dansguardian: update to 2.9.8.0 -> 
[PATCH] www/dansguardian-devel: update to 2.9.8.0 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103723 
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? 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Oct 4 15:57:46 UTC 2006 
Responsible-Changed-Why:  
Track 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103723 
State-Changed-From-To: feedback->open 
State-Changed-By: pav 
State-Changed-When: Wed Oct 4 16:28:56 UTC 2006 
State-Changed-Why:  
Got working patch in private mail 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103723 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Oct 4 16:36:32 UTC 2006 
State-Changed-Why:  
Committed with minor fixes. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103723 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103723: commit references a PR
Date: Wed,  4 Oct 2006 16:37:35 +0000 (UTC)

 pav         2006-10-04 16:36:30 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/dansguardian-devel Makefile distinfo pkg-plist 
   Log:
   - Update to 2.9.8.0
   
   PR:             ports/103723
   Submitted by:   Freddie Cash <fcash@ocis.net> (maintainer)
   
   Revision  Changes    Path
   1.23      +17 -4     ports/www/dansguardian-devel/Makefile
   1.14      +3 -3      ports/www/dansguardian-devel/distinfo
   1.12      +8 -2      ports/www/dansguardian-devel/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
 --Boundary-00=_5gvGFDlPLrzycHt
 Content-Type: text/plain;
   charset="utf-8"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
