Attachment 63824 Details for Bug 95089 – dansguardian-2.9.6.1_1.patch

[patch] dansguardian-2.9.6.1_1.patch

dansguardian-2.9.6.1_1.patch (text/plain), 6.43 KB, created by Freddie Cash on 2006-03-30 00:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Freddie Cash

Created: 2006-03-30 00:40:16 UTC

Size: 6.43 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/www/dansguardian-devel.orig/Makefile /usr/ports/www/dansguardian-devel/Makefile
>--- /usr/ports/www/dansguardian-devel.orig/Makefile	Wed Mar 29 15:27:09 2006
>+++ /usr/ports/www/dansguardian-devel/Makefile	Wed Mar 29 15:27:47 2006
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	dansguardian
> PORTVERSION=	2.9.6.1
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	# empty, see below
> DISTNAME=	${PORTNAME}-${PORTVERSION}
>@@ -35,7 +36,7 @@
> 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_CLAMAV  "Enable ClamAV support (libclamav) (broken)" off \
>+		DG_CLAMAV  "Enable ClamAV library support (libclamav)" off \
> 		DG_ICAP    "Enable ICAP AV content scanner support (broken)" off \
> 		DG_KASP    "Enable Kaspersky AV support (broken)" off
> 
>@@ -53,15 +54,12 @@
> .endif
> 
> .if defined(WITH_DG_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
>+#IGNORE=		please use the clamd plugin support.  It's much more flexible, usable, tested, and just generally better
>+CONFIGURE_ARGS+=	--enable-clamav=yes
>+LIB_DEPENDS+=		clamav.1:${PORTSDIR}/security/clamav
>+PLIST_SUB+=		CLAMAVCONF=""
>+.else
>+PLIST_SUB+=		CLAMAVCONF="@comment "
> .endif
> 
> .if defined(WITH_DG_CLAMD)
>@@ -73,11 +71,19 @@
> .endif
> 
> .if defined(WITH_DG_ICAP)
>-BROKEN=	I don't have access to ICAP AV, so I can't test this.  If you have access to it, drop me an e-mail.  Thanks
>+#IGNORE=		I don't have access to ICAP AV, so I can't test this.  If you have access to it, drop me an e-mail.  Thanks
>+CONFIGURE_ARGS+=	--enable-icap
>+PLIST_SUB+=		ICAPCONF=""
>+.else
>+PLIST_SUB+=		ICAPCONF="@comment "
> .endif
> 
> .if defined(WITH_DG_KASP)
>-BROKEN=	I don't have access to Kaspersky AV, so I can't test this.  If you have access to it, drop me an e-mail.  Thanks
>+#IGNORE=		I don't have access to Kaspersky AV, so I can't test this.  If you have access to it, drop me an e-mail.  Thanks
>+CONFIGURE_ARGS+=	--enable-kavd
>+PLIST_SUB+=		KAVDCONF=""
>+.else
>+PLIST_SUB+=		KAVDCONF="@comment "
> .endif
> 
> .if defined(WITH_DG_DMGR)
>@@ -89,7 +95,7 @@
> 
> # 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"
>+IGNORE=	commercial source download is restricted.  Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make
> .endif
> 
> post-install:
>diff -ruN --exclude=CVS /usr/ports/www/dansguardian-devel.orig/pkg-descr /usr/ports/www/dansguardian-devel/pkg-descr
>--- /usr/ports/www/dansguardian-devel.orig/pkg-descr	Wed Mar 29 15:27:09 2006
>+++ /usr/ports/www/dansguardian-devel/pkg-descr	Wed Mar 29 15:31:45 2006
>@@ -3,20 +3,19 @@
> however, DansGuardian should work with any proxy server.
> 
> It filters using multiple methods, including:
>-  - URL and domain filtering
>-  - content phrase filtering
>-  - PICS filtering
>-  - MIME filtering
>-  - file extension filtering
>-  - POST filtering
>-  - user and source IP filtering
>+  - URL and domain filtering            - content phrase filtering
>+  - PICS filtering                      - MIME filtering
>+  - file extension filtering            - POST filtering
>+  - username and source IP filtering    - virus filtering
> 
> This version also includes support for filter groups (simple ACLs),
>-pre-emptive blocking, improved URL caches,  and fork pooling for
>+pre-emptive blocking, improved URL caches, and fork pooling for
> improved performance under heavy load.
> 
>+This is the development version of DansGuardian and is still
>+considered to be Alpha quality.
>+
> WWW: http://dansguardian.org
>-WWW: http://backup.dansguardian.org
> 
> - Freddie Cash
> fcash@sd73.bc.ca
>diff -ruN --exclude=CVS /usr/ports/www/dansguardian-devel.orig/pkg-message /usr/ports/www/dansguardian-devel/pkg-message
>--- /usr/ports/www/dansguardian-devel.orig/pkg-message	Wed Mar 29 15:27:09 2006
>+++ /usr/ports/www/dansguardian-devel/pkg-message	Wed Mar 29 15:30:45 2006
>@@ -1,10 +1,18 @@
> ===>   Please Note:
> 
> *******************************************************************************
>-       This port has placed a log file in /var/log/ named dansguardian.log
>-       This log file can get quite large.  Please read the newsyslog(8) man
>-       page for instructions on setting up log rotation and compression.
>+       All initial config files have been placed under a samples/ directory.
>+       You will need to copy these files into the config directory before
>+       running DansGuardian for the first time.
> 
>-       WARNING:  This port uses RCng.  Please read the comments in the startup
>-       script for instructions on enabling the daemon.
>+       This port has created a log file named dansguardian.log that can get
>+       quite large.  Please read the newsyslog(8) man page for instructions
>+       on configuring log rotation and compression.
>+
>+       This port has been converted to the new RC framework and should work
>+       correctly via rcorder.  Please read the comments in the startup script
>+       for instructions on enabling the daemon.
>+
>+       DG_CLAMAV, DG_ICAP, or DG_KASP are all experimental options that I am
>+       not able to test.  Let me know how these work (or not) for you.
> *******************************************************************************
>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	Wed Mar 29 15:27:09 2006
>+++ /usr/ports/www/dansguardian-devel/pkg-plist	Wed Mar 29 15:27:23 2006
>@@ -226,7 +226,10 @@
> etc/dansguardian/lists/contentscanners/exceptionvirusurllist
> etc/dansguardian/downloadmanagers/default.conf
> etc/dansguardian/downloadmanagers/fancy.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
> etc/dansguardian/dansguardian.conf
> etc/dansguardian/dansguardianf1.conf
> @dirrm %%DATADIR%%/scripts

Actions: View | Diff

Attachments on bug 95089: 63824