From fcash@lug.kamloops.net  Fri Dec  6 15:31:19 2002
Return-Path: <fcash@lug.kamloops.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B7D0537B401
	for <freebsd-gnats-submit@freebsd.org>; Fri,  6 Dec 2002 15:31:19 -0800 (PST)
Received: from lug.kamloops.net (lug2.kamloops.net [209.52.173.193])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1F2D443E9C
	for <freebsd-gnats-submit@freebsd.org>; Fri,  6 Dec 2002 15:31:19 -0800 (PST)
	(envelope-from fcash@lug.kamloops.net)
Received: from fcash by lug.kamloops.net with local (Exim 3.16 #1)
	id 18KRDA-0006fN-00
	for freebsd-gnats-submit@freebsd.org; Fri, 06 Dec 2002 14:44:44 -0800
Message-Id: <E18KRDA-0006fN-00@lug.kamloops.net>
Date: Fri, 06 Dec 2002 14:44:44 -0800
From: fcash@lug.kamloops.net
To: freebsd-gnats-submit@freebsd.org
Subject: port update:  www/dansguardian to version 2.4.6.7

>Number:         46041
>Category:       ports
>Synopsis:       port update:  www/dansguardian to version 2.4.6.7
>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:   Fri Dec 06 15:40:03 PST 2002
>Closed-Date:    Tue Jul 08 05:41:41 CEST 2003
>Last-Modified:  Tue Jul 08 05:41:41 CEST 2003
>Originator:     Freddie Cash
>Release:        FreeBSD 4.7-RELEASE-p2 i386
>Organization:
PhoenixTek Consulting
>Environment:
System: FreeBSD phoenix.sd73.bc.ca 4.7-RELEASE-p2 FreeBSD 4.7-RELEASE-p2 #1: Mon Nov 18 15:28:33 PST 2002 root@phoenix.sd73.bc.ca:/usr/obj/usr/src/sys/PHOENIX i386

>Description:
	Version 2.2.10 of DansGuardian has been end-of-lifed.  There
	is no more support for this version.  The new, recommended
	version for people to use is version 2.4.6-7.  To that end,
	this PR will update the www/dansguardian to version 2.4.6-7.

>How-To-Repeat:

>Fix:
	Below is the patch to update www/dansguardian from version
	2.2.10 to version 2.4.6.7

--- dansguardian-diff-2.2.10-2.4.6.7 begins here ---
diff -runH dansguardian/Makefile dansguardian-devel/Makefile
d2 1
a2 1
# Date created:				April 02, 2002
d5 1
a5 1
# $FreeBSD: ports/www/dansguardian-devel/Makefile,v 1.5 2002/10/24 04:14:52 cy Exp $
d9 2
a10 1
PORTVERSION=	2.4.6.7
a20 1

d32 4
diff -runH dansguardian/distinfo dansguardian-devel/distinfo
d1 1
a1 1
MD5 (DansGuardian-2.4.6-7.source.tar.gz) = ede55e0f46ad2afd342c19d55223c2de
diff -runH dansguardian/files/patch-autoconf::fbsd.in dansguardian-devel/files/patch-autoconf::fbsd.in
d1 4
a4 4
--- autoconf/fbsd.in.orig	Sun Dec  1 07:56:43 2002
+++ autoconf/fbsd.in	Wed Dec  4 15:43:37 2002
@@ -19,7 +19,7 @@
                  bannedphraselist exceptionphraselist
d12 1
a12 1
@@ -36,52 +36,83 @@
d16 1
a16 2
-all:	$(OBJ) 
+all:	$(OBJ)
d20 44
a63 92
 	@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/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 ./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 ./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)
