From fcash@sd73.bc.ca  Mon Jul  7 15:36:42 2003
Return-Path: <fcash@sd73.bc.ca>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1751437B401
	for <freebsd-gnats-submit@freebsd.org>; Mon,  7 Jul 2003 15:36:42 -0700 (PDT)
Received: from lug.kamloops.net (lug2.kamloops.net [209.52.173.193])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6F4A243F85
	for <freebsd-gnats-submit@freebsd.org>; Mon,  7 Jul 2003 15:36:40 -0700 (PDT)
	(envelope-from fcash@sd73.bc.ca)
Received: from localhost ([127.0.0.1])
	by lug.kamloops.net with esmtp (Exim 3.16 #1)
	id 19ZfWk-0004XP-00
	for freebsd-gnats-submit@freebsd.org; Mon, 07 Jul 2003 16:36:10 -0700
Message-Id: <200307071529.46770.fcash@sd73.bc.ca>
Date: Mon, 7 Jul 2003 15:29:46 -0700
From: Freddie Cash <fcash@sd73.bc.ca>
Reply-To: fcash@sd73.bc.ca
To: freebsd-gnats-submit@freebsd.org
Subject: port update: www/dansguardian to version 2.6.1-3

>Number:         54199
>Category:       ports
>Synopsis:       port update:  www/dansguardian to version 2.6.1-3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 07 15:40:02 PDT 2003
>Closed-Date:    Wed Sep 03 18:09:32 PDT 2003
>Last-Modified:  Sun Mar 17 02:28:53 UTC 2013
>Originator:     Freddie Cash
>Release:        FreeBSD 5.1-RELEASE i386
>Organization:
School District 73
>Environment:
System: FreeBSD spark.sd73.bc.ca 5.1-RELEASE FreeBSD 5.1-RELEASE #3: Wed 
Jun 11 09:16:25 PDT 2003 
root@spark.sd73.bc.ca:/usr/obj/usr/src/sys/SPARK i386

>Description:
	The latest stable release of DansGuardian is 2.6.1-3.  This release 
fixes a few security glitches in earlier releases, and adds several new 
features to improve filtering, throughput, and resource usage.  A 
recommended update for all DG users.

>How-To-Repeat:

>Fix:
	Enclosed below is a diff to update www/dansguardian from 2.2.10-0 to 
2.6.1-3

	Hopefully my mailer (KMail 1.5.2) doesn't screw up the line endings.  
If it does, let me know and I'll find an alternate method of sending 
the PR (can't use send-pr directly due to reverse DNS issues).

--- patch-dansguardian-2.6.1.3 begins here ---
diff -ruN dansguardian.orig/Makefile dansguardian/Makefile
--- dansguardian.orig/Makefile	Fri Jul  4 15:24:18 2003
+++ dansguardian/Makefile	Mon Jul  7 15:15:07 2003
@@ -1,19 +1,18 @@
 # New ports collection makefile for:	dansguardian
 # Date created:				March 26, 2002
-# Whom:					Freddie Cash <fcash@bigfoot.com>
+# Whom:					Freddie Cash <fcash@sd73.bc.ca>
 #
 # $FreeBSD: ports/www/dansguardian/Makefile,v 1.8 2003/02/21 14:01:15 
knu Exp $
 #
 
 PORTNAME=	dansguardian
-PORTVERSION=	2.2.10.0
-PORTREVISION=	1
+PORTVERSION=	2.6.1.3
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
 
-MAINTAINER=	fcash@bigfoot.com
-COMMENT=	A fast, simple web content filter for Squid proxy servers
+MAINTAINER=	fcash@sd73.bc.ca
+COMMENT=	A fast, featureful web content filter for Squid proxy servers
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \
 		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install
@@ -31,16 +30,19 @@
 
 DG_URL=		http://dansguardian.org/index.php?page=copyright2
 
-.if defined(WITHOUT_PICS)
-CONFIGURE_ARGS+=	--without-pics-filter
-.endif
-
 MAN8=		dansguardian.8
 
 NO_CDROM=	"Commercial download is restricted.  Check ${DG_URL} for more 
info"
 NO_PACKAGE=	"Redistribution is restricted.  Check ${DG_URL} for more 
info"
+RESTRICTED=	${NO_PACKAGE}
 
 .include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 500000 || defined(WITH_GCC3)
+CONFIGURE_ARGS+=	--gccver=3
+.else
+CONFIGURE_ARGS+=	--gccver=2
+.endif
 
 .if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}))
 IGNORE=	"Commercial source download is restricted.  Please visit and 
read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} 
before running make"
diff -ruN dansguardian.orig/distinfo dansguardian/distinfo
--- dansguardian.orig/distinfo	Fri Jul  4 15:24:18 2003
+++ dansguardian/distinfo	Mon Jul  7 11:10:43 2003
@@ -1 +1 @@
-MD5 (DansGuardian-2.2.10-0.source.tar.gz) = 
1249c28c02fe1abb8313c9f71086a2c5
+MD5 (DansGuardian-2.6.1-3.source.tar.gz) = 
21fa3b79fb66817c95003d320b62a4c1
diff -ruN dansguardian.orig/files/patch-FatController.cpp 
dansguardian/files/patch-FatController.cpp
--- dansguardian.orig/files/patch-FatController.cpp	Wed Dec 31 16:00:00 
1969
+++ dansguardian/files/patch-FatController.cpp	Mon Jul  7 15:03:36 2003
@@ -0,0 +1,11 @@
+--- FatController.cpp.orig	Mon Jul  7 14:59:33 2003
++++ FatController.cpp	Mon Jul  7 14:59:52 2003
+@@ -513,7 +513,7 @@
+     if (conn) {
+         if (report) {
+             if (!isDaemonised) {
+-                std::cerr << "Error creating connecting to test proxy" 
<< std::endl;
++                std::cerr << "Error creating connection to test proxy" 
<< std::endl;
+             }
+             syslog(LOG_ERR, "%s","Error creating connection to test 
proxy");
+         }
diff -ruN dansguardian.orig/files/patch-autoconf::bsdv.in 
dansguardian/files/patch-autoconf::bsdv.in
--- dansguardian.orig/files/patch-autoconf::bsdv.in	Wed Dec 31 16:00:00 
1969
+++ dansguardian/files/patch-autoconf::bsdv.in	Mon Jul  7 12:13:25 2003
@@ -0,0 +1,37 @@
+--- autoconf/bsdv.in.orig	Mon Jul  7 12:04:33 2003
++++ autoconf/bsdv.in	Mon Jul  7 12:07:11 2003
+@@ -1,16 +1,26 @@
+ #!/bin/sh
+ #
+-# BSD startup script for dansguardian
+-# partly based on httpd startup script
++# BSD startup script for dansguardian.
+ #
+-# description: A web content filtering plugin for web \
+-#              proxies, developed to filter using lists of \
+-#              banned phrases, MIME types, filename \
++# description: A web content filtering plugin for web
++#              proxies, developed to filter using lists of
++#              banned phrases, MIME types, filename
+ #              extensions and PICS labling.
+ # processname: dansguardian
+
+-
+-# See how we were called.
+-
+ case "$1" in
+ start)
++	[ -x /usr/local/sbin/dansguardian ] && /usr/local/sbin/dansguardian
++	echo -n " dansguardian"
++	;;
++stop)
++	/usr/local/sbin/dansguardian -q
++	rm -f /tmp/.dguardianipc
++	echo -n " dansguardian"
++	;;
++*)
++	echo "Usage: $0 {start|stop|restart}"
++	;;
++esac
++exit 0
++
diff -ruN dansguardian.orig/files/patch-autoconf::fbsd.in 
dansguardian/files/patch-autoconf::fbsd.in
--- dansguardian.orig/files/patch-autoconf::fbsd.in	Fri Jul  4 15:24:18 
2003
+++ dansguardian/files/patch-autoconf::fbsd.in	Mon Jul  7 14:52:05 2003
@@ -1,7 +1,7 @@
---- autoconf/fbsd.in.orig	Tue Apr  2 11:51:15 2002
-+++ autoconf/fbsd.in	Tue Apr  2 11:54:12 2002
-@@ -17,7 +17,7 @@
-                  dansguardian.conf config.cache Makefile logrotation
+--- autoconf/fbsd.in.orig	Mon Jul  7 02:47:25 2003
++++ autoconf/fbsd.in	Mon Jul  7 14:51:43 2003
+@@ -20,7 +20,7 @@
+ 		 logrotate.dansguardian
  
  PASSVARS = -DPROXYUSER=\"${PROXYUSER}\"
 -PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\"
@@ -9,67 +9,125 @@
  PASSVARS += 
-DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
  PASSVARS += -DPIDDIR=\"${PIDDIR}\"
  
-@@ -34,36 +34,31 @@
+@@ -37,56 +37,86 @@
  .cpp.o:
  	$(CPP) $(DEBUG) $(CFLAGS) -c $<
  
- all:	$(OBJ) 
+-all:	$(OBJ) 
++all:	$(OBJ)
  	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) 
dansguardian.cpp
  
  install:
- 	@test -d $(SYSVLOCATION) || install -d $(SYSVLOCATION)
- 	@test -d $(CONFFILELOCATION) || install -d $(CONFFILELOCATION)
- 	@test -d $(CGIBINLOCATION) || install -d $(CGIBINLOCATION)
--	@test -d $(MANUALFILES)man8/ || install -d $(MANUALFILES)man8/
--	@test -d $(LOGLOCATION) || install -d $(LOGLOCATION)
--	@test -d $(BINARYLOCATION) || /usr/sbin/install -d $(BINARYLOCATION)
--	cp -f ./dansguardian $(BINARYLOCATION)dansguardian
--	cp -f ./dansguardian.conf $(CONFFILELOCATION)dansguardian.conf
--	cp -f ./bannedphraselist $(CONFFILELOCATION)bannedphraselist
--	cp -f ./bannedextensionlist $(CONFFILELOCATION)bannedextensionlist
--	cp -f ./bannedmimetypelist $(CONFFILELOCATION)bannedmimetypelist
--	cp -f ./bannedurllist $(CONFFILELOCATION)bannedurllist
--	cp -f ./bannedregexpurllist $(CONFFILELOCATION)bannedregexpurllist
--	cp -f ./bannedsitelist $(CONFFILELOCATION)bannedsitelist
--	cp -f ./exceptionsitelist $(CONFFILELOCATION)exceptionsitelist
--	cp -f ./exceptionuserlist $(CONFFILELOCATION)exceptionuserlist
--	cp -f ./exceptioniplist $(CONFFILELOCATION)exceptioniplist
--	cp -f ./pics $(CONFFILELOCATION)pics
--	cp -f ./logrotation $(CONFFILELOCATION)logrotation
--	cp -f ./dansguardian.bsdv $(SYSVLOCATION)dansguardian.sh
--	cp -f ./dansguardian.pl $(CGIBINLOCATION)dansguardian.pl
--	chmod o+x $(CGIBINLOCATION)dansguardian.pl
--	cp -f ./dansguardian.8.gz $(MANUALFILES)man8/dansguardian.8.gz
--	chown -R $(PROXYUSER).$(PROXYGROUP) $(LOGLOCATION)
--	chmod -R u+wr $(LOGLOCATION)
--	chmod u+wrx $(LOGLOCATION)
-+	@test -d $(BINARYLOCATION) || install -d $(BINARYLOCATION)
-+	@install -m 755 -o root -g wheel ./dansguardian 
$(BINARYLOCATION)dansguardian
-+	@install -m 644 -o root -g wheel ./dansguardian.conf 
$(CONFFILELOCATION)dansguardian.conf
-+	@install -m 644 -o root -g wheel ./bannedphraselist 
$(CONFFILELOCATION)bannedphraselist
-+	@install -m 644 -o root -g wheel ./bannedextensionlist 
$(CONFFILELOCATION)bannedextensionlist
-+	@install -m 644 -o root -g wheel ./bannedmimetypelist 
$(CONFFILELOCATION)bannedmimetypelist
-+	@install -m 644 -o root -g wheel ./bannedurllist 
$(CONFFILELOCATION)bannedurllist
-+	@install -m 644 -o root -g wheel ./bannedregexpurllist 
$(CONFFILELOCATION)bannedregexpurllist
-+	@install -m 644 -o root -g wheel ./bannedsitelist 
$(CONFFILELOCATION)bannedsitelist
-+	@install -m 644 -o root -g wheel ./exceptionsitelist 
$(CONFFILELOCATION)exceptionsitelist
-+	@install -m 644 -o root -g wheel ./exceptionuserlist 
$(CONFFILELOCATION)exceptionuserlist
-+	@install -m 644 -o root -g wheel ./exceptioniplist 
$(CONFFILELOCATION)exceptioniplist
-+	@install -m 644 -o root -g wheel ./pics $(CONFFILELOCATION)pics
-+	@install -m 755 -o root -g wheel ./dansguardian.bsdv 
$(SYSVLOCATION)start-dg.sh
-+	@install -m 755 -o root -g wheel ./dansguardian.pl 
$(CGIBINLOCATION)dansguardian.pl
-+	@install -m 644 -o root -g wheel ./dansguardian.8 
$(MANUALFILES)man8/dansguardian.8
-+	@touch $(LOGLOCATION)dansguardian.log
-+	@chown $(PROXYUSER):$(PROXYGROUP) $(LOGLOCATION)dansguardian.log
+ 	@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATION)
+ 	@test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFILELOCATION)
+ 	@test -d $I$(CONFFILELOCATION)phraselists || install -d 
$I$(CONFFILELOCATION)phraselists
++	@test -d $I$(CONFFILELOCATION)phraselists/chat || install -d 
$I$(CONFFILELOCATION)phraselists/chat
++	@test -d $I$(CONFFILELOCATION)phraselists/drugadvocacy || install -d 
$I$(CONFFILELOCATION)phraselists/drugadvocacy
++	@test -d $I$(CONFFILELOCATION)phraselists/dutchbadwords || install -d 
$I$(CONFFILELOCATION)phraselists/dutchbadwords
++	@test -d $I$(CONFFILELOCATION)phraselists/frenchbadwords || install 
-d $I$(CONFFILELOCATION)phraselists/frenchbadwords
++	@test -d $I$(CONFFILELOCATION)phraselists/gambling || install -d 
$I$(CONFFILELOCATION)phraselists/gambling
++	@test -d $I$(CONFFILELOCATION)phraselists/goodphrases || install -d 
$I$(CONFFILELOCATION)phraselists/goodphrases
++	@test -d $I$(CONFFILELOCATION)phraselists/gore || install -d 
$I$(CONFFILELOCATION)phraselists/gore
++	@test -d $I$(CONFFILELOCATION)phraselists/illegaldrugs || install -d 
$I$(CONFFILELOCATION)phraselists/illegaldrugs
++	@test -d $I$(CONFFILELOCATION)phraselists/intolerance || install -d 
$I$(CONFFILELOCATION)phraselists/intolerance
++	@test -d $I$(CONFFILELOCATION)phraselists/italianbadwords || install 
-d $I$(CONFFILELOCATION)phraselists/italianbadwords
++	@test -d $I$(CONFFILELOCATION)phraselists/legaldrugs || install -d 
$I$(CONFFILELOCATION)phraselists/legaldrugs
++	@test -d $I$(CONFFILELOCATION)phraselists/personals || install -d 
$I$(CONFFILELOCATION)phraselists/personals
++	@test -d $I$(CONFFILELOCATION)phraselists/pornography || install -d 
$I$(CONFFILELOCATION)phraselists/pornography
++	@test -d $I$(CONFFILELOCATION)phraselists/violence || install -d 
$I$(CONFFILELOCATION)phraselists/violence
++	@test -d $I$(CONFFILELOCATION)phraselists/warezhacking || install -d 
$I$(CONFFILELOCATION)phraselists/warezhacking
++	@test -d $I$(CONFFILELOCATION)phraselists/weapons || install -d 
$I$(CONFFILELOCATION)phraselists/weapons
+ 	@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION)
+ 	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
+ 	@test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION)
+-	@test -d $I$(BINARYLOCATION) || /usr/sbin/install -d 
$I$(BINARYLOCATION)
+-	cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
+-	cp -f ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf
+-	cp -f ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist
+-	cp -f ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist
+-	cp -f ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist
+-	cp -f -R ./phraselists/* $I$(CONFFILELOCATION)phraselists/
+-	cp -f ./bannediplist $I$(CONFFILELOCATION)bannediplist
+-	cp -f ./banneduserlist $I$(CONFFILELOCATION)banneduserlist
+-	cp -f ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist
+-	cp -f ./bannedmimetypelist $I$(CONFFILELOCATION)bannedmimetypelist
+-	cp -f ./bannedurllist $I$(CONFFILELOCATION)bannedurllist
+-	cp -f ./bannedregexpurllist $I$(CONFFILELOCATION)bannedregexpurllist
+-	cp -f ./bannedsitelist $I$(CONFFILELOCATION)bannedsitelist
+-	cp -f ./contentregexplist $I$(CONFFILELOCATION)contentregexplist
+-	cp -f ./exceptionsitelist $I$(CONFFILELOCATION)exceptionsitelist
+-	cp -f ./exceptionurllist $I$(CONFFILELOCATION)exceptionurllist
+-	cp -f ./exceptionuserlist $I$(CONFFILELOCATION)exceptionuserlist
+-	cp -f ./exceptioniplist $I$(CONFFILELOCATION)exceptioniplist
+-	cp -f ./pics $I$(CONFFILELOCATION)pics
+-	cp -f ./template.html $I$(CONFFILELOCATION)template.html
+-	cp -f ./messages $I$(CONFFILELOCATION)messages
+-	cp -f ./logrotation $I$(CONFFILELOCATION)logrotation
+-	cp -f ./dansguardian.bsdv $I$(SYSVLOCATION)dansguardian.sh
+-	cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
+-	chmod o+x $I$(CGIBINLOCATION)dansguardian.pl
+-	cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz
+-	chown -R $(PROXYUSER).$(PROXYGROUP) $I$(LOGLOCATION)
+-	chmod -R u+wr $I$(LOGLOCATION)
+-	chmod u+wrx $I$(LOGLOCATION)
+-	if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian 
$I$(LOGROTATELOCATION)dansguardian; fi
++	@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION)
++	install -o root -g wheel -m 755 ./dansguardian 
$I$(BINARYLOCATION)dansguardian
++	install -o root -g wheel -m 644 ./dansguardian.conf 
$I$(CONFFILELOCATION)dansguardian.conf
++	install -o root -g wheel -m 644 ./bannedphraselist 
$I$(CONFFILELOCATION)bannedphraselist
++	install -o root -g wheel -m 644 ./exceptionphraselist 
$I$(CONFFILELOCATION)exceptionphraselist
++	install -o root -g wheel -m 644 ./weightedphraselist 
$I$(CONFFILELOCATION)weightedphraselist
++	install -o root -g wheel -m 644 ./phraselists/chat/weighted 
$I$(CONFFILELOCATION)phraselists/chat/weighted
++	install -o root -g wheel -m 644 ./phraselists/drugadvocacy/weighted 
$I$(CONFFILELOCATION)phraselists/drugadvocacy/weighted
++	install -o root -g wheel -m 644 ./phraselists/dutchbadwords/weighted 
$I$(CONFFILELOCATION)phraselists/dutchbadwords/weighted
++	install -o root -g wheel -m 644 ./phraselists/frenchbadwords/weighted 
$I$(CONFFILELOCATION)phraselists/frenchbadwords/weighted
++	install -o root -g wheel -m 644 ./phraselists/gambling/banned 
$I$(CONFFILELOCATION)phraselists/gambling/banned
++	install -o root -g wheel -m 644 ./phraselists/gambling/weighted 
$I$(CONFFILELOCATION)phraselists/gambling/weighted
++	install -o root -g wheel -m 644 ./phraselists/goodphrases/exception 
$I$(CONFFILELOCATION)phraselists/goodphrases/exception
++	install -o root -g wheel -m 644 ./phraselists/goodphrases/weighted 
$I$(CONFFILELOCATION)phraselists/goodphrases/weighted
++	install -o root -g wheel -m 644 ./phraselists/gore/weighted 
$I$(CONFFILELOCATION)phraselists/gore/weighted
++	install -o root -g wheel -m 644 ./phraselists/illegaldrugs/banned 
$I$(CONFFILELOCATION)phraselists/illegaldrugs/banned
++	install -o root -g wheel -m 644 ./phraselists/illegaldrugs/weighted 
$I$(CONFFILELOCATION)phraselists/illegaldrugs/weighted
++	install -o root -g wheel -m 644 ./phraselists/intolerance/banned 
$I$(CONFFILELOCATION)phraselists/intolerance/banned
++	install -o root -g wheel -m 644 ./phraselists/intolerance/weighted 
$I$(CONFFILELOCATION)phraselists/intolerance/weighted
++	install -o root -g wheel -m 644 
./phraselists/italianbadwords/weighted 
$I$(CONFFILELOCATION)phraselists/italianbadwords/weighted
++	install -o root -g wheel -m 644 ./phraselists/legaldrugs/weighted 
$I$(CONFFILELOCATION)phraselists/legaldrugs/weighted
++	install -o root -g wheel -m 644 ./phraselists/personals/weighted 
$I$(CONFFILELOCATION)phraselists/personals/weighted
++	install -o root -g wheel -m 644 ./phraselists/pornography/banned 
$I$(CONFFILELOCATION)phraselists/pornography/banned
++	install -o root -g wheel -m 644 ./phraselists/pornography/weighted 
$I$(CONFFILELOCATION)phraselists/pornography/weighted
++	install -o root -g wheel -m 644 ./phraselists/violence/weighted 
$I$(CONFFILELOCATION)phraselists/violence/weighted
++	install -o root -g wheel -m 644 ./phraselists/warezhacking/weighted 
$I$(CONFFILELOCATION)phraselists/warezhacking/weighted
++	install -o root -g wheel -m 644 ./phraselists/weapons/weighted 
$I$(CONFFILELOCATION)phraselists/weapons/weighted
++	install -o root -g wheel -m 644 ./bannediplist 
$I$(CONFFILELOCATION)bannediplist
++	install -o root -g wheel -m 644 ./banneduserlist 
$I$(CONFFILELOCATION)banneduserlist
++	install -o root -g wheel -m 644 ./bannedextensionlist 
$I$(CONFFILELOCATION)bannedextensionlist
++	install -o root -g wheel -m 644 ./bannedmimetypelist 
$I$(CONFFILELOCATION)bannedmimetypelist
++	install -o root -g wheel -m 644 ./bannedurllist 
$I$(CONFFILELOCATION)bannedurllist
++	install -o root -g wheel -m 644 ./bannedregexpurllist 
$I$(CONFFILELOCATION)bannedregexpurllist
++	install -o root -g wheel -m 644 ./bannedsitelist 
$I$(CONFFILELOCATION)bannedsitelist
++	install -o root -g wheel -m 644 ./contentregexplist 
$I$(CONFFILELOCATION)contentregexplist
++	install -o root -g wheel -m 644 ./exceptionsitelist 
$I$(CONFFILELOCATION)exceptionsitelist
++	install -o root -g wheel -m 644 ./exceptionurllist 
$I$(CONFFILELOCATION)exceptionurllist
++	install -o root -g wheel -m 644 ./exceptionuserlist 
$I$(CONFFILELOCATION)exceptionuserlist
++	install -o root -g wheel -m 644 ./exceptioniplist 
$I$(CONFFILELOCATION)exceptioniplist
++	install -o root -g wheel -m 644 ./pics $I$(CONFFILELOCATION)pics
++	install -o root -g wheel -m 644 ./template.html 
$I$(CONFFILELOCATION)template.html
++	install -o root -g wheel -m 644 ./messages 
$I$(CONFFILELOCATION)messages
++	install -o root -g wheel -m 755 ./dansguardian.bsdv 
$I$(SYSVLOCATION)start-dg.sh
++	install -o root -g wheel -m 755 ./dansguardian.pl 
$I$(CGIBINLOCATION)dansguardian.pl
++	install -o root -g wheel -m 644 ./dansguardian.8 
$I$(MANUALFILES)man8/dansguardian.8
++	install -o nobody -g nogroup -m 644 /dev/null 
$I$(LOGLOCATION)dansguardian.log
  
  uninstall:
  	rm -f $(BINARYLOCATION)dansguardian
-@@ -71,7 +66,7 @@
+ 	rm -f $(SYSVLOCATION)dansguardian
  	rm -f $(CGIBINLOCATION)dansguardian.pl
- 	rm -f $(MANUALFILES)man8/dansguardian.8.gz
+-	rm -f $(MANUALFILES)man8/dansguardian.8.gz
++	rm -f $(MANUALFILES)man8/dansguardian.8*
  	rm -fr $(CONFFILELOCATION)
 -	rm -fr $(LOGLOCATION)
-+	rm -f $(LOGLOCATION)dansguardian.log
+-	if [ -f $(LOGROTATELOCATION)dansguardian ]; then rm -f 
$(LOGROTATELOCATION)dansguardian; fi
++	rm -f $(LOGLOCATION)/dansguardian.log
  
  clean:
  	rm -f $(OBJ) $(PROG)
diff -ruN dansguardian.orig/files/patch-configure 
dansguardian/files/patch-configure
--- dansguardian.orig/files/patch-configure	Fri Jul  4 15:24:18 2003
+++ dansguardian/files/patch-configure	Mon Jul  7 12:11:05 2003
@@ -1,11 +1,57 @@
---- configure.orig	Tue Apr  2 09:15:26 2002
-+++ configure	Tue Apr  2 09:29:41 2002
-@@ -2667,7 +2667,7 @@
+--- configure.orig	Mon Jul  7 12:09:35 2003
++++ configure	Mon Jul  7 12:10:25 2003
+@@ -2540,7 +2540,7 @@
  $extendedecho "SYSVLOCATION = \${PREFIX}$sysvdir" >>Makefile
  $extendedecho "CGIBINLOCATION = \${PREFIX}$cgidir" >>Makefile
  $extendedecho "MANUALFILES = \${PREFIX}$mandir" >>Makefile
 -$extendedecho "LOGLOCATION = \${PREFIX}$logdir" >>Makefile
 +$extendedecho "LOGLOCATION = $logdir" >>Makefile
+ $extendedecho "LOGROTATELOCATION = \${PREFIX}$logrotatedir" >>Makefile
  echo "PROXYUSER = $runas_usr" >>Makefile
  echo "PROXYGROUP = $runas_grp" >>Makefile
- echo "PIDDIR = $piddir" >>Makefile
+@@ -2665,27 +2665,6 @@
+                         rm -f dansguardian.bsdv
+                 fi
+                 cat autoconf/bsdv.in > dansguardian.bsdv
+-                $extendedecho "        [ -x $prefixdir$bindir\c" >> 
dansguardian.bsdv
+-                $extendedecho "dansguardian ] && $prefixdir$bindir\c" 
--- patch-dansguardian-2.6.1.3 ends here ---

>Release-Note:
>Audit-Trail:

From: Freddie Cash <fcash@sd73.bc.ca>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/54199: port update:  www/dansguardian to version 2.6.1-3
Date: Wed, 13 Aug 2003 09:18:41 -0700

 --Boundary-00=_hTmO/FGXoiZVAJV
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Some people have mentioned issues with the original patch.  I've 
 attached a new patch that 3 different people in cyberspace have tested 
 and are using on their systems.  I have not heard anything negative 
 back from them, so I am submitting it here.
 
 Have a look and let me know if anything else needs fixing.  It if 
 appears to work, could someone please commit it?  The existing port is 
 horribly out-of-date.  Thanks.
 
 -- 
 Freddie Cash				District HelpDesk / Network Admin
 fcash@sd73.bc.ca			helpdesk@sd73.bc.ca
 					(250) 374-0679 ext. 219
 
 --Boundary-00=_hTmO/FGXoiZVAJV
 Content-Type: text/x-diff;
   charset="us-ascii";
   name="dansguardian-2.6.1-3.diff"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="dansguardian-2.6.1-3.diff"
 
 =2D-- patch-dansguardian-2.6.1.3 begins here ---
 diff -ruN dansguardian.orig/Makefile dansguardian/Makefile
 =2D-- dansguardian.orig/Makefile=A0=A0Fri Jul =A04 15:24:18 2003
 +++ dansguardian/Makefile=A0=A0=A0=A0=A0=A0=A0Mon Jul =A07 15:15:07 2003
 @@ -1,19 +1,18 @@
 =A0# New ports collection makefile for:=A0=A0=A0dansguardian
 =A0# Date created:=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
 =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0March 26, 2002
 =2D# Whom:=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
 =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0Freddie Cash <fcas=
 h@bigfoot.com>
 +# Whom:=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
 =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0Freddie Cash <fcash@s=
 d73.bc.ca>
 =A0#
 =A0# $FreeBSD: ports/www/dansguardian/Makefile,v 1.8 2003/02/21 14:01:15 kn=
 u Exp $
 =A0#
 
 =A0PORTNAME=3D=A0=A0=A0=A0=A0=A0dansguardian
 =2DPORTVERSION=3D=A0=A0=A02.2.10.0
 =2DPORTREVISION=3D=A0=A01
 +PORTVERSION=3D=A0=A0=A02.6.1.3
 =A0CATEGORIES=3D=A0=A0=A0=A0www
 =A0MASTER_SITES=3D=A0=A0# empty, see below
 =A0DISTNAME=3D=A0=A0=A0=A0=A0=A0DansGuardian-${PORTVERSION:R}-${PORTVERSION=
 :E}.source
 
 =2DMAINTAINER=3D=A0=A0=A0=A0fcash@bigfoot.com
 =2DCOMMENT=3D=A0=A0=A0=A0=A0=A0=A0A fast, simple web content filter for Squ=
 id proxy servers
 +MAINTAINER=3D=A0=A0=A0=A0fcash@sd73.bc.ca
 +COMMENT=3D=A0=A0=A0=A0=A0=A0=A0A fast, featureful web content filter for S=
 quid proxy servers
 
 =A0RUN_DEPENDS=3D=A0=A0=A0${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:i=
 nstall \
 =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0${LOCALBASE}/sbin/httpd:${P=
 ORTSDIR}/www/apache13:install
 @@ -31,16 +30,19 @@
 
 =A0DG_URL=3D=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0http://dansguar=
 dian.org/index.php?page=3Dcopyright2
 
 =2D.if defined(WITHOUT_PICS)
 =2DCONFIGURE_ARGS+=3D=A0=A0=A0=A0=A0=A0=A0--without-pics-filter
 =2D.endif
 =2D
 =A0MAN8=3D=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0dansguardian.8
 
 =A0NO_CDROM=3D=A0=A0=A0=A0=A0=A0"Commercial download is restricted. =A0Chec=
 k ${DG_URL} for more info"
 =A0NO_PACKAGE=3D=A0=A0=A0=A0"Redistribution is restricted. =A0Check ${DG_UR=
 L} for more info"
 +RESTRICTED=3D=A0=A0=A0=A0${NO_PACKAGE}
 
 =A0.include <bsd.port.pre.mk>
 +
 +.if ${OSVERSION} > 500000 || defined(WITH_GCC3)
 +CONFIGURE_ARGS+=3D=A0=A0=A0=A0=A0=A0=A0--gccver=3D3
 +.else
 +CONFIGURE_ARGS+=3D=A0=A0=A0=A0=A0=A0=A0--gccver=3D2
 +.endif
 
 =A0.if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}))
 =A0IGNORE=3D=A0=A0=A0=A0=A0=A0=A0=A0"Commercial source download is restrict=
 ed. =A0Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SU=
 =46X} into ${DISTDIR} before running make"
 diff -ruN dansguardian.orig/distinfo dansguardian/distinfo
 =2D-- dansguardian.orig/distinfo=A0=A0Fri Jul =A04 15:24:18 2003
 +++ dansguardian/distinfo=A0=A0=A0=A0=A0=A0=A0Mon Jul =A07 11:10:43 2003
 @@ -1 +1 @@
 =2DMD5 (DansGuardian-2.2.10-0.source.tar.gz) =3D 1249c28c02fe1abb8313c9f710=
 86a2c5
 +MD5 (DansGuardian-2.6.1-3.source.tar.gz) =3D 21fa3b79fb66817c95003d320b62a=
 4c1
 diff -ruN dansguardian.orig/files/patch-FatController.cpp dansguardian/file=
 s/patch-FatController.cpp
 =2D-- dansguardian.orig/files/patch-FatController.cpp=A0=A0=A0=A0=A0Wed Dec=
  31 16:00:00 1969
 +++ dansguardian/files/patch-FatController.cpp=A0=A0Mon Jul =A07 15:03:36 2=
 003
 @@ -0,0 +1,11 @@
 +--- FatController.cpp.orig=A0=A0=A0=A0=A0Mon Jul =A07 14:59:33 2003
 ++++ FatController.cpp=A0=A0Mon Jul =A07 14:59:52 2003
 +@@ -513,7 +513,7 @@
 + =A0 =A0 if (conn) {
 + =A0 =A0 =A0 =A0 if (report) {
 + =A0 =A0 =A0 =A0 =A0 =A0 if (!isDaemonised) {
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0std::cerr << "Error creating connecting t=
 o test proxy" << std::endl;
 ++ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0std::cerr << "Error creating connection t=
 o test proxy" << std::endl;
 + =A0 =A0 =A0 =A0 =A0 =A0 }
 + =A0 =A0 =A0 =A0 =A0 =A0 syslog(LOG_ERR, "%s","Error creating connection t=
 o test proxy");
 + =A0 =A0 =A0 =A0 }
 diff -ruN dansguardian.orig/files/patch-autoconf::bsdv.in dansguardian/file=
 s/patch-autoconf::bsdv.in
 =2D-- dansguardian.orig/files/patch-autoconf::bsdv.in=A0=A0=A0=A0=A0Wed Dec=
  31 16:00:00 1969
 +++ dansguardian/files/patch-autoconf::bsdv.in=A0=A0Mon Jul =A07 12:13:25 2=
 003
 @@ -0,0 +1,37 @@
 +--- autoconf/bsdv.in.orig=A0=A0=A0=A0=A0=A0Mon Jul =A07 12:04:33 2003
 ++++ autoconf/bsdv.in=A0=A0=A0Mon Jul =A07 12:07:11 2003
 +@@ -1,16 +1,26 @@
 + #!/bin/sh
 + #
 +-# BSD startup script for dansguardian
 +-# partly based on httpd startup script
 ++# BSD startup script for dansguardian.
 + #
 +-# description: A web content filtering plugin for web \
 +-# =A0 =A0 =A0 =A0 =A0 =A0 =A0proxies, developed to filter using lists of \
 +-# =A0 =A0 =A0 =A0 =A0 =A0 =A0banned phrases, MIME types, filename \
 ++# description: A web content filtering plugin for web
 ++# =A0 =A0 =A0 =A0 =A0 =A0 =A0proxies, developed to filter using lists of
 ++# =A0 =A0 =A0 =A0 =A0 =A0 =A0banned phrases, MIME types, filename
 + # =A0 =A0 =A0 =A0 =A0 =A0 =A0extensions and PICS labling.
 + # processname: dansguardian
 +
 +-
 +-# See how we were called.
 +-
 + case "$1" in
 + start)
 ++=A0=A0=A0=A0=A0=A0[ -x /usr/local/sbin/dansguardian ] && /usr/local/sbin/=
 dansguardian
 ++=A0=A0=A0=A0=A0=A0echo -n " dansguardian"
 ++=A0=A0=A0=A0=A0=A0;;
 ++stop)
 ++=A0=A0=A0=A0=A0=A0/usr/local/sbin/dansguardian -q
 ++=A0=A0=A0=A0=A0=A0rm -f /tmp/.dguardianipc
 ++=A0=A0=A0=A0=A0=A0echo -n " dansguardian"
 ++=A0=A0=A0=A0=A0=A0;;
 ++*)
 ++=A0=A0=A0=A0=A0=A0echo "Usage: $0 {start|stop|restart}"
 ++=A0=A0=A0=A0=A0=A0;;
 ++esac
 ++exit 0
 ++
 diff -ruN dansguardian.orig/files/patch-autoconf::fbsd.in dansguardian/file=
 s/patch-autoconf::fbsd.in
 =2D-- dansguardian.orig/files/patch-autoconf::fbsd.in=A0=A0=A0=A0=A0Fri Jul=
  =A04 15:24:18 2003
 +++ dansguardian/files/patch-autoconf::fbsd.in=A0=A0Mon Jul =A07 14:52:05 2=
 003
 @@ -1,7 +1,7 @@
 =2D--- autoconf/fbsd.in.orig=A0=A0=A0=A0=A0=A0Tue Apr =A02 11:51:15 2002
 =2D+++ autoconf/fbsd.in=A0=A0=A0Tue Apr =A02 11:54:12 2002
 =2D@@ -17,7 +17,7 @@
 =2D =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dansguardian.conf config.cache Makef=
 ile logrotation
 +--- autoconf/fbsd.in.orig=A0=A0=A0=A0=A0=A0Mon Jul =A07 02:47:25 2003
 ++++ autoconf/fbsd.in=A0=A0=A0Mon Jul =A07 14:51:43 2003
 +@@ -20,7 +20,7 @@
 + =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 logrotate.dansguardian
 
 =A0 PASSVARS =3D -DPROXYUSER=3D\"${PROXYUSER}\"
 =A0-PASSVARS +=3D -DLOGLOCATION=3D\"${LOGLOCATION}access.log\"
 @@ -9,67 +9,125 @@
 =A0 PASSVARS +=3D
 =2DDCONFFILELOCATION=3D\"${CONFFILELOCATION}dansguardian.conf\"
 =A0 PASSVARS +=3D -DPIDDIR=3D\"${PIDDIR}\"
 
 =2D@@ -34,36 +34,31 @@
 +@@ -37,56 +37,86 @@
 =A0 .cpp.o:
 =A0 =A0=A0=A0=A0=A0=A0$(CPP) $(DEBUG) $(CFLAGS) -c $<
 
 =2D all:=A0=A0$(OBJ)
 +-all:=A0=A0$(OBJ)
 ++all:=A0=A0$(OBJ)
 =A0 =A0=A0=A0=A0=A0=A0$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(=
 LIBS) dansguardian.cpp
 
 =A0 install:
 =2D =A0=A0=A0=A0=A0=A0@test -d $(SYSVLOCATION) || install -d $(SYSVLOCATION)
 =2D =A0=A0=A0=A0=A0=A0@test -d $(CONFFILELOCATION) || install -d $(CONFFILE=
 LOCATION)
 =2D =A0=A0=A0=A0=A0=A0@test -d $(CGIBINLOCATION) || install -d $(CGIBINLOCA=
 TION)
 =2D-=A0=A0=A0=A0=A0=A0@test -d $(MANUALFILES)man8/ || install -d $(MANUALFI=
 LES)man8/
 =2D-=A0=A0=A0=A0=A0=A0@test -d $(LOGLOCATION) || install -d $(LOGLOCATION)
 =2D-=A0=A0=A0=A0=A0=A0@test -d $(BINARYLOCATION) || /usr/sbin/install -d $(=
 BINARYLOCATION)
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian $(BINARYLOCATION)dansguardian
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian.conf $(CONFFILELOCATION)dansguar=
 dian.conf
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./bannedphraselist $(CONFFILELOCATION)bannedphr=
 aselist
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./bannedextensionlist $(CONFFILELOCATION)banned=
 extensionlist
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./bannedmimetypelist $(CONFFILELOCATION)bannedm=
 imetypelist
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./bannedurllist $(CONFFILELOCATION)bannedurllist
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./bannedregexpurllist $(CONFFILELOCATION)banned=
 regexpurllist
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./bannedsitelist $(CONFFILELOCATION)bannedsitel=
 ist
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./exceptionsitelist $(CONFFILELOCATION)exceptio=
 nsitelist
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./exceptionuserlist $(CONFFILELOCATION)exceptio=
 nuserlist
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./exceptioniplist $(CONFFILELOCATION)exceptioni=
 plist
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./pics $(CONFFILELOCATION)pics
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./logrotation $(CONFFILELOCATION)logrotation
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian.bsdv $(SYSVLOCATION)dansguardian=
 =2Esh
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian.pl $(CGIBINLOCATION)dansguardian=
 =2Epl
 =2D-=A0=A0=A0=A0=A0=A0chmod o+x $(CGIBINLOCATION)dansguardian.pl
 =2D-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian.8.gz $(MANUALFILES)man8/dansguar=
 dian.8.gz
 =2D-=A0=A0=A0=A0=A0=A0chown -R $(PROXYUSER).$(PROXYGROUP) $(LOGLOCATION)
 =2D-=A0=A0=A0=A0=A0=A0chmod -R u+wr $(LOGLOCATION)
 =2D-=A0=A0=A0=A0=A0=A0chmod u+wrx $(LOGLOCATION)
 =2D+=A0=A0=A0=A0=A0=A0@test -d $(BINARYLOCATION) || install -d $(BINARYLOCA=
 TION)
 =2D+=A0=A0=A0=A0=A0=A0@install -m 755 -o root -g wheel ./dansguardian $(BIN=
 ARYLOCATION)dansguardian
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./dansguardian.conf =
 $(CONFFILELOCATION)dansguardian.conf
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./bannedphraselist $=
 (CONFFILELOCATION)bannedphraselist
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./bannedextensionlis=
 t $(CONFFILELOCATION)bannedextensionlist
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./bannedmimetypelist=
  $(CONFFILELOCATION)bannedmimetypelist
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./bannedurllist $(CO=
 NFFILELOCATION)bannedurllist
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./bannedregexpurllis=
 t $(CONFFILELOCATION)bannedregexpurllist
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./bannedsitelist $(C=
 ONFFILELOCATION)bannedsitelist
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./exceptionsitelist =
 $(CONFFILELOCATION)exceptionsitelist
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./exceptionuserlist =
 $(CONFFILELOCATION)exceptionuserlist
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./exceptioniplist $(=
 CONFFILELOCATION)exceptioniplist
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./pics $(CONFFILELOC=
 ATION)pics
 =2D+=A0=A0=A0=A0=A0=A0@install -m 755 -o root -g wheel ./dansguardian.bsdv =
 $(SYSVLOCATION)start-dg.sh
 =2D+=A0=A0=A0=A0=A0=A0@install -m 755 -o root -g wheel ./dansguardian.pl $(=
 CGIBINLOCATION)dansguardian.pl
 =2D+=A0=A0=A0=A0=A0=A0@install -m 644 -o root -g wheel ./dansguardian.8 $(M=
 ANUALFILES)man8/dansguardian.8
 =2D+=A0=A0=A0=A0=A0=A0@touch $(LOGLOCATION)dansguardian.log
 =2D+=A0=A0=A0=A0=A0=A0@chown $(PROXYUSER):$(PROXYGROUP) $(LOGLOCATION)dansg=
 uardian.log
 + =A0=A0=A0=A0=A0=A0@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATI=
 ON)
 + =A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFI=
 LELOCATION)
 + =A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists || install -d=
  $I$(CONFFILELOCATION)phraselists
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/chat || insta=
 ll -d $I$(CONFFILELOCATION)phraselists/chat
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/drugadvocacy =
 || install -d $I$(CONFFILELOCATION)phraselists/drugadvocacy
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/dutchbadwords=
  || install -d $I$(CONFFILELOCATION)phraselists/dutchbadwords
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/frenchbadword=
 s || install -d $I$(CONFFILELOCATION)phraselists/frenchbadwords
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/gambling || i=
 nstall -d $I$(CONFFILELOCATION)phraselists/gambling
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/goodphrases |=
 | install -d $I$(CONFFILELOCATION)phraselists/goodphrases
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/gore || insta=
 ll -d $I$(CONFFILELOCATION)phraselists/gore
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/illegaldrugs =
 || install -d $I$(CONFFILELOCATION)phraselists/illegaldrugs
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/intolerance |=
 | install -d $I$(CONFFILELOCATION)phraselists/intolerance
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/italianbadwor=
 ds || install -d $I$(CONFFILELOCATION)phraselists/italianbadwords
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/legaldrugs ||=
  install -d $I$(CONFFILELOCATION)phraselists/legaldrugs
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/personals || =
 install -d $I$(CONFFILELOCATION)phraselists/personals
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/pornography |=
 | install -d $I$(CONFFILELOCATION)phraselists/pornography
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/violence || i=
 nstall -d $I$(CONFFILELOCATION)phraselists/violence
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/warezhacking =
 || install -d $I$(CONFFILELOCATION)phraselists/warezhacking
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(CONFFILELOCATION)phraselists/weapons || in=
 stall -d $I$(CONFFILELOCATION)phraselists/weapons
 + =A0=A0=A0=A0=A0=A0@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLO=
 CATION)
 + =A0=A0=A0=A0=A0=A0@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUAL=
 =46ILES)man8/
 + =A0=A0=A0=A0=A0=A0@test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION)
 +-=A0=A0=A0=A0=A0=A0@test -d $I$(BINARYLOCATION) || /usr/sbin/install -d $I=
 $(BINARYLOCATION)
 +-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
 +-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian.conf $I$(CONFFILELOCATION)dansguar=
 dian.conf
 +-=A0=A0=A0=A0=A0=A0cp -f ./bannedphraselist $I$(CONFFILELOCATION)bannedphr=
 aselist
 +-=A0=A0=A0=A0=A0=A0cp -f ./exceptionphraselist $I$(CONFFILELOCATION)except=
 ionphraselist
 +-=A0=A0=A0=A0=A0=A0cp -f ./weightedphraselist $I$(CONFFILELOCATION)weighte=
 dphraselist
 +-=A0=A0=A0=A0=A0=A0cp -f -R ./phraselists/* $I$(CONFFILELOCATION)phraselis=
 ts/
 +-=A0=A0=A0=A0=A0=A0cp -f ./bannediplist $I$(CONFFILELOCATION)bannediplist
 +-=A0=A0=A0=A0=A0=A0cp -f ./banneduserlist $I$(CONFFILELOCATION)banneduserl=
 ist
 +-=A0=A0=A0=A0=A0=A0cp -f ./bannedextensionlist $I$(CONFFILELOCATION)banned=
 extensionlist
 +-=A0=A0=A0=A0=A0=A0cp -f ./bannedmimetypelist $I$(CONFFILELOCATION)bannedm=
 imetypelist
 +-=A0=A0=A0=A0=A0=A0cp -f ./bannedurllist $I$(CONFFILELOCATION)bannedurllist
 +-=A0=A0=A0=A0=A0=A0cp -f ./bannedregexpurllist $I$(CONFFILELOCATION)banned=
 regexpurllist
 +-=A0=A0=A0=A0=A0=A0cp -f ./bannedsitelist $I$(CONFFILELOCATION)bannedsitel=
 ist
 +-=A0=A0=A0=A0=A0=A0cp -f ./contentregexplist $I$(CONFFILELOCATION)contentr=
 egexplist
 +-=A0=A0=A0=A0=A0=A0cp -f ./exceptionsitelist $I$(CONFFILELOCATION)exceptio=
 nsitelist
 +-=A0=A0=A0=A0=A0=A0cp -f ./exceptionurllist $I$(CONFFILELOCATION)exception=
 urllist
 +-=A0=A0=A0=A0=A0=A0cp -f ./exceptionuserlist $I$(CONFFILELOCATION)exceptio=
 nuserlist
 +-=A0=A0=A0=A0=A0=A0cp -f ./exceptioniplist $I$(CONFFILELOCATION)exceptioni=
 plist
 +-=A0=A0=A0=A0=A0=A0cp -f ./pics $I$(CONFFILELOCATION)pics
 +-=A0=A0=A0=A0=A0=A0cp -f ./template.html $I$(CONFFILELOCATION)template.html
 +-=A0=A0=A0=A0=A0=A0cp -f ./messages $I$(CONFFILELOCATION)messages
 +-=A0=A0=A0=A0=A0=A0cp -f ./logrotation $I$(CONFFILELOCATION)logrotation
 +-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian.bsdv $I$(SYSVLOCATION)dansguardian=
 =2Esh
 +-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian=
 =2Epl
 +-=A0=A0=A0=A0=A0=A0chmod o+x $I$(CGIBINLOCATION)dansguardian.pl
 +-=A0=A0=A0=A0=A0=A0cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguar=
 dian.8.gz
 +-=A0=A0=A0=A0=A0=A0chown -R $(PROXYUSER).$(PROXYGROUP) $I$(LOGLOCATION)
 +-=A0=A0=A0=A0=A0=A0chmod -R u+wr $I$(LOGLOCATION)
 +-=A0=A0=A0=A0=A0=A0chmod u+wrx $I$(LOGLOCATION)
 +-=A0=A0=A0=A0=A0=A0if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.=
 dansguardian $I$(LOGROTATELOCATION)dansguardian; fi
 ++=A0=A0=A0=A0=A0=A0@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLO=
 CATION)
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 755 ./dansguardian $I$(BINA=
 RYLOCATION)dansguardian
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./dansguardian.conf $I$=
 (CONFFILELOCATION)dansguardian.conf
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./bannedphraselist $I$(=
 CONFFILELOCATION)bannedphraselist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./exceptionphraselist $=
 I$(CONFFILELOCATION)exceptionphraselist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./weightedphraselist $I=
 $(CONFFILELOCATION)weightedphraselist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/chat/weig=
 hted $I$(CONFFILELOCATION)phraselists/chat/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/drugadvoc=
 acy/weighted $I$(CONFFILELOCATION)phraselists/drugadvocacy/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/dutchbadw=
 ords/weighted $I$(CONFFILELOCATION)phraselists/dutchbadwords/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/frenchbad=
 words/weighted $I$(CONFFILELOCATION)phraselists/frenchbadwords/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/gambling/=
 banned $I$(CONFFILELOCATION)phraselists/gambling/banned
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/gambling/=
 weighted $I$(CONFFILELOCATION)phraselists/gambling/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/goodphras=
 es/exception $I$(CONFFILELOCATION)phraselists/goodphrases/exception
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/goodphras=
 es/weighted $I$(CONFFILELOCATION)phraselists/goodphrases/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/gore/weig=
 hted $I$(CONFFILELOCATION)phraselists/gore/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/illegaldr=
 ugs/banned $I$(CONFFILELOCATION)phraselists/illegaldrugs/banned
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/illegaldr=
 ugs/weighted $I$(CONFFILELOCATION)phraselists/illegaldrugs/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/intoleran=
 ce/banned $I$(CONFFILELOCATION)phraselists/intolerance/banned
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/intoleran=
 ce/weighted $I$(CONFFILELOCATION)phraselists/intolerance/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/italianba=
 dwords/weighted $I$(CONFFILELOCATION)phraselists/italianbadwords/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/legaldrug=
 s/weighted $I$(CONFFILELOCATION)phraselists/legaldrugs/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/personals=
 /weighted $I$(CONFFILELOCATION)phraselists/personals/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/pornograp=
 hy/banned $I$(CONFFILELOCATION)phraselists/pornography/banned
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/pornograp=
 hy/weighted $I$(CONFFILELOCATION)phraselists/pornography/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/violence/=
 weighted $I$(CONFFILELOCATION)phraselists/violence/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/warezhack=
 ing/weighted $I$(CONFFILELOCATION)phraselists/warezhacking/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./phraselists/weapons/w=
 eighted $I$(CONFFILELOCATION)phraselists/weapons/weighted
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./bannediplist $I$(CONF=
 =46ILELOCATION)bannediplist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./banneduserlist $I$(CO=
 NFFILELOCATION)banneduserlist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./bannedextensionlist $=
 I$(CONFFILELOCATION)bannedextensionlist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./bannedmimetypelist $I=
 $(CONFFILELOCATION)bannedmimetypelist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./bannedurllist $I$(CON=
 =46FILELOCATION)bannedurllist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./bannedregexpurllist $=
 I$(CONFFILELOCATION)bannedregexpurllist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./bannedsitelist $I$(CO=
 NFFILELOCATION)bannedsitelist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./contentregexplist $I$=
 (CONFFILELOCATION)contentregexplist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./exceptionsitelist $I$=
 (CONFFILELOCATION)exceptionsitelist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./exceptionurllist $I$(=
 CONFFILELOCATION)exceptionurllist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./exceptionuserlist $I$=
 (CONFFILELOCATION)exceptionuserlist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./exceptioniplist $I$(C=
 ONFFILELOCATION)exceptioniplist
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./pics $I$(CONFFILELOCA=
 TION)pics
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./template.html $I$(CON=
 =46FILELOCATION)template.html
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./messages $I$(CONFFILE=
 LOCATION)messages
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 755 ./dansguardian.bsdv $I$=
 (SYSVLOCATION)start-dg.sh
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 755 ./dansguardian.pl $I$(C=
 GIBINLOCATION)dansguardian.pl
 ++=A0=A0=A0=A0=A0=A0install -o root -g wheel -m 644 ./dansguardian.8 $I$(MA=
 NUALFILES)man8/dansguardian.8
 ++=A0=A0=A0=A0=A0=A0install -o nobody -g nogroup -m 644 /dev/null $I$(LOGLO=
 CATION)dansguardian.log
 
 =A0 uninstall:
 =A0 =A0=A0=A0=A0=A0=A0rm -f $(BINARYLOCATION)dansguardian
 =2D@@ -71,7 +66,7 @@
 + =A0=A0=A0=A0=A0=A0rm -f $(SYSVLOCATION)dansguardian
 =A0 =A0=A0=A0=A0=A0=A0rm -f $(CGIBINLOCATION)dansguardian.pl
 =2D =A0=A0=A0=A0=A0=A0rm -f $(MANUALFILES)man8/dansguardian.8.gz
 +-=A0=A0=A0=A0=A0=A0rm -f $(MANUALFILES)man8/dansguardian.8.gz
 ++=A0=A0=A0=A0=A0=A0rm -f $(MANUALFILES)man8/dansguardian.8*
 =A0 =A0=A0=A0=A0=A0=A0rm -fr $(CONFFILELOCATION)
 =A0-=A0=A0=A0=A0=A0=A0rm -fr $(LOGLOCATION)
 =2D+=A0=A0=A0=A0=A0=A0rm -f $(LOGLOCATION)dansguardian.log
 +-=A0=A0=A0=A0=A0=A0if [ -f $(LOGROTATELOCATION)dansguardian ]; then rm -f =
 $(LOGROTATELOCATION)dansguardian; fi
 ++=A0=A0=A0=A0=A0=A0rm -f $(LOGLOCATION)/dansguardian.log
 
 =A0 clean:
 =A0 =A0=A0=A0=A0=A0=A0rm -f $(OBJ) $(PROG)
 diff -ruN dansguardian.orig/files/patch-configure dansguardian/files/patch-=
 configure
 =2D-- dansguardian.orig/files/patch-configure=A0=A0=A0=A0=A0Fri Jul =A04 15=
 :24:18 2003
 +++ dansguardian/files/patch-configure=A0=A0Mon Jul =A07 12:11:05 2003
 @@ -1,11 +1,57 @@
 =2D--- configure.orig=A0=A0=A0=A0=A0Tue Apr =A02 09:15:26 2002
 =2D+++ configure=A0=A0Tue Apr =A02 09:29:41 2002
 =2D@@ -2667,7 +2667,7 @@
 +--- configure.orig=A0=A0=A0=A0=A0Mon Jul =A07 12:09:35 2003
 ++++ configure=A0=A0Mon Jul =A07 12:10:25 2003
 +@@ -2540,7 +2540,7 @@
 =A0 $extendedecho "SYSVLOCATION =3D \${PREFIX}$sysvdir" >>Makefile
 =A0 $extendedecho "CGIBINLOCATION =3D \${PREFIX}$cgidir" >>Makefile
 =A0 $extendedecho "MANUALFILES =3D \${PREFIX}$mandir" >>Makefile
 =A0-$extendedecho "LOGLOCATION =3D \${PREFIX}$logdir" >>Makefile
 =A0+$extendedecho "LOGLOCATION =3D $logdir" >>Makefile
 + $extendedecho "LOGROTATELOCATION =3D \${PREFIX}$logrotatedir" >>Makefile
 =A0 echo "PROXYUSER =3D $runas_usr" >>Makefile
 =A0 echo "PROXYGROUP =3D $runas_grp" >>Makefile
 =2D echo "PIDDIR =3D $piddir" >>Makefile
 +@@ -2665,27 +2665,6 @@
 + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 rm -f dansguardian.bsdv
 + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 fi
 + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 cat autoconf/bsdv.in > dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0$extendedecho " =A0 =A0 =A0 =A0[ -x $pref=
 ixdir$bindir\c" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0$extendedecho "dansguardian ] && $prefixd=
 ir$bindir\c" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo "dansguardian > /dev/null && $extend=
 edecho ' dansguardian\c'" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo " =A0 =A0 =A0 =A0;;" >> dansguardian=
 =2Ebsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo "stop)" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0$extendedecho " =A0 =A0 =A0 =A0$prefixdir=
 $bindir\c" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo "dansguardian -q" >> dansguardian.bs=
 dv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0$extendedecho " =A0 =A0 =A0 =A0[ -r /tmp/=
 \c" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo ".dguardianipc ] && $extendedecho ' =
 dansguardian\c'" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo " =A0 =A0 =A0 =A0rm -f /tmp/.dguardi=
 anipc" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo " =A0 =A0 =A0 =A0;;" >> dansguardian=
 =2Ebsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo "restart)" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo " =A0 =A0 =A0 =A0\$0 stop" >> dansgu=
 ardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo " =A0 =A0 =A0 =A0\$0 start" >> dansg=
 uardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo " =A0 =A0 =A0 =A0;;" >> dansguardian=
 =2Ebsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo "*)" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo " =A0 =A0 =A0 =A0echo \"Usage: `base=
 name \$0` {start|stop|restart}\" >&2" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo " =A0 =A0 =A0 =A0;;" >> dansguardian=
 =2Ebsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo "esac" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0echo "exit 0" >> dansguardian.bsdv
 +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0chmod u+x dansguardian.bsdv
 + =A0=A0=A0=A0=A0=A0;;
 + =A0=A0=A0=A0=A0=A0NetBSD*)
 + =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0if [ -f dansguardian.bsdv ]; th=
 en
 +@@ -3082,7 +3061,7 @@
 + echo "" >>logrotation
 + echo "LOG_DIR=3D$prefixdir$logdir" >>logrotation
 + echo "NUM_LOGS=3D4" >>logrotation
 +-echo "LOG=3D\$LOG_DIR/access.log" >>logrotation
 ++echo "LOG=3D\$LOG_DIR/dansguardian.log" >>logrotation
 + echo "" >>logrotation
 +
 + case `uname -s` in
 +@@ -3176,7 +3155,7 @@
 + fi
 +
 + $extendedecho "$prefixdir$logdir\c" >>logrotate.dansguardian
 +-echo "access.log {" >>logrotate.dansguardian
 ++echo "dansguardian.log {" >>logrotate.dansguardian
 + echo " =A0rotate 4" >>logrotate.dansguardian
 + echo " =A0weekly" >>logrotate.dansguardian
 + echo " =A0sharedscripts" >>logrotate.dansguardian
 diff -ruN dansguardian.orig/files/patch-dansguardian.8 dansguardian/files/p=
 atch-dansguardian.8
 =2D-- dansguardian.orig/files/patch-dansguardian.8=A0=A0=A0=A0=A0=A0=A0=A0F=
 ri Jul =A04 15:24:18 2003
 +++ dansguardian/files/patch-dansguardian.8=A0=A0=A0=A0=A0Mon Jul =A07 11:3=
 8:34 2003
 @@ -1,11 +1,11 @@
 =2D--- dansguardian.8.orig=A0=A0=A0=A0=A0=A0=A0=A0Tue Mar 26 09:03:19 2002
 =2D+++ dansguardian.8=A0=A0=A0=A0=A0Tue Mar 26 09:03:25 2002
 +--- dansguardian.8.orig=A0=A0=A0=A0=A0=A0=A0=A0Mon Jul =A07 11:37:24 2003
 ++++ dansguardian.8=A0=A0=A0=A0=A0Mon Jul =A07 11:38:15 2003
 =A0@@ -3,7 +3,7 @@
 =A0 .SH NAME
 =A0 DansGuardian 2
 =A0 .SH SYNOPSIS
 =A0-/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
 =2D+/usr/local/etc/rc.d/dansguardian.sh [stop|start|restart]
 ++/usr/local/etc/rc.d/start-dg.sh [stop|start|restart]
 =A0 .SH DESCRIPTION
 =A0 A Introduction
 
 diff -ruN dansguardian.orig/pkg-descr dansguardian/pkg-descr
 =2D-- dansguardian.orig/pkg-descr=A0Fri Jul =A04 15:24:18 2003
 +++ dansguardian/pkg-descr=A0=A0=A0=A0=A0=A0Mon Jul =A07 15:11:59 2003
 @@ -1,20 +1,20 @@
 =A0DansGuardian is a web content filtering proxy for Linux, FreeBSD, OpenBS=
 D,
 =2Dand Solaris. It relies on a proxy server, such as Squid, for all fetchin=
 g;
 =2Dhowever, DansGuardian should work with any proxy server.
 +and Solaris. It relies on a proxy server, for all fetching. =A0The preferr=
 ed
 +proxy is Squid, however, DansGuardian should work with any proxy server.
 
 =A0It filters using multiple methods, including:
 =A0 =A0- URL and domain filtering
 =2D =A0- content phrase filtering
 + =A0- textual content filtering
 =A0 =A0- PICS filtering
 =2D =A0- MIME filtering
 + =A0- MIME-type filtering
 =A0 =A0- file extension filtering
 =A0 =A0- POST filtering
 =2D
 =2DRunning make with WITHOUT_PICS=3Dyes will disable the PICS filtering.  A=
 ll
 =2Dother filtering is controlled via the configuration file.
 + =A0- user filtering
 + =A0- client IP filtering
 + =A0- exception lists for most of the above
 
 =A0WWW: http://dansguardian.org
 =2DWWW: http://backup.dansguardian.org
 +WWW: http://dansguardian.intmain.org
 
 =A0- Freddie Cash
 =2Dfcash@bigfoot.com
 +fcash@sd73.bc.ca
 diff -ruN dansguardian.orig/pkg-plist dansguardian/pkg-plist
 =2D-- dansguardian.orig/pkg-plist=A0Fri Jul =A04 15:24:18 2003
 +++ dansguardian/pkg-plist=A0=A0=A0=A0=A0=A0Mon Jul =A07 15:21:19 2003
 @@ -1,18 +1,81 @@
 =A0@exec mkdir -p etc/dansguardian
 =2Detc/dansguardian/dansguardian.conf
 =2Detc/dansguardian/bannedphraselist
 +@exec mkdir -p etc/dansguardian/phraselists
 +@exec mkdir -p etc/dansguardian/phraselists/chat
 +@exec mkdir -p etc/dansguardian/phraselists/drugadvocacy
 +@exec mkdir -p etc/dansguardian/phraselists/dutchbadwords
 +@exec mkdir -p etc/dansguardian/phraselists/frenchbadwords
 +@exec mkdir -p etc/dansguardian/phraselists/gambling
 +@exec mkdir -p etc/dansguardian/phraselists/goodphrases
 +@exec mkdir -p etc/dansguardian/phraselists/gore
 +@exec mkdir -p etc/dansguardian/phraselists/illegaldrugs
 +@exec mkdir -p etc/dansguardian/phraselists/intolerance
 +@exec mkdir -p etc/dansguardian/phraselists/italianbadwords
 +@exec mkdir -p etc/dansguardian/phraselists/legaldrugs
 +@exec mkdir -p etc/dansguardian/phraselists/personals
 +@exec mkdir -p etc/dansguardian/phraselists/pornography
 +@exec mkdir -p etc/dansguardian/phraselists/violence
 +@exec mkdir -p etc/dansguardian/phraselists/warezhacking
 +@exec mkdir -p etc/dansguardian/phraselists/weapons
 =A0etc/dansguardian/bannedextensionlist
 +etc/dansguardian/bannediplist
 =A0etc/dansguardian/bannedmimetypelist
 =2Detc/dansguardian/bannedurllist
 +etc/dansguardian/bannedphraselist
 =A0etc/dansguardian/bannedregexpurllist
 =A0etc/dansguardian/bannedsitelist
 =2Detc/dansguardian/exceptionsitelist
 =2Detc/dansguardian/exceptionuserlist
 +etc/dansguardian/bannedurllist
 +etc/dansguardian/banneduserlist
 +etc/dansguardian/contentregexplist
 +etc/dansguardian/dansguardian.conf
 =A0etc/dansguardian/exceptioniplist
 +etc/dansguardian/exceptionphraselist
 +etc/dansguardian/exceptionurllist
 +etc/dansguardian/exceptionuserlist
 +etc/dansguardian/exceptionsitelist
 +etc/dansguardian/messages
 +etc/dansguardian/phraselists/chat/weighted
 +etc/dansguardian/phraselists/drugadvocacy/weighted
 +etc/dansguardian/phraselists/dutchbadwords/weighted
 +etc/dansguardian/phraselists/frenchbadwords/weighted
 +etc/dansguardian/phraselists/gambling/banned
 +etc/dansguardian/phraselists/gambling/weighted
 +etc/dansguardian/phraselists/goodphrases/exception
 +etc/dansguardian/phraselists/goodphrases/weighted
 +etc/dansguardian/phraselists/gore/weighted
 +etc/dansguardian/phraselists/illegaldrugs/banned
 +etc/dansguardian/phraselists/illegaldrugs/weighted
 +etc/dansguardian/phraselists/intolerance/banned
 +etc/dansguardian/phraselists/intolerance/weighted
 +etc/dansguardian/phraselists/italianbadwords/weighted
 +etc/dansguardian/phraselists/legaldrugs/weighted
 +etc/dansguardian/phraselists/personals/weighted
 +etc/dansguardian/phraselists/pornography/banned
 +etc/dansguardian/phraselists/pornography/weighted
 +etc/dansguardian/phraselists/violence/weighted
 +etc/dansguardian/phraselists/warezhacking/weighted
 +etc/dansguardian/phraselists/weapons/weighted
 =A0etc/dansguardian/pics
 =2Detc/rc.d/dansguardian.sh
 +etc/dansguardian/template.html
 +etc/dansguardian/weightedphraselist
 +etc/rc.d/start-dg.sh
 =A0sbin/dansguardian
 =A0www/cgi-bin/dansguardian.pl
 +@dirrm etc/dansguardian/phraselists/chat
 +@dirrm etc/dansguardian/phraselists/drugadvocacy
 +@dirrm etc/dansguardian/phraselists/dutchbadwords
 +@dirrm etc/dansguardian/phraselists/frenchbadwords
 +@dirrm etc/dansguardian/phraselists/gambling
 +@dirrm etc/dansguardian/phraselists/goodphrases
 +@dirrm etc/dansguardian/phraselists/gore
 +@dirrm etc/dansguardian/phraselists/illegaldrugs
 +@dirrm etc/dansguardian/phraselists/intolerance
 +@dirrm etc/dansguardian/phraselists/italianbadwords
 +@dirrm etc/dansguardian/phraselists/legaldrugs
 +@dirrm etc/dansguardian/phraselists/personals
 +@dirrm etc/dansguardian/phraselists/pornography
 +@dirrm etc/dansguardian/phraselists/violence
 +@dirrm etc/dansguardian/phraselists/warezhacking
 +@dirrm etc/dansguardian/phraselists/weapons
 +@dirrm etc/dansguardian/phraselists
 =A0@dirrm etc/dansguardian
 =A0@unexec echo If permanently deleting this package, /var/log/dansguardian=
 =2Elog must be removed manually
 
 =2D-- patch-dansguardian-2.6.1.3 ends here ---
 --Boundary-00=_hTmO/FGXoiZVAJV--
 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Wed Sep 3 18:09:27 PDT 2003 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54199 
>Unformatted:
 >> dansguardian.bsdv
 +-                echo "dansguardian > /dev/null && $extendedecho ' 
 dansguardian\c'" >> dansguardian.bsdv
 +-                echo "        ;;" >> dansguardian.bsdv
 +-                echo "stop)" >> dansguardian.bsdv
 +-                $extendedecho "        $prefixdir$bindir\c" >> 
 dansguardian.bsdv
 +-                echo "dansguardian -q" >> dansguardian.bsdv
 +-                $extendedecho "        [ -r /tmp/\c" >> 
 dansguardian.bsdv
 +-                echo ".dguardianipc ] && $extendedecho ' 
 dansguardian\c'" >> dansguardian.bsdv
 +-                echo "        rm -f /tmp/.dguardianipc" >> 
 dansguardian.bsdv
 +-                echo "        ;;" >> dansguardian.bsdv
 +-                echo "restart)" >> dansguardian.bsdv
 +-                echo "        \$0 stop" >> dansguardian.bsdv
 +-                echo "        \$0 start" >> dansguardian.bsdv
 +-                echo "        ;;" >> dansguardian.bsdv
 +-                echo "*)" >> dansguardian.bsdv
 +-                echo "        echo \"Usage: `basename \$0` 
 {start|stop|restart}\" >&2" >> dansguardian.bsdv
 +-                echo "        ;;" >> dansguardian.bsdv
 +-                echo "esac" >> dansguardian.bsdv
 +-                echo "exit 0" >> dansguardian.bsdv
 +-                chmod u+x dansguardian.bsdv
 + 	;;
 + 	NetBSD*)
 + 		if [ -f dansguardian.bsdv ]; then
 +@@ -3082,7 +3061,7 @@
 + echo "" >>logrotation
 + echo "LOG_DIR=$prefixdir$logdir" >>logrotation
 + echo "NUM_LOGS=4" >>logrotation
 +-echo "LOG=\$LOG_DIR/access.log" >>logrotation
 ++echo "LOG=\$LOG_DIR/dansguardian.log" >>logrotation
 + echo "" >>logrotation
 + 
 + case `uname -s` in
 +@@ -3176,7 +3155,7 @@
 + fi
 + 
 + $extendedecho "$prefixdir$logdir\c" >>logrotate.dansguardian
 +-echo "access.log {" >>logrotate.dansguardian
 ++echo "dansguardian.log {" >>logrotate.dansguardian
 + echo "  rotate 4" >>logrotate.dansguardian
 + echo "  weekly" >>logrotate.dansguardian
 + echo "  sharedscripts" >>logrotate.dansguardian
 diff -ruN dansguardian.orig/files/patch-dansguardian.8 
 dansguardian/files/patch-dansguardian.8
 --- dansguardian.orig/files/patch-dansguardian.8	Fri Jul  4 15:24:18 
 2003
 +++ dansguardian/files/patch-dansguardian.8	Mon Jul  7 11:38:34 2003
 @@ -1,11 +1,11 @@
 ---- dansguardian.8.orig	Tue Mar 26 09:03:19 2002
 -+++ dansguardian.8	Tue Mar 26 09:03:25 2002
 +--- dansguardian.8.orig	Mon Jul  7 11:37:24 2003
 ++++ dansguardian.8	Mon Jul  7 11:38:15 2003
  @@ -3,7 +3,7 @@
   .SH NAME
   DansGuardian 2
   .SH SYNOPSIS
  -/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
 -+/usr/local/etc/rc.d/dansguardian.sh [stop|start|restart]
 ++/usr/local/etc/rc.d/start-dg.sh [stop|start|restart]
   .SH DESCRIPTION
   A Introduction
   
 diff -ruN dansguardian.orig/pkg-descr dansguardian/pkg-descr
 --- dansguardian.orig/pkg-descr	Fri Jul  4 15:24:18 2003
 +++ dansguardian/pkg-descr	Mon Jul  7 15:11:59 2003
 @@ -1,20 +1,20 @@
  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.  The 
 preferred
 +proxy is Squid, however, DansGuardian should work with any proxy 
 server.
  
  It filters using multiple methods, including:
    - URL and domain filtering
 -  - content phrase filtering
 +  - textual content filtering
    - PICS filtering
 -  - MIME filtering
 +  - MIME-type filtering
    - file extension filtering
    - POST filtering
 -
 -Running make with WITHOUT_PICS=yes will disable the PICS filtering.  
 All
 -other filtering is controlled via the configuration file.
 +  - user filtering
 +  - client IP filtering
 +  - exception lists for most of the above
  
  WWW: http://dansguardian.org
 -WWW: http://backup.dansguardian.org
 +WWW: http://dansguardian.intmain.org
  
  - Freddie Cash
 -fcash@bigfoot.com
 +fcash@sd73.bc.ca
 diff -ruN dansguardian.orig/pkg-plist dansguardian/pkg-plist
 --- dansguardian.orig/pkg-plist	Fri Jul  4 15:24:18 2003
 +++ dansguardian/pkg-plist	Mon Jul  7 15:21:19 2003
 @@ -1,18 +1,81 @@
  @exec mkdir -p etc/dansguardian
 -etc/dansguardian/dansguardian.conf
 -etc/dansguardian/bannedphraselist
 +@exec mkdir -p etc/dansguardian/phraselists
 +@exec mkdir -p etc/dansguardian/phraselists/chat
 +@exec mkdir -p etc/dansguardian/phraselists/drugadvocacy
 +@exec mkdir -p etc/dansguardian/phraselists/dutchbadwords
 +@exec mkdir -p etc/dansguardian/phraselists/frenchbadwords
 +@exec mkdir -p etc/dansguardian/phraselists/gambling
 +@exec mkdir -p etc/dansguardian/phraselists/goodphrases
 +@exec mkdir -p etc/dansguardian/phraselists/gore
 +@exec mkdir -p etc/dansguardian/phraselists/illegaldrugs
 +@exec mkdir -p etc/dansguardian/phraselists/intolerance
 +@exec mkdir -p etc/dansguardian/phraselists/italianbadwords
 +@exec mkdir -p etc/dansguardian/phraselists/legaldrugs
 +@exec mkdir -p etc/dansguardian/phraselists/personals
 +@exec mkdir -p etc/dansguardian/phraselists/pornography
 +@exec mkdir -p etc/dansguardian/phraselists/violence
 +@exec mkdir -p etc/dansguardian/phraselists/warezhacking
 +@exec mkdir -p etc/dansguardian/phraselists/weapons
  etc/dansguardian/bannedextensionlist
 +etc/dansguardian/bannediplist
  etc/dansguardian/bannedmimetypelist
 -etc/dansguardian/bannedurllist
 +etc/dansguardian/bannedphraselist
  etc/dansguardian/bannedregexpurllist
  etc/dansguardian/bannedsitelist
 -etc/dansguardian/exceptionsitelist
 -etc/dansguardian/exceptionuserlist
 +etc/dansguardian/bannedurllist
 +etc/dansguardian/banneduserlist
 +etc/dansguardian/contentregexplist
 +etc/dansguardian/dansguardian.conf
  etc/dansguardian/exceptioniplist
 +etc/dansguardian/exceptionphraselist
 +etc/dansguardian/exceptionurllist
 +etc/dansguardian/exceptionuserlist
 +etc/dansguardian/exceptionsitelist
 +etc/dansguardian/messages
 +etc/dansguardian/phraselists/chat/weighted
 +etc/dansguardian/phraselists/drugadvocacy/weighted
 +etc/dansguardian/phraselists/dutchbadwords/weighted
 +etc/dansguardian/phraselists/frenchbadwords/weighted
 +etc/dansguardian/phraselists/gambling/banned
 +etc/dansguardian/phraselists/gambling/weighted
 +etc/dansguardian/phraselists/goodphrases/exception
 +etc/dansguardian/phraselists/goodphrases/weighted
 +etc/dansguardian/phraselists/gore/weighted
 +etc/dansguardian/phraselists/illegaldrugs/banned
 +etc/dansguardian/phraselists/illegaldrugs/weighted
 +etc/dansguardian/phraselists/intolerance/banned
 +etc/dansguardian/phraselists/intolerance/weighted
 +etc/dansguardian/phraselists/italianbadwords/weighted
 +etc/dansguardian/phraselists/legaldrugs/weighted
 +etc/dansguardian/phraselists/personals/weighted
 +etc/dansguardian/phraselists/pornography/banned
 +etc/dansguardian/phraselists/pornography/weighted
 +etc/dansguardian/phraselists/violence/weighted
 +etc/dansguardian/phraselists/warezhacking/weighted
 +etc/dansguardian/phraselists/weapons/weighted
  etc/dansguardian/pics
 -etc/rc.d/dansguardian.sh
 +etc/dansguardian/template.html
 +etc/dansguardian/weightedphraselist
 +etc/rc.d/start-dg.sh
  sbin/dansguardian
  www/cgi-bin/dansguardian.pl
 +@dirrm etc/dansguardian/phraselists/chat
 +@dirrm etc/dansguardian/phraselists/drugadvocacy
 +@dirrm etc/dansguardian/phraselists/dutchbadwords
 +@dirrm etc/dansguardian/phraselists/frenchbadwords
 +@dirrm etc/dansguardian/phraselists/gambling
 +@dirrm etc/dansguardian/phraselists/goodphrases
 +@dirrm etc/dansguardian/phraselists/gore
 +@dirrm etc/dansguardian/phraselists/illegaldrugs
 +@dirrm etc/dansguardian/phraselists/intolerance
 +@dirrm etc/dansguardian/phraselists/italianbadwords
 +@dirrm etc/dansguardian/phraselists/legaldrugs
 +@dirrm etc/dansguardian/phraselists/personals
 +@dirrm etc/dansguardian/phraselists/pornography
 +@dirrm etc/dansguardian/phraselists/violence
 +@dirrm etc/dansguardian/phraselists/warezhacking
 +@dirrm etc/dansguardian/phraselists/weapons
 +@dirrm etc/dansguardian/phraselists
  @dirrm etc/dansguardian
  @unexec echo If permanently deleting this package, 
 /var/log/dansguardian.log must be removed manually
  
 --- patch-dansguardian-2.6.1.3 ends here ---
 
 
 
 -- 
 Freddie Cash				District HelpDesk / Network Admin
 fcash@sd73.bc.ca			helpdesk@sd73.bc.ca
 					(250) 374-0679 ext. 219
 
