Attachment 66279 Details for Bug 97994 – dansguardian-2.9.7.0.patch

[patch] dansguardian-2.9.7.0.patch

dansguardian-2.9.7.0.patch (text/plain), 7.57 KB, created by Freddie Cash on 2006-05-27 00:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Freddie Cash

Created: 2006-05-27 00:40:16 UTC

Size: 7.57 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	Fri May 26 14:12:59 2006
>+++ /usr/ports/www/dansguardian-devel/Makefile	Fri May 26 16:06:58 2006
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME=	dansguardian
>-PORTVERSION=	2.9.6.1
>-PORTREVISION=	1
>+PORTVERSION=	2.9.7.0
>+#PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	# empty, see below
> DISTNAME=	${PORTNAME}-${PORTVERSION}
>@@ -37,8 +37,10 @@
> 		DG_DMGR    "Enable the fancy download manager" on \
> 		DG_CLAMD   "Enable ClamAV daemon support (clamd)" 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
>+		DG_ICAP    "Enable ICAP AV content scanner support (testing)" off \
>+		DG_KASP    "Enable Kaspersky AV support (testing)" off \
>+		DG_NTLM    "Enable NTLM authentication plugin" off \
>+		DG_EMAIL   "Enable e-mail reporting support" off
> 
> DG_URL=		http://dansguardian.org/index.php?page=copyright2
> CONFDIR=	${PREFIX}/etc/dansguardian
>@@ -86,11 +88,31 @@
> PLIST_SUB+=		KAVDCONF="@comment "
> .endif
> 
>+.if defined(WITH_DG_CLAMD) || defined(WITH_DG_CLAMAV) || defined(WITH_DG_ICAP) || defined(WITH_DG_KASP)
>+PLIST_SUB+=		SCANNERS=""
>+.else
>+PLIST_SUB+=		SCANNERS="@comment "
>+.endif
>+
> .if defined(WITH_DG_DMGR)
> CONFIGURE_ARGS+=	--enable-fancydm
> #PLIST_SUB+=		DMGR=""
> #.else
> #PLIST_SUB+=		DMGR="@comment "
>+.endif
>+
>+.if defined(WITH_DG_NTLM)
>+CONFIGURE_ARGS+=	--enable-ntlm
>+PLIST_SUB+=		NTLMCONF=""
>+.else
>+PLIST_SUB+=		NTLMCONF="@comment "
>+.endif
>+
>+.if defined(WITH_DG_EMAIL)
>+CONFIGURE_ARGS+=	--enable-email
>+PLIST_SUB+=		EMAILCONF=""
>+.else
>+PLIST_SUB+=		EMAILCONF="@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	Fri May 26 14:12:59 2006
>+++ /usr/ports/www/dansguardian-devel/distinfo	Fri May 26 14:14:40 2006
>@@ -1,3 +1,3 @@
>-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
>+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
>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	Fri May 26 14:12:59 2006
>+++ /usr/ports/www/dansguardian-devel/pkg-message	Fri May 26 15:23:57 2006
>@@ -1,10 +1,6 @@
> ===>   Please Note:
> 
> *******************************************************************************
>-       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.
>-
>        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.
>@@ -13,6 +9,7 @@
>        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.
>+       DG_CLAMAV, DG_ICAP, DG_KASP, DG_NTLM are all experimental options that I
>+       am not currently able to test.  Let me know how these work (or not)
>+       for you.  (Patches always welcome.)
> *******************************************************************************
>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	Fri May 26 14:12:59 2006
>+++ /usr/ports/www/dansguardian-devel/pkg-plist	Fri May 26 16:07:18 2006
>@@ -1,12 +1,12 @@
> @exec mkdir -p etc/dansguardian
> @exec mkdir -p etc/dansguardian/authplugins
>-@exec mkdir -p etc/dansguardian/contentscanners
>+%%SCANNERS%%@exec mkdir -p etc/dansguardian/contentscanners
> @exec mkdir -p etc/dansguardian/downloadmanagers
> @exec mkdir -p etc/dansguardian/lists
> @exec mkdir -p etc/dansguardian/lists/authplugins
> @exec mkdir -p etc/dansguardian/lists/blacklists
> @exec mkdir -p etc/dansguardian/lists/blacklists/ads
>-@exec mkdir -p etc/dansguardian/lists/contentscanners
>+%%SCANNERS%%@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
>@@ -138,6 +138,7 @@
> etc/dansguardian/authplugins/ident.conf
> etc/dansguardian/authplugins/ip.conf
> etc/dansguardian/authplugins/proxy-basic.conf
>+%%NTLMCONF%%etc/dansguardian/authplugins/proxy-ntlm.conf
> etc/dansguardian/lists/authplugins/ipgroups
> etc/dansguardian/lists/exceptionextensionlist
> etc/dansguardian/lists/exceptionfilesitelist
>@@ -188,6 +189,7 @@
> 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_norgwegian
> etc/dansguardian/lists/phraselists/pornography/weighted_portuguese
> etc/dansguardian/lists/phraselists/pornography/weighted_russian
> etc/dansguardian/lists/phraselists/pornography/weighted_spanish
>@@ -220,10 +222,10 @@
> etc/dansguardian/lists/exceptionphraselist
> etc/dansguardian/lists/urlregexplist
> etc/dansguardian/lists/exceptionregexpurllist
>-etc/dansguardian/lists/contentscanners/exceptionvirusmimetypelist
>-etc/dansguardian/lists/contentscanners/exceptionvirusextensionlist
>-etc/dansguardian/lists/contentscanners/exceptionvirussitelist
>-etc/dansguardian/lists/contentscanners/exceptionvirusurllist
>+%%SCANNERS%%etc/dansguardian/lists/contentscanners/exceptionvirusmimetypelist
>+%%SCANNERS%%etc/dansguardian/lists/contentscanners/exceptionvirusextensionlist
>+%%SCANNERS%%etc/dansguardian/lists/contentscanners/exceptionvirussitelist
>+%%SCANNERS%%etc/dansguardian/lists/contentscanners/exceptionvirusurllist
> etc/dansguardian/downloadmanagers/default.conf
> etc/dansguardian/downloadmanagers/fancy.conf
> %%CLAMAVCONF%%etc/dansguardian/contentscanners/clamav.conf
>@@ -258,8 +260,6 @@
> @dirrm %%DATADIR%%/languages/ukenglish
> @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
>@@ -284,12 +284,14 @@
> @dirrm etc/dansguardian/lists/phraselists/weapons
> @dirrm etc/dansguardian/lists/phraselists/webmail
> @dirrm etc/dansguardian/lists/phraselists
>+@dirrm etc/dansguardian/lists/downloadmanagers
>+%%SCANNERS%%@dirrm etc/dansguardian/lists/contentscanners
> @dirrm etc/dansguardian/lists/blacklists/ads
> @dirrm etc/dansguardian/lists/blacklists
> @dirrm etc/dansguardian/lists/authplugins
> @dirrm etc/dansguardian/lists
> @dirrm etc/dansguardian/downloadmanagers
>-@dirrm etc/dansguardian/contentscanners
>+%%SCANNERS%%@dirrm etc/dansguardian/contentscanners
> @dirrm etc/dansguardian/authplugins
> @dirrm etc/dansguardian
> @unexec echo If permanently deleting this package, /var/log/dansguardian.log  must be removed manually

Actions: View | Diff

Attachments on bug 97994: 66279