ports/54285: port update: www/dansguardian-devel to version 2.7.1.3

Freddie Cash fcash at sd73.bc.ca
Wed Jul 9 21:50:26 UTC 2003 

>Number:         54285
>Category:       ports
>Synopsis:       port update:  www/dansguardian-devel to version 2.7.1.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 09 14:50:19 PDT 2003
>Closed-Date:
>Last-Modified:
>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 at spark.sd73.bc.ca:/usr/obj/usr/src/sys/SPARK i386

>Description:
	The latest development release of DansGuardian has been updated to 
version 2.7.1.3.  This PR will bring the devel port up-to-date.

>How-To-Repeat:

>Fix:
	Enclosed is a patch to bring the www/dansguardian-devel up to version 
2.7.1.3.

--- patch-dansguardian-2.7.1.3 begins here ---
diff -ruN dansguardian-devel.orig/Makefile dansguardian-devel/Makefile
--- dansguardian-devel.orig/Makefile	Fri Jul  4 15:24:26 2003
+++ dansguardian-devel/Makefile	Wed Jul  9 11:28:22 2003
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	dansguardian
 # Date created:				April 02, 2002
-# Whom:					Freddie Cash <fcash at bigfoot.com>
+# Whom:					Freddie Cash <fcash at sd73.bc.ca>
 #
 # $FreeBSD: ports/www/dansguardian-devel/Makefile,v 1.7 2003/03/28 
01:25:19 kris Exp $
 #
 
 PORTNAME=	dansguardian
-PORTVERSION=	2.4.6.5
+PORTVERSION=	2.7.1.3
 CATEGORIES=	www
 MASTER_SITES=	# empty, see below
 DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
 
-MAINTAINER=	fcash at bigfoot.com
+MAINTAINER=	fcash at sd73.bc.ca
 COMMENT=	A fast, simple web content filter for Squid proxy servers
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \
@@ -35,8 +35,15 @@
 
 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})) && 
!defined(PACKAGE_BUILDING)
 IGNORE="Commercial source download is restricted.  Please visit and 
read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} 
before running make"
diff -ruN dansguardian-devel.orig/distinfo dansguardian-devel/distinfo
--- dansguardian-devel.orig/distinfo	Fri Jul  4 15:24:26 2003
+++ dansguardian-devel/distinfo	Wed Jul  9 11:28:28 2003
@@ -1 +1 @@
-MD5 (DansGuardian-2.4.6-5.source.tar.gz) = 
8aa42b299cd798c80ff09ed866a91b63
+MD5 (DansGuardian-2.7.1-3.source.tar.gz) = 
b73d44d7b62cc687551c430653821306
diff -ruN dansguardian-devel.orig/files/patch-FatController.cpp 
dansguardian-devel/files/patch-FatController.cpp
--- dansguardian-devel.orig/files/patch-FatController.cpp	Wed Dec 31 
16:00:00 1969
+++ dansguardian-devel/files/patch-FatController.cpp	Wed Jul  9 14:02:57 
2003
@@ -0,0 +1,11 @@
+--- FatController.cpp.orig	Wed Jul  9 14:02:08 2003
++++ FatController.cpp	Wed Jul  9 14:02:40 2003
+@@ -569,7 +569,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-devel.orig/files/patch-autoconf::bsdv.in 
dansguardian-devel/files/patch-autoconf::bsdv.in
--- dansguardian-devel.orig/files/patch-autoconf::bsdv.in	Wed Dec 31 
16:00:00 1969
+++ dansguardian-devel/files/patch-autoconf::bsdv.in	Wed Jul  9 11:52:19 
2003
@@ -0,0 +1,37 @@
+--- autoconf/bsdv.in.orig	Wed Jul  9 11:50:32 2003
++++ autoconf/bsdv.in	Wed Jul  9 11:51:48 2003
+@@ -1,16 +1,27 @@
+ #!/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-devel.orig/files/patch-autoconf::fbsd.in 
dansguardian-devel/files/patch-autoconf::fbsd.in
--- dansguardian-devel.orig/files/patch-autoconf::fbsd.in	Fri Jul  4 
15:24:26 2003
+++ dansguardian-devel/files/patch-autoconf::fbsd.in	Wed Jul  9 13:59:52 
2003
@@ -1,7 +1,7 @@
---- autoconf/fbsd.in-orig	Mon Oct 21 15:01:20 2002
-+++ autoconf/fbsd.in	Mon Oct 21 15:04:42 2002
-@@ -19,7 +19,7 @@
-                  bannedphraselist exceptionphraselist
+--- autoconf/fbsd.in.orig	Wed Jul  9 11:49:57 2003
++++ autoconf/fbsd.in	Wed Jul  9 11:49:59 2003
+@@ -20,7 +20,7 @@
+ 		 logrotate.dansguardian
  
  PASSVARS = -DPROXYUSER=\"${PROXYUSER}\"
 -PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\"
