Bug 103723

Summary: [PATCH] www/dansguardian-devel: update to 2.9.8.0
Product: Ports & Packages Reporter: Freddie Cash <fcash>
Component: Individual Port(s)Assignee: Pav Lucistnik <pav>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description Freddie Cash 2006-09-27 23:20:22 UTC 
- Update to 2.9.8.0

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

Generated with FreeBSD Port Tools 0.77

Fix: 

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

-- 
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--OBi19hmf25YVhFsFWl6ZFMamr3dLaTFVRD8HQZQbdFmv9RBn
Content-Type: text/plain; name="dansguardian-2.9.8.0.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="dansguardian-2.9.8.0.patch"

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
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-09-27 23:20:37 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback
Comment 2 Freddie Cash 2006-09-27 23:55:33 UTC 
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
Comment 3 Emanuel Haupt freebsd_committer freebsd_triage 2006-10-04 08:45:39 UTC 
State Changed
From-To: feedback->open

Feedback received. Fix synopsis: 

[PATCH] www/dansguardian: update to 2.9.8.0 -> 
[PATCH] www/dansguardian-devel: update to 2.9.8.0
Comment 4 Pav Lucistnik freebsd_committer freebsd_triage 2006-10-04 16:57:46 UTC 
State Changed
From-To: open->feedback

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?
Comment 5 Pav Lucistnik freebsd_committer freebsd_triage 2006-10-04 16:57:46 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pav

Track
Comment 6 Pav Lucistnik freebsd_committer freebsd_triage 2006-10-04 17:28:56 UTC 
State Changed
From-To: feedback->open

Got working patch in private mail
Comment 7 Pav Lucistnik freebsd_committer freebsd_triage 2006-10-04 17:36:32 UTC 
State Changed
From-To: open->closed

Committed with minor fixes.
Comment 8 dfilter service freebsd_committer freebsd_triage 2006-10-04 17:37:35 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"