Attachment 85836 Details for Bug 122139 – dansguardian-devel.diff

[patch] dansguardian-devel.diff

dansguardian-devel.diff (text/plain), 14.16 KB, created by fjwcash on 2008-03-26 23:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fjwcash

Created: 2008-03-26 23:20:02 UTC

Size: 14.16 KB

patch

obsolete

>diff -ruN dansguardian-devel.orig/Makefile dansguardian-devel/Makefile
>--- dansguardian-devel.orig/Makefile	2007-07-23 02:36:43.000000000 -0700
>+++ dansguardian-devel/Makefile	2008-03-26 15:02:23.000000000 -0700
>@@ -1,18 +1,18 @@
> # New ports collection makefile for:	dansguardian
> # Date created:				April 02, 2002
>-# Whom:					Freddie Cash <fcash@bigfoot.com>
>+# Whom:					Freddie Cash <fjwcash@gmail.com>
> #
> # $FreeBSD: ports/www/dansguardian-devel/Makefile,v 1.25 2007/07/23 09:36:43 rafan Exp $
> #
> 
> PORTNAME=	dansguardian
>-PORTVERSION=	2.9.8.2
>+PORTVERSION=	2.9.9.3
> #PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	# empty, see below
> DISTNAME=	${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	fcash@sd73.bc.ca
>+MAINTAINER=	fjwcash@gmail.com
> COMMENT=	A fast, feature-rich web content filter for Squid proxy servers
> 
> RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
>@@ -20,7 +20,7 @@
> USE_GCC=	3.4+
> USE_ICONV=	yes
> 
>-USE_RC_SUBR=	dansguardian.sh
>+USE_RC_SUBR=	dansguardian
> 
> CONFLICTS=	dansguardian-2.[678]*
> LATEST_LINK=	dansguardian-devel
>@@ -50,6 +50,8 @@
> 
> RESTRICTED=	Redistribution and commercial download is restricted. Check ${DG_URL} for more info
> 
>+PORTDOCS=	AuthPlugins ContentScanners DownloadManagers FAQ FAQ.html Plugins
>+
> .include <bsd.port.pre.mk>
> 
> .if !defined(WITHOUT_DG_APACHE)
>@@ -65,16 +67,15 @@
> .endif
> 
> .if defined(WITH_DG_CLISCAN)
>-CONFIGURE_ARGS+=	--enable-commandline=yes
>+CONFIGURE_ARGS+=	--enable-commandline
> 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
>-LIB_DEPENDS+=		clamav.1:${PORTSDIR}/security/clamav
>+LIB_DEPENDS+=		clamav.3:${PORTSDIR}/security/clamav
> PLIST_SUB+=		CLAMAVCONF=""
> .else
> PLIST_SUB+=		CLAMAVCONF="@comment "
>@@ -89,7 +90,6 @@
> .endif
> 
> .if defined(WITH_DG_ICAP)
>-#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
>@@ -97,7 +97,6 @@
> .endif
> 
> .if defined(WITH_DG_KASP)
>-#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
>diff -ruN dansguardian-devel.orig/distinfo dansguardian-devel/distinfo
>--- dansguardian-devel.orig/distinfo	2007-01-27 15:58:45.000000000 -0800
>+++ dansguardian-devel/distinfo	2008-03-25 10:41:11.000000000 -0700
>@@ -1,3 +1,3 @@
>-MD5 (dansguardian-2.9.8.2.tar.gz) = 6d6e002be64df2ba7a3842e29fb2dd36
>-SHA256 (dansguardian-2.9.8.2.tar.gz) = 228b5240e34c6a59d1cfdf7cc7ed206c6552bb6d584ba4e9e16478fdbd688c55
>-SIZE (dansguardian-2.9.8.2.tar.gz) = 469129
>+MD5 (dansguardian-2.9.9.3.tar.gz) = ed169b80eb85522c6c4f8288737b380c
>+SHA256 (dansguardian-2.9.9.3.tar.gz) = 4c61dfd2bfbaab415947a89e9dfa75311b063f4173781aafa42079bd80fe4d89
>+SIZE (dansguardian-2.9.9.3.tar.gz) = 498369
>diff -ruN dansguardian-devel.orig/files/dansguardian.in dansguardian-devel/files/dansguardian.in
>--- dansguardian-devel.orig/files/dansguardian.in	1969-12-31 16:00:00.000000000 -0800
>+++ dansguardian-devel/files/dansguardian.in	2008-03-26 12:52:07.000000000 -0700
>@@ -0,0 +1,28 @@
>+#!/bin/sh
>+# $FreeBSD: ports/www/dansguardian-devel/files/dansguardian.sh.in,v 1.3 2006/11/04 00:26:23 sat Exp $
>+
>+# PROVIDE: dansguardian
>+# REQUIRE: NETWORKING SERVERS squid
>+# KEYWORD: shutdown
>+
>+# Define these dansguardian_* variables in one of these files:
>+#       /etc/rc.conf
>+#       /etc/rc.conf.local
>+#       /etc/rc.conf.d/dansguardian
>+#
>+# DO NOT CHANGE THESE DEFAULT VALUES HERE
>+dansguardian_enable=${dansguardian_enable:-"NO"}
>+dansguardian_flags=${dansguardian_flags:-""}
>+dansguardian_pidfile=${dansguardian_pidfile:-"/var/run/dansguardian.pid"}
>+
>+. %%RC_SUBR%%
>+
>+name="dansguardian"
>+rcvar=${name}_enable
>+command="%%PREFIX%%/sbin/${name}"
>+
>+load_rc_config $name
>+
>+pidfile="${dansguardian_pidfile}"
>+
>+run_rc_command "$1"
>diff -ruN dansguardian-devel.orig/files/dansguardian.sh.in dansguardian-devel/files/dansguardian.sh.in
>--- dansguardian-devel.orig/files/dansguardian.sh.in	2006-11-03 16:26:23.000000000 -0800
>+++ dansguardian-devel/files/dansguardian.sh.in	1969-12-31 16:00:00.000000000 -0800
>@@ -1,29 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: ports/www/dansguardian-devel/files/dansguardian.sh.in,v 1.3 2006/11/04 00:26:23 sat Exp $
>-
>-# PROVIDE: dansguardian
>-# REQUIRE: NETWORKING SERVERS squid
>-# KEYWORD: shutdown
>-
>-# Define these dansguardian_* variables in one of these files:
>-#       /etc/rc.conf
>-#       /etc/rc.conf.local
>-#       /etc/rc.conf.d/dansguardian
>-#
>-# DO NOT CHANGE THESE DEFAULT VALUES HERE
>-#
>-dansguardian_enable=${dansguardian_enable:-"NO"}
>-dansguardian_flags=${dansguardian_flags:-""}
>-dansguardian_pidfile=${dansguardian_pidfile:-"/var/run/dansguardian.pid"}
>-
>-. %%RC_SUBR%%
>-
>-name="dansguardian"
>-rcvar=`set_rcvar`
>-command="%%PREFIX%%/sbin/dansguardian"
>-
>-load_rc_config $name
>-
>-pidfile="${dansguardian_pidfile}"
>-
>-run_rc_command "$1"
>diff -ruN dansguardian-devel.orig/files/patch-Makefile.in dansguardian-devel/files/patch-Makefile.in
>--- dansguardian-devel.orig/files/patch-Makefile.in	2006-02-10 07:28:46.000000000 -0800
>+++ dansguardian-devel/files/patch-Makefile.in	1969-12-31 16:00:00.000000000 -0800
>@@ -1,19 +0,0 @@
>---- Makefile.in.orig	Thu Feb  2 03:06:47 2006
>-+++ Makefile.in	Thu Feb  9 14:34:35 2006
>-@@ -617,10 +617,12 @@
>- 
>- 
>- install-data-local:
>--	if ! test -d "$(DESTDIR)$(DGLOGLOCATION)"; then \
>--		$(mkinstalldirs) $(DESTDIR)$(DGLOGLOCATION) && \
>--		chown -R $(DGPROXYUSER):$(DGPROXYGROUP) $(DESTDIR)$(DGLOGLOCATION); \
>--	fi
>-+#	if ! test -d "$(DESTDIR)$(DGLOGLOCATION)"; then \
>-+#		$(mkinstalldirs) $(DESTDIR)$(DGLOGLOCATION) && \
>-+#		chown -R $(DGPROXYUSER):$(DGPROXYGROUP) $(DESTDIR)$(DGLOGLOCATION); \
>-+#	fi
>-+	touch $(DGLOGLOCATION)/dansguardian.log
>-+	chown $(DGPROXYUSER):$(DGPROXYGROUP) $(DGLOGLOCATION)/dansguardian.log
>- # Tell versions [3.59,3.63) of GNU make to not export all variables.
>- # Otherwise a system limit (for SysV at least) may be exceeded.
>- .NOEXPORT:
>diff -ruN dansguardian-devel.orig/files/patch-doc::dansguardian.8 dansguardian-devel/files/patch-doc::dansguardian.8
>--- dansguardian-devel.orig/files/patch-doc::dansguardian.8	2005-12-27 15:02:10.000000000 -0800
>+++ dansguardian-devel/files/patch-doc::dansguardian.8	2008-03-26 15:16:35.000000000 -0700
>@@ -5,7 +5,7 @@
>  DansGuardian 2
>  .SH SYNOPSIS
> -/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
>-+/usr/local/etc/rc.d/dansguardian.sh [stop|start|status|restart]
>++/usr/local/etc/rc.d/dansguardian [stop|start|status|restart]
>  .SH DESCRIPTION
>  A Introduction
>  
>diff -ruN dansguardian-devel.orig/pkg-descr dansguardian-devel/pkg-descr
>--- dansguardian-devel.orig/pkg-descr	2006-04-08 06:02:08.000000000 -0700
>+++ dansguardian-devel/pkg-descr	2008-03-26 15:19:00.000000000 -0700
>@@ -1,6 +1,7 @@
> DansGuardian is a web content filtering proxy for Linux, FreeBSD, OpenBSD,
>-and Solaris. It relies on a proxy server, such as Squid, for all fetching;
>-however, DansGuardian should work with any proxy server.
>+and Solaris. It relies on a proxy server for all fetching of pages.  It has
>+been most extensively tested with Squid; however, DansGuardian should work
>+with any proxy server.
> 
> It filters using multiple methods, including:
>   - URL and domain filtering            - content phrase filtering
>@@ -13,9 +14,9 @@
> improved performance under heavy load.
> 
> This is the development version of DansGuardian and is still
>-considered to be Alpha quality.
>+considered to be Beta quality.
> 
> WWW: http://dansguardian.org
> 
> - Freddie Cash
>-fcash@sd73.bc.ca
>+fjwcash@gmail.com
>diff -ruN dansguardian-devel.orig/pkg-plist dansguardian-devel/pkg-plist
>--- dansguardian-devel.orig/pkg-plist	2006-10-04 09:36:30.000000000 -0700
>+++ dansguardian-devel/pkg-plist	2008-03-26 12:46:07.000000000 -0700
>@@ -32,8 +32,20 @@
> @exec mkdir -p etc/dansguardian/lists/phraselists/warezhacking
> @exec mkdir -p etc/dansguardian/lists/phraselists/weapons
> @exec mkdir -p etc/dansguardian/lists/phraselists/webmail
>+@exec mkdir -p etc/dansguardian/lists/phraselists/conspiracy
>+@exec mkdir -p etc/dansguardian/lists/phraselists/domainsforsale
>+@exec mkdir -p etc/dansguardian/lists/phraselists/forums
>+@exec mkdir -p etc/dansguardian/lists/phraselists/idtheft
>+@exec mkdir -p etc/dansguardian/lists/phraselists/music
>+@exec mkdir -p etc/dansguardian/lists/phraselists/rta
>+@exec mkdir -p etc/dansguardian/lists/phraselists/safelabel
>+@exec mkdir -p etc/dansguardian/lists/phraselists/secretsocieties
>+@exec mkdir -p etc/dansguardian/lists/phraselists/translation
>+@exec mkdir -p etc/dansguardian/lists/phraselists/travel
>+@exec mkdir -p etc/dansguardian/lists/phraselists/upstreamfilter
> @exec mkdir -p %%DATADIR%%
> @exec mkdir -p %%DATADIR%%/languages
>+@exec mkdir -p %%DATADIR%%/languages/arspanish
> @exec mkdir -p %%DATADIR%%/languages/bulgarian
> @exec mkdir -p %%DATADIR%%/languages/chinesebig5
> @exec mkdir -p %%DATADIR%%/languages/chinesegb2312
>@@ -46,7 +58,10 @@
> @exec mkdir -p %%DATADIR%%/languages/hungarian
> @exec mkdir -p %%DATADIR%%/languages/indonesian
> @exec mkdir -p %%DATADIR%%/languages/italian
>+@exec mkdir -p %%DATADIR%%/languages/japanese
> @exec mkdir -p %%DATADIR%%/languages/lithuanian
>+@exec mkdir -p %%DATADIR%%/languages/malay
>+@exec mkdir -p %%DATADIR%%/languages/mxspanish
> @exec mkdir -p %%DATADIR%%/languages/polish
> @exec mkdir -p %%DATADIR%%/languages/portuguese
> @exec mkdir -p %%DATADIR%%/languages/ptbrazilian
>@@ -59,9 +74,21 @@
> @exec mkdir -p %%DATADIR%%/languages/ukenglish
> @exec mkdir -p %%DATADIR%%/scripts
> sbin/dansguardian
>+%%DATADIR%%/languages/arspanish/messages
>+%%DATADIR%%/languages/arspanish/fancydmtemplate.html
>+%%DATADIR%%/languages/arspanish/template.html
> %%DATADIR%%/languages/spanish/messages
> %%DATADIR%%/languages/spanish/fancydmtemplate.html
> %%DATADIR%%/languages/spanish/template.html
>+%%DATADIR%%/languages/mxspanish/messages
>+%%DATADIR%%/languages/mxspanish/fancydmtemplate.html
>+%%DATADIR%%/languages/mxspanish/template.html
>+%%DATADIR%%/languages/japanese/messages
>+%%DATADIR%%/languages/japanese/fancydmtemplate.html
>+%%DATADIR%%/languages/japanese/template.html
>+%%DATADIR%%/languages/malay/messages
>+%%DATADIR%%/languages/malay/fancydmtemplate.html
>+%%DATADIR%%/languages/malay/template.html
> %%DATADIR%%/languages/czech/messages
> %%DATADIR%%/languages/czech/fancydmtemplate.html
> %%DATADIR%%/languages/czech/template.html
>@@ -138,11 +165,18 @@
> etc/dansguardian/authplugins/ident.conf
> etc/dansguardian/authplugins/ip.conf
> etc/dansguardian/authplugins/proxy-basic.conf
>+etc/dansguardian/authplugins/proxy-digest.conf
> %%NTLMCONF%%etc/dansguardian/authplugins/proxy-ntlm.conf
> etc/dansguardian/lists/authplugins/ipgroups
> etc/dansguardian/lists/exceptionextensionlist
> etc/dansguardian/lists/exceptionfilesitelist
> etc/dansguardian/lists/exceptionmimetypelist
>+etc/dansguardian/lists/bannedregexpheaderlist
>+etc/dansguardian/lists/exceptionfileurllist
>+etc/dansguardian/lists/headerregexplist
>+etc/dansguardian/lists/logregexpurllist
>+etc/dansguardian/lists/logsitelist
>+etc/dansguardian/lists/logurllist
> etc/dansguardian/lists/blacklists/ads/domains
> etc/dansguardian/lists/blacklists/ads/urls
> etc/dansguardian/lists/downloadmanagers/managedextensionlist
>@@ -195,7 +229,7 @@
> 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_norwegian
> etc/dansguardian/lists/phraselists/pornography/weighted_portuguese
> etc/dansguardian/lists/phraselists/pornography/weighted_russian
> etc/dansguardian/lists/phraselists/pornography/weighted_spanish
>@@ -207,6 +241,17 @@
> etc/dansguardian/lists/phraselists/weapons/weighted
> etc/dansguardian/lists/phraselists/weapons/weighted_portuguese
> etc/dansguardian/lists/phraselists/webmail/weighted
>+etc/dansguardian/lists/phraselists/conspiracy/weighted
>+etc/dansguardian/lists/phraselists/domainsforsale/weighted
>+etc/dansguardian/lists/phraselists/forums/weighted
>+etc/dansguardian/lists/phraselists/idtheft/weighted
>+etc/dansguardian/lists/phraselists/music/weighted
>+etc/dansguardian/lists/phraselists/rta/banned
>+etc/dansguardian/lists/phraselists/safelabel/banned
>+etc/dansguardian/lists/phraselists/secretsocieties/weighted
>+etc/dansguardian/lists/phraselists/translation/weighted
>+etc/dansguardian/lists/phraselists/travel/weighted
>+etc/dansguardian/lists/phraselists/upstreamfilter/weighted
> etc/dansguardian/lists/bannedextensionlist
> etc/dansguardian/lists/bannediplist
> etc/dansguardian/lists/bannedmimetypelist
>@@ -241,6 +286,7 @@
> etc/dansguardian/dansguardian.conf
> etc/dansguardian/dansguardianf1.conf
> @dirrm %%DATADIR%%/scripts
>+@dirrm %%DATADIR%%/languages/arspanish
> @dirrm %%DATADIR%%/languages/bulgarian
> @dirrm %%DATADIR%%/languages/chinesebig5
> @dirrm %%DATADIR%%/languages/chinesegb2312
>@@ -253,7 +299,10 @@
> @dirrm %%DATADIR%%/languages/hungarian
> @dirrm %%DATADIR%%/languages/indonesian
> @dirrm %%DATADIR%%/languages/italian
>+@dirrm %%DATADIR%%/languages/japanese
> @dirrm %%DATADIR%%/languages/lithuanian
>+@dirrm %%DATADIR%%/languages/malay
>+@dirrm %%DATADIR%%/languages/mxspanish
> @dirrm %%DATADIR%%/languages/polish
> @dirrm %%DATADIR%%/languages/portuguese
> @dirrm %%DATADIR%%/languages/ptbrazilian
>@@ -289,6 +338,17 @@
> @dirrm etc/dansguardian/lists/phraselists/warezhacking
> @dirrm etc/dansguardian/lists/phraselists/weapons
> @dirrm etc/dansguardian/lists/phraselists/webmail
>+@dirrm etc/dansguardian/lists/phraselists/conspiracy
>+@dirrm etc/dansguardian/lists/phraselists/domainsforsale
>+@dirrm etc/dansguardian/lists/phraselists/forums
>+@dirrm etc/dansguardian/lists/phraselists/idtheft
>+@dirrm etc/dansguardian/lists/phraselists/music
>+@dirrm etc/dansguardian/lists/phraselists/rta
>+@dirrm etc/dansguardian/lists/phraselists/safelabel
>+@dirrm etc/dansguardian/lists/phraselists/secretsocieties
>+@dirrm etc/dansguardian/lists/phraselists/translation
>+@dirrm etc/dansguardian/lists/phraselists/travel
>+@dirrm etc/dansguardian/lists/phraselists/upstreamfilter
> @dirrm etc/dansguardian/lists/phraselists
> @dirrm etc/dansguardian/lists/downloadmanagers
> %%SCANNERS%%@dirrm etc/dansguardian/lists/contentscanners

Actions: View | Diff

Attachments on bug 122139: 85836