@@ -9,7 +9,7 @@
  PASSVARS += 
-DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
  PASSVARS += -DPIDDIR=\"${PIDDIR}\"
  
-@@ -36,44 +36,74 @@
+@@ -37,59 +37,133 @@
  .cpp.o:
  	$(CPP) $(DEBUG) $(CFLAGS) -c $<
  
@@ -22,7 +22,7 @@
  	@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/drugadvocasy || install -d 
$I$(CONFFILELOCATION)phraselists/drugadvocasy
++	@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
@@ -30,15 +30,32 @@
 +	@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/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$(CONFFILELOCATION)languages || install -d 
$I$(CONFFILELOCATION)languages
++	@test -d $I$(CONFFILELOCATION)languages/arspanish || install -d 
$I$(CONFFILELOCATION)languages/arspanish
++	@test -d $I$(CONFFILELOCATION)languages/bulgarian || install -d 
$I$(CONFFILELOCATION)languages/bulgarian
++	@test -d $I$(CONFFILELOCATION)languages/chinesebig5 || install -d 
$I$(CONFFILELOCATION)languages/chinesebig5
++	@test -d $I$(CONFFILELOCATION)languages/czech || install -d 
$I$(CONFFILELOCATION)languages/czech
++	@test -d $I$(CONFFILELOCATION)languages/danish || install -d 
$I$(CONFFILELOCATION)languages/danish
++	@test -d $I$(CONFFILELOCATION)languages/french || install -d 
$I$(CONFFILELOCATION)languages/french
++	@test -d $I$(CONFFILELOCATION)languages/german || install -d 
$I$(CONFFILELOCATION)languages/german
++	@test -d $I$(CONFFILELOCATION)languages/german2 || install -d 
$I$(CONFFILELOCATION)languages/german2
++	@test -d $I$(CONFFILELOCATION)languages/indonesian || install -d 
$I$(CONFFILELOCATION)languages/indonesian
++	@test -d $I$(CONFFILELOCATION)languages/italian || install -d 
$I$(CONFFILELOCATION)languages/italian
++	@test -d $I$(CONFFILELOCATION)languages/lithuanian || install -d 
$I$(CONFFILELOCATION)languages/lithuanian
++	@test -d $I$(CONFFILELOCATION)languages/polish || install -d 
$I$(CONFFILELOCATION)languages/polish
++	@test -d $I$(CONFFILELOCATION)languages/portuguese || install -d 
$I$(CONFFILELOCATION)languages/portugese
++	@test -d $I$(CONFFILELOCATION)languages/turkish || install -d 
$I$(CONFFILELOCATION)languages/turkish
++	@test -d $I$(CONFFILELOCATION)languages/ukenglish || install -d 
$I$(CONFFILELOCATION)languages/ukenglish
  	@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$(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
@@ -46,6 +63,7 @@
 -	cp -f ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist
 -	cp -f ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist
 -	cp -f -R ./phraselists/* $I$(CONFFILELOCATION)phraselists/
+-	cp -f -R ./languages/* $I$(CONFFILELOCATION)languages/
 -	cp -f ./bannediplist $I$(CONFFILELOCATION)bannediplist
 -	cp -f ./banneduserlist $I$(CONFFILELOCATION)banneduserlist
 -	cp -f ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist
@@ -53,22 +71,32 @@
 -	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 ./transparent1x1.gif $I$(CONFFILELOCATION)transparent1x1.gif
 -	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) || -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/drugadvocasy/weighted 
$I$(CONFFILELOCATION)phraselists/drugadvocasy/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
@@ -80,6 +108,7 @@
 +	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
@@ -87,6 +116,36 @@
 +	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 ./languages/arspanish/messages 
$I$(CONFFILELOCATION)languages/arspanish/messages
++	install -o root -g wheel -m 644 ./languages/arspanish/template.html 
$I$(CONFFILELOCATION)languages/arspanish/template.html
++	install -o root -g wheel -m 644 ./languages/bulgarian/messages 
$I$(CONFFILELOCATION)languages/bulgarian/messages
++	install -o root -g wheel -m 644 ./languages/bulgarian/template.html 
$I$(CONFFILELOCATION)languages/bulgarian/template.html
++	install -o root -g wheel -m 644 ./languages/chinesebig5/messages 
$I$(CONFFILELOCATION)languages/chinesebig5/messages
++	install -o root -g wheel -m 644 ./languages/chinesebig5/template.html 
$I$(CONFFILELOCATION)languages/chinesebig5/template.html
++	install -o root -g wheel -m 644 ./languages/czech/messages 
$I$(CONFFILELOCATION)languages/czech/messages
++	install -o root -g wheel -m 644 ./languages/czech/template.html 
$I$(CONFFILELOCATION)languages/czech/template.html
++	install -o root -g wheel -m 644 ./languages/danish/messages 
$I$(CONFFILELOCATION)languages/danish/messages
++	install -o root -g wheel -m 644 ./languages/danish/template.html 
$I$(CONFFILELOCATION)languages/danish/template.html
++	install -o root -g wheel -m 644 ./languages/french/messages 
$I$(CONFFILELOCATION)languages/french/messages
++	install -o root -g wheel -m 644 ./languages/french/template.html 
$I$(CONFFILELOCATION)languages/french/template.html
++	install -o root -g wheel -m 644 ./languages/german/messages 
$I$(CONFFILELOCATION)languages/german/messages
++	install -o root -g wheel -m 644 ./languages/german/template.html 
$I$(CONFFILELOCATION)languages/german/template.html
++	install -o root -g wheel -m 644 ./languages/german2/messages 
$I$(CONFFILELOCATION)languages/german2/messages
++	install -o root -g wheel -m 644 ./languages/german2/template.html 
$I$(CONFFILELOCATION)languages/german2/template.html
++	install -o root -g wheel -m 644 ./languages/indonesian/messages 
$I$(CONFFILELOCATION)languages/indonesian/messages
++	install -o root -g wheel -m 644 ./languages/indonesian/template.html 
$I$(CONFFILELOCATION)languages/indonesian/template.html
++	install -o root -g wheel -m 644 ./languages/italian/messages 
$I$(CONFFILELOCATION)languages/italian/messages
++	install -o root -g wheel -m 644 ./languages/italian/template.html 
$I$(CONFFILELOCATION)languages/italian/template.html
++	install -o root -g wheel -m 644 ./languages/lithuanian/messages 
$I$(CONFFILELOCATION)languages/lithuanian/messages
++	install -o root -g wheel -m 644 ./languages/lithuanian/template.html 
$I$(CONFFILELOCATION)languages/lithuanian/template.html
++	install -o root -g wheel -m 644 ./languages/polish/messages 
$I$(CONFFILELOCATION)languages/polish/messages
++	install -o root -g wheel -m 644 ./languages/polish/template.html 
$I$(CONFFILELOCATION)languages/polish/template.html
++	install -o root -g wheel -m 644 ./languages/portuguese/messages 
$I$(CONFFILELOCATION)languages/portugese/messages
++	install -o root -g wheel -m 644 ./languages/portuguese/template.html 
$I$(CONFFILELOCATION)languages/portugese/template.html
++	install -o root -g wheel -m 644 ./languages/turkish/messages 
$I$(CONFFILELOCATION)languages/turkish/messages
++	install -o root -g wheel -m 644 ./languages/turkish/template.html 
$I$(CONFFILELOCATION)languages/turkish/template.html
++	install -o root -g wheel -m 644 ./languages/ukenglish/messages 
$I$(CONFFILELOCATION)languages/ukenglish/messages
++	install -o root -g wheel -m 644 ./languages/ukenglish/template.html 
$I$(CONFFILELOCATION)languages/ukenglish/template.html
 +	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
@@ -94,30 +153,29 @@
 +	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 ./transparent1x1.gif 
$I$(CONFFILELOCATION)transparent1x1.gif
 +	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
- 	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)
 +	install -o root -g wheel -m 644 ./dansguardian.8 
$I$(MANUALFILES)man8/dansguardian.8
-+	touch $I$(LOGLOCATION)dansguardian.log
-+	chown $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION)dansguardian.log
++	install -o nobody -g nogroup -m 644 /dev/null 
$I$(LOGLOCATION)dansguardian.log
  
  uninstall:
  	rm -f $(BINARYLOCATION)dansguardian
-@@ -81,7 +111,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)
+-	if [ -f $(LOGROTATELOCATION)dansguardian ]; then rm -f 
$(LOGROTATELOCATION)dansguardian; fi
 +	rm -f $(LOGLOCATION)dansguardian.log
  
  clean:
diff -ruN dansguardian-devel.orig/files/patch-configure 
dansguardian-devel/files/patch-configure
--- dansguardian-devel.orig/files/patch-configure	Fri Jul  4 15:24:26 
2003
+++ dansguardian-devel/files/patch-configure	Wed Jul  9 11:55:44 2003
@@ -1,11 +1,57 @@
---- configure-orig	Mon Oct 21 10:42:02 2002
-+++ configure	Mon Oct 21 10:42:15 2002
-@@ -2676,7 +2676,7 @@
+--- configure.orig	Wed Jul  9 11:52:29 2003
++++ configure	Wed Jul  9 11:55:29 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" 
>Release-Note:
>Audit-Trail:
>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
 +@@ -3171,7 +3150,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
 +@@ -3265,7 +3244,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-devel.orig/files/patch-dansguardian.8 
 dansguardian-devel/files/patch-dansguardian.8
 --- dansguardian-devel.orig/files/patch-dansguardian.8	Fri Jul  4 
 15:24:26 2003
 +++ dansguardian-devel/files/patch-dansguardian.8	Wed Jul  9 11:56:55 
 2003
 @@ -1,5 +1,5 @@
 ---- dansguardian.8-orig	Mon Oct 21 10:39:49 2002
 -+++ dansguardian.8	Mon Oct 21 10:40:22 2002
 +--- dansguardian.8.orig	Wed Jul  9 11:55:52 2003
 ++++ dansguardian.8	Wed Jul  9 11:56:37 2003
  @@ -3,7 +3,7 @@
   .SH NAME
   DansGuardian 2
 diff -ruN dansguardian-devel.orig/pkg-descr dansguardian-devel/pkg-descr
 --- dansguardian-devel.orig/pkg-descr	Fri Jul  4 15:24:26 2003
 +++ dansguardian-devel/pkg-descr	Wed Jul  9 12:04:45 2003
 @@ -1,18 +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
 -  - user and source IP filtering
 +  - 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 at bigfoot.com
 +fcash at sd73.bc.ca
 diff -ruN dansguardian-devel.orig/pkg-plist dansguardian-devel/pkg-plist
 --- dansguardian-devel.orig/pkg-plist	Fri Jul  4 15:24:26 2003
 +++ dansguardian-devel/pkg-plist	Wed Jul  9 13:58:00 2003
 @@ -1,7 +1,23 @@
  @exec mkdir -p etc/dansguardian
 + at exec mkdir -p etc/dansguardian/languages/
 + at exec mkdir -p etc/dansguardian/languages/arspanish
 + at exec mkdir -p etc/dansguardian/languages/bulgarian
 + at exec mkdir -p etc/dansguardian/languages/chinesebig5
 + at exec mkdir -p etc/dansguardian/languages/czech
 + at exec mkdir -p etc/dansguardian/languages/danish
 + at exec mkdir -p etc/dansguardian/languages/french
 + at exec mkdir -p etc/dansguardian/languages/german
 + at exec mkdir -p etc/dansguardian/languages/german2
 + at exec mkdir -p etc/dansguardian/languages/indonesian
 + at exec mkdir -p etc/dansguardian/languages/italian
 + at exec mkdir -p etc/dansguardian/languages/lithuanian
 + at exec mkdir -p etc/dansguardian/languages/polish
 + at exec mkdir -p etc/dansguardian/languages/portugese
 + at exec mkdir -p etc/dansguardian/languages/turkish
 + at exec mkdir -p etc/dansguardian/languages/ukenglish
  @exec mkdir -p etc/dansguardian/phraselists
  @exec mkdir -p etc/dansguardian/phraselists/chat
 - at exec mkdir -p etc/dansguardian/phraselists/drugadvocasy
 + at 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
 @@ -9,6 +25,7 @@
  @exec mkdir -p etc/dansguardian/phraselists/gore
  @exec mkdir -p etc/dansguardian/phraselists/illegaldrugs
  @exec mkdir -p etc/dansguardian/phraselists/intolerance
 + at 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
 @@ -24,14 +41,46 @@
  etc/dansguardian/bannedsitelist
  etc/dansguardian/bannedurllist
  etc/dansguardian/banneduserlist
 +etc/dansguardian/contentregexplist
  etc/dansguardian/dansguardian.conf
  etc/dansguardian/exceptionphraselist
  etc/dansguardian/exceptionurllist
  etc/dansguardian/exceptionuserlist
  etc/dansguardian/exceptionsitelist
  etc/dansguardian/exceptioniplist
 +etc/dansguardian/languages/arspanish/messages
 +etc/dansguardian/languages/arspanish/template.html
 +etc/dansguardian/languages/bulgarian/messages
 +etc/dansguardian/languages/bulgarian/template.html
 +etc/dansguardian/languages/chinesebig5/messages
 +etc/dansguardian/languages/chinesebig5/template.html
 +etc/dansguardian/languages/czech/messages
 +etc/dansguardian/languages/czech/template.html
 +etc/dansguardian/languages/danish/messages
 +etc/dansguardian/languages/danish/template.html
 +etc/dansguardian/languages/french/messages
 +etc/dansguardian/languages/french/template.html
 +etc/dansguardian/languages/german/messages
 +etc/dansguardian/languages/german/template.html
 +etc/dansguardian/languages/german2/messages
 +etc/dansguardian/languages/german2/template.html
 +etc/dansguardian/languages/indonesian/messages
 +etc/dansguardian/languages/indonesian/template.html
 +etc/dansguardian/languages/italian/messages
 +etc/dansguardian/languages/italian/template.html
 +etc/dansguardian/languages/lithuanian/messages
 +etc/dansguardian/languages/lithuanian/template.html
 +etc/dansguardian/languages/polish/messages
 +etc/dansguardian/languages/polish/template.html
 +etc/dansguardian/languages/portugese/messages
 +etc/dansguardian/languages/portugese/template.html
 +etc/dansguardian/languages/turkish/messages
 +etc/dansguardian/languages/turkish/template.html
 +etc/dansguardian/languages/ukenglish/messages
 +etc/dansguardian/languages/ukenglish/template.html
 +etc/dansguardian/messages
  etc/dansguardian/phraselists/chat/weighted
 -etc/dansguardian/phraselists/drugadvocasy/weighted
 +etc/dansguardian/phraselists/drugadvocacy/weighted
  etc/dansguardian/phraselists/dutchbadwords/weighted
  etc/dansguardian/phraselists/frenchbadwords/weighted
  etc/dansguardian/phraselists/gambling/banned
 @@ -43,6 +92,7 @@
  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
 @@ -52,11 +102,28 @@
  etc/dansguardian/phraselists/weapons/weighted
  etc/dansguardian/pics
  etc/dansguardian/template.html
 +etc/dansguardian/transparent1x1.gif
  etc/dansguardian/weightedphraselist
  etc/rc.d/start-dg.sh
  www/cgi-bin/dansguardian.pl
 + at dirrm etc/dansguardian/languages/ukenglish
 + at dirrm etc/dansguardian/languages/turkish
 + at dirrm etc/dansguardian/languages/portugese
 + at dirrm etc/dansguardian/languages/polish
 + at dirrm etc/dansguardian/languages/lithuanian
 + at dirrm etc/dansguardian/languages/indonesian
 + at dirrm etc/dansguardian/languages/italian
 + at dirrm etc/dansguardian/languages/german2
 + at dirrm etc/dansguardian/languages/german
 + at dirrm etc/dansguardian/languages/french
 + at dirrm etc/dansguardian/languages/danish
 + at dirrm etc/dansguardian/languages/czech
 + at dirrm etc/dansguardian/languages/chinesebig5
 + at dirrm etc/dansguardian/languages/bulgarian
 + at dirrm etc/dansguardian/languages/arspanish
 + at dirrm etc/dansguardian/languages/
  @dirrm etc/dansguardian/phraselists/chat
 - at dirrm etc/dansguardian/phraselists/drugadvocasy
 + at dirrm etc/dansguardian/phraselists/drugadvocacy
  @dirrm etc/dansguardian/phraselists/dutchbadwords
  @dirrm etc/dansguardian/phraselists/frenchbadwords
  @dirrm etc/dansguardian/phraselists/gambling
 @@ -64,6 +131,7 @@
  @dirrm etc/dansguardian/phraselists/gore
  @dirrm etc/dansguardian/phraselists/illegaldrugs
  @dirrm etc/dansguardian/phraselists/intolerance
 + at dirrm etc/dansguardian/phraselists/italianbadwords
  @dirrm etc/dansguardian/phraselists/legaldrugs
  @dirrm etc/dansguardian/phraselists/personals
  @dirrm etc/dansguardian/phraselists/pornography
 @@ -72,5 +140,4 @@
  @dirrm etc/dansguardian/phraselists/weapons
  @dirrm etc/dansguardian/phraselists
  @dirrm etc/dansguardian
 - at cwd /
 -var/log/dansguardian.log
 + at unexec echo If permanently deleting this package, 
 /var/log/dansguardian.log must be removed manually
 --- patch-dansguardian-2.7.1.3 ends here ---

More information about the freebsd-ports-bugs mailing list