+	@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/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 ./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 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 root -g wheel -m 644 /dev/null $I$(LOGLOCATION)dansguardian.log
d67 1
a67 2
-	rm -f $(SYSVLOCATION)dansguardian
+	rm -f $(SYSVLOCATION)start-dg.sh
a68 1
+	rm -f $(MANUALFILES)man8/dansguardian.8
d72 1
a72 1
+	rm -r $(LOGLOCATION)dansguardian.log
diff -runH dansguardian/files/patch-configure dansguardian-devel/files/patch-configure
d1 3
a3 3
--- configure.orig	Sun Dec  1 07:56:44 2002
+++ configure	Wed Dec  4 15:52:58 2002
@@ -2676,7 +2676,7 @@
a11 25
@@ -2759,13 +2759,13 @@
                 cat autoconf/bsdv.in > dansguardian.bsdv
                 $extendedecho "        [ -x $prefixdir$bindir\c" >> dansguardian.bsdv
                 $extendedecho "dansguardian ] && $prefixdir$bindir\c" >> dansguardian.bsdv
-                echo "dansguardian > /dev/null && $extendedecho ' dansguardian\c'" >> dansguardian.bsdv
+                echo "dansguardian > /dev/null && echo -n ' dansguardian'" >> 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 ".dguardianipc ] && echo -n ' dansguardian'" >> dansguardian.bsdv
                 echo "        rm -f /tmp/.dguardianipc" >> dansguardian.bsdv
                 echo "        ;;" >> dansguardian.bsdv
                 echo "restart)" >> dansguardian.bsdv
@@ -2773,7 +2773,7 @@
                 echo "        \$0 start" >> dansguardian.bsdv
                 echo "        ;;" >> dansguardian.bsdv
                 echo "*)" >> dansguardian.bsdv
-                echo "        echo \"Usage: `basename \$0` {start|stop|restart}\" >&2" >> 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
diff -runH dansguardian/files/patch-dansguardian.8 dansguardian-devel/files/patch-dansguardian.8
d1 2
a2 2
--- dansguardian.8.orig	Wed Dec  4 14:57:35 2002
+++ dansguardian.8	Wed Dec  4 14:58:32 2002
d8 1
a8 1
+/usr/local/etc/rc.d/start-dg.sh [stop|start|restart]
diff -runH dansguardian/pkg-descr dansguardian-devel/pkg-descr
d12 3
a14 1
  - user and source IP filtering
diff -runH dansguardian/pkg-plist dansguardian-devel/pkg-plist
d2 2
a3 17
@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/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
sbin/dansguardian
a4 2
etc/dansguardian/bannediplist
etc/dansguardian/bannedphraselist
d6 1
d9 1
a9 5
etc/dansguardian/bannedurllist
etc/dansguardian/banneduserlist
etc/dansguardian/dansguardian.conf
etc/dansguardian/exceptionphraselist
etc/dansguardian/exceptionurllist
a10 1
etc/dansguardian/exceptionsitelist
a11 20
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/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
d13 2
a14 3
etc/dansguardian/template.html
etc/dansguardian/weightedphraselist
etc/rc.d/start-dg.sh
a15 16
@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/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
d18 1
--- dansguardian-diff-2.2.10-2.4.6.7 ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: keramida 
Responsible-Changed-When: Sat Dec 7 04:07:02 PST 2002 
Responsible-Changed-Why:  
Misfiled ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46041 
State-Changed-From-To: open->feedback 
State-Changed-By: will 
State-Changed-When: Wed Jun 11 20:46:10 PDT 2003 
State-Changed-Why:  
Your patch doesn't seem to work, at least with patch < pr-patch... it 
asks for a file.  The patch definitely doesn't look like a normal one. 
Suggest you use "diff -ruN" as opposed to "diff -runH".  Also, there 
seems to be a newer version of dansguardian along these lines.. 2.4.6-8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46041 
State-Changed-From-To: feedback->closed 
State-Changed-By: dinoex 
State-Changed-When: Tue Jul 8 05:41:11 CEST 2003 
State-Changed-Why:  
Superseeded by ports/54199 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46041 
>Unformatted:
