Attachment #38605 for bug #61048

View | Details | Raw Unified | Return to bug 61048
Collapse All | Expand All




# Date created:				March 26, 2002
# Whom:					Freddie Cash <fcash@sd73.bc.ca>
#
# $FreeBSD: ports/www/dansguardian/Makefile,v 1.10 2003/11/07 09:12:49 marcus Exp $
#

PORTNAME=	dansguardian
PORTVERSION=	2.6.1.11
CATEGORIES=	www
MASTER_SITES=	# empty, see below
DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source

MAINTAINER=	fcash@sd73.bc.ca
COMMENT=	A fast, feature-rich web content filter for Squid proxy servers

RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid:install \
		${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install

CONFLICTS=	dansguardian-devel

Line 1 Link Here

(-)dansguardian/distinfo (-1 / +1 lines)
1	MD5 (DansGuardian-2.6.1-6.source.tar.gz) = 9f550a23fd692f3df0850b93dfefaf14	1	MD5 (DansGuardian-2.6.1-11.source.tar.gz) = 74f30ec2f7915f1ea72ff03332359889

Lines 1-6 Link Here

(-)dansguardian/files/patch-autoconf::bsdv.in (-7 / +12 lines)
1	--- autoconf/bsdv.in.orig Mon Jul 7 12:04:33 2003	1	--- autoconf/bsdv.in.orig Wed Jan 7 11:28:16 2004
2	+++ autoconf/bsdv.in Mon Jul 7 12:07:11 2003	2	+++ autoconf/bsdv.in Wed Jan 7 11:28:24 2004
3	@@ -1,16 +1,26 @@	3	@@ -1,16 +1,32 @@
4	#!/bin/sh	4	#!/bin/sh
5	#	5	#
6	-# BSD startup script for dansguardian	6	-# BSD startup script for dansguardian
Lines 15-23 Link Here
15	+# banned phrases, MIME types, filename	15	+# banned phrases, MIME types, filename
16	# extensions and PICS labling.	16	# extensions and PICS labling.
17	# processname: dansguardian	17	# processname: dansguardian
18		18
19	-	19	-
20	-# See how we were called.	20	# See how we were called.
21	-	21	-
22	case "$1" in	22	case "$1" in
23	start)	23	start)
Lines 29-37 Link Here
29	+ rm -f /tmp/.dguardianipc	29	+ rm -f /tmp/.dguardianipc
30	+ echo -n " dansguardian"	30	+ echo -n " dansguardian"
31	+ ;;	31	+ ;;
		32	+restart)
		33	+ /usr/local/sbin/dansguardian -r
		34	+ ;;
		35	+graceful)
		36	+ /usr/local/sbin/dansguardian -g
		37	+ ;;
32	+*)	38	+*)
33	+ echo "Usage: $0 {start\|stop\|restart}"	39	+ echo "Usage: $0 {start\|stop\|restart\|graceful}"
34	+ ;;	40	+ ;;
35	+esac	41	+esac
36	+exit 0	42	+exit 0
37	+




--- autoconf/fbsd.in.orig	Tue Dec 23 16:17:18 2003
+++ autoconf/fbsd.in	Wed Jan  7 14:48:42 2004
@@ -20,7 +20,7 @@
 		 logrotate.dansguardian
 

 PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
 PASSVARS += -DPIDDIR=\"${PIDDIR}\"
 
@@ -44,49 +44,79 @@
 	@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/germanpornography || install -d $I$(CONFFILELOCATION)phraselists/germanpornography
+	@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) || install -d $I$(BINARYLOCATION)
-	cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
-	cp -f ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf
-	cp -f ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist

-	chmod -R u+wr $I$(LOGLOCATION)
-	chmod u+wrx $I$(LOGLOCATION)
-	if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi
+	install -d $I$(CONFFILELOCATION)
+	install -d $I$(CONFFILELOCATION)phraselists
+	install -d $I$(CONFFILELOCATION)phraselists/chat
+	install -d $I$(CONFFILELOCATION)phraselists/drugadvocacy
+	install -d $I$(CONFFILELOCATION)phraselists/dutchbadwords
+	install -d $I$(CONFFILELOCATION)phraselists/frenchbadwords
+	install -d $I$(CONFFILELOCATION)phraselists/gambling
+	install -d $I$(CONFFILELOCATION)phraselists/germanpornography
+	install -d $I$(CONFFILELOCATION)phraselists/goodphrases
+	install -d $I$(CONFFILELOCATION)phraselists/gore
+	install -d $I$(CONFFILELOCATION)phraselists/illegaldrugs
+	install -d $I$(CONFFILELOCATION)phraselists/intolerance
+	install -d $I$(CONFFILELOCATION)phraselists/italianbadwords
+	install -d $I$(CONFFILELOCATION)phraselists/legaldrugs
+	install -d $I$(CONFFILELOCATION)phraselists/personals
+	install -d $I$(CONFFILELOCATION)phraselists/pornography
+	install -d $I$(CONFFILELOCATION)phraselists/violence
+	install -d $I$(CONFFILELOCATION)phraselists/warezhacking
+	install -d $I$(CONFFILELOCATION)phraselists/weapons
+	install -d $I$(CGIBINLOCATION)
+	install -d $I$(MANUALFILES)man8/
+	install -d $I$(LOGLOCATION)
+	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.dist
+	install -o root -g wheel -m 644 ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist.dist
+	install -o root -g wheel -m 644 ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist.dist
+	install -o root -g wheel -m 644 ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist.dist
+	install -o root -g wheel -m 644 ./phraselists/chat/weighted $I$(CONFFILELOCATION)phraselists/chat/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/drugadvocacy/weighted $I$(CONFFILELOCATION)phraselists/drugadvocacy/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/dutchbadwords/weighted $I$(CONFFILELOCATION)phraselists/dutchbadwords/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/frenchbadwords/weighted $I$(CONFFILELOCATION)phraselists/frenchbadwords/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/gambling/banned $I$(CONFFILELOCATION)phraselists/gambling/banned.dist
+	install -o root -g wheel -m 644 ./phraselists/gambling/weighted $I$(CONFFILELOCATION)phraselists/gambling/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/germanpornography/weighted $I$(CONFFILELOCATION)phraselists/germanpornography/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/goodphrases/exception $I$(CONFFILELOCATION)phraselists/goodphrases/exception.dist
+	install -o root -g wheel -m 644 ./phraselists/goodphrases/weighted $I$(CONFFILELOCATION)phraselists/goodphrases/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/gore/weighted $I$(CONFFILELOCATION)phraselists/gore/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/illegaldrugs/banned $I$(CONFFILELOCATION)phraselists/illegaldrugs/banned.dist
+	install -o root -g wheel -m 644 ./phraselists/illegaldrugs/weighted $I$(CONFFILELOCATION)phraselists/illegaldrugs/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/intolerance/weighted $I$(CONFFILELOCATION)phraselists/intolerance/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/italianbadwords/weighted $I$(CONFFILELOCATION)phraselists/italianbadwords/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/legaldrugs/weighted $I$(CONFFILELOCATION)phraselists/legaldrugs/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/personals/weighted $I$(CONFFILELOCATION)phraselists/personals/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/pornography/banned $I$(CONFFILELOCATION)phraselists/pornography/banned.dist
+	install -o root -g wheel -m 644 ./phraselists/pornography/weighted $I$(CONFFILELOCATION)phraselists/pornography/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/violence/weighted $I$(CONFFILELOCATION)phraselists/violence/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/warezhacking/weighted $I$(CONFFILELOCATION)phraselists/warezhacking/weighted.dist
+	install -o root -g wheel -m 644 ./phraselists/weapons/weighted $I$(CONFFILELOCATION)phraselists/weapons/weighted.dist
+	install -o root -g wheel -m 644 ./bannediplist $I$(CONFFILELOCATION)bannediplist.dist
+	install -o root -g wheel -m 644 ./banneduserlist $I$(CONFFILELOCATION)banneduserlist.dist
+	install -o root -g wheel -m 644 ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist.dist
+	install -o root -g wheel -m 644 ./bannedmimetypelist $I$(CONFFILELOCATION)bannedmimetypelist.dist
+	install -o root -g wheel -m 644 ./bannedurllist $I$(CONFFILELOCATION)bannedurllist.dist
+	install -o root -g wheel -m 644 ./bannedregexpurllist $I$(CONFFILELOCATION)bannedregexpurllist.dist
+	install -o root -g wheel -m 644 ./bannedsitelist $I$(CONFFILELOCATION)bannedsitelist.dist
+	install -o root -g wheel -m 644 ./contentregexplist $I$(CONFFILELOCATION)contentregexplist.dist
+	install -o root -g wheel -m 644 ./exceptionsitelist $I$(CONFFILELOCATION)exceptionsitelist.dist
+	install -o root -g wheel -m 644 ./exceptionurllist $I$(CONFFILELOCATION)exceptionurllist.dist
+	install -o root -g wheel -m 644 ./exceptionuserlist $I$(CONFFILELOCATION)exceptionuserlist.dist
+	install -o root -g wheel -m 644 ./exceptioniplist $I$(CONFFILELOCATION)exceptioniplist.dist
+	install -o root -g wheel -m 644 ./pics $I$(CONFFILELOCATION)pics.dist
+	install -o root -g wheel -m 644 ./template.html $I$(CONFFILELOCATION)template.html.dist
+	install -o root -g wheel -m 644 ./messages $I$(CONFFILELOCATION)messages.dist
+	install -o root -g wheel -m 755 ./dansguardian.bsdv $I$(SYSVLOCATION)start-dg.sh.dist
+	install -o root -g wheel -m 755 ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl.dist
+	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
+	@test -f $I$(LOGLOCATION)/dansguardian.log || install -o nobody -g nogroup -m 644 /dev/null $I$(LOGLOCATION)dansguardian.log
 
 uninstall:
 	rm -f $(BINARYLOCATION)dansguardian
 	rm -f $(SYSVLOCATION)dansguardian
 	rm -f $(CGIBINLOCATION)dansguardian.pl
-	rm -f $(MANUALFILES)man8/dansguardian.8.gz
+	rm -fr $(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:
 	rm -f $(OBJ) $(PROG)




--- configure.orig	Wed Jan  7 11:29:38 2004
+++ configure	Wed Jan  7 11:54:02 2004
@@ -2540,7 +2540,7 @@
 $extendedecho "SYSVLOCATION = \${PREFIX}$sysvdir" >>Makefile
 $extendedecho "CGIBINLOCATION = \${PREFIX}$cgidir" >>Makefile

 echo "" >>logrotation
 
 case `uname -s` in
@@ -3098,7 +3077,7 @@
 	;;
 	FreeBSD*)
 	        $extendedecho "$prefixdir$sysvdir\c" >>logrotation
-	        echo "dansguardian.sh stop > /dev/null" >>logrotation
+	        echo "start-dg.sh stop > /dev/null" >>logrotation
 	        echo "" >>logrotation
 	;;
 	NetBSD*)
@@ -3114,7 +3093,7 @@
 	Linux*)
 	      $extendedecho "$prefixdir$sysvdir\c" >>logrotation
               echo "dansguardian stop > /dev/null" >>logrotation
-              echo "" >>logrotation	
+              echo "" >>logrotation
 	;;
 esac
 
@@ -3148,7 +3127,7 @@
 	;;
 	FreeBSD*)
 	        $extendedecho "$prefixdir$sysvdir\c" >>logrotation
-	        echo "dansguardian.sh start > /dev/null" >>logrotation
+	        echo "start-dg.sh start > /dev/null" >>logrotation
 	        echo "" >>logrotation
 	;;
 	NetBSD*)
@@ -3164,7 +3143,7 @@
 	Linux*)
 	      $extendedecho "$prefixdir$sysvdir\c" >>logrotation
               echo "dansguardian start > /dev/null" >>logrotation
-              echo "" >>logrotation	
+              echo "" >>logrotation
 	;;
 esac
 
@@ -3176,7 +3155,7 @@
 fi
 

 echo "  rotate 4" >>logrotate.dansguardian
 echo "  weekly" >>logrotate.dansguardian
 echo "  sharedscripts" >>logrotate.dansguardian
@@ -3192,7 +3171,7 @@
 	;;
 	FreeBSD*)
 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
-	        echo "dansguardian.sh stop > /dev/null" >>logrotate.dansguardian
+	        echo "start-dg.sh stop > /dev/null" >>logrotate.dansguardian
 	;;
 	NetBSD*)
 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
@@ -3201,7 +3180,7 @@
 	Darwin*)
 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
 	        echo "dansguardian.sh stop > /dev/null" >>logrotate.dansguardian
-	;;	
+	;;
 	Linux*)
               echo "    killall dansguardian > /dev/null" >>logrotate.dansguardian
               echo "    sleep 5" >>logrotate.dansguardian
@@ -3223,7 +3202,7 @@
 	;;
 	FreeBSD*)
 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
-	        echo "dansguardian.sh start > /dev/null" >>logrotate.dansguardian
+	        echo "start-dg.sh start > /dev/null" >>logrotate.dansguardian
 	;;
 	NetBSD*)
 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
@@ -3232,7 +3211,7 @@
 	Darwin*)
 	        $extendedecho "    $prefixdir$sysvdir\c" >>logrotate.dansguardian
 	        echo "dansguardian.sh start > /dev/null" >>logrotate.dansguardian
-	;;	
+	;;
 	Linux*)
 	      $extendedecho "    $prefixdir$bindir\c" >>logrotate.dansguardian
               echo "dansguardian > /dev/null" >>logrotate.dansguardian
@@ -3241,7 +3220,7 @@
 echo "  endscript" >>logrotate.dansguardian
 echo "}" >>logrotate.dansguardian
 
-# END DansGuardian 
+# END DansGuardian
 
 trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 




@exec mkdir -p etc/dansguardian/phraselists/violence
@exec mkdir -p etc/dansguardian/phraselists/warezhacking
@exec mkdir -p etc/dansguardian/phraselists/weapons
etc/dansguardian/bannedextensionlist.dist
etc/dansguardian/bannediplist.dist
etc/dansguardian/bannedmimetypelist.dist
etc/dansguardian/bannedphraselist.dist
etc/dansguardian/bannedregexpurllist.dist
etc/dansguardian/bannedsitelist.dist
etc/dansguardian/bannedurllist.dist
etc/dansguardian/banneduserlist.dist
etc/dansguardian/contentregexplist.dist
etc/dansguardian/dansguardian.conf.dist
etc/dansguardian/exceptioniplist.dist
etc/dansguardian/exceptionphraselist.dist
etc/dansguardian/exceptionurllist.dist
etc/dansguardian/exceptionuserlist.dist
etc/dansguardian/exceptionsitelist.dist
etc/dansguardian/messages.dist
etc/dansguardian/phraselists/chat/weighted.dist
etc/dansguardian/phraselists/drugadvocacy/weighted.dist
etc/dansguardian/phraselists/dutchbadwords/weighted.dist
etc/dansguardian/phraselists/frenchbadwords/weighted.dist
etc/dansguardian/phraselists/gambling/banned.dist
etc/dansguardian/phraselists/gambling/weighted.dist
etc/dansguardian/phraselists/germanpornography/weighted.dist
etc/dansguardian/phraselists/goodphrases/exception.dist
etc/dansguardian/phraselists/goodphrases/weighted.dist
etc/dansguardian/phraselists/gore/weighted.dist
etc/dansguardian/phraselists/illegaldrugs/banned.dist
etc/dansguardian/phraselists/illegaldrugs/weighted.dist
etc/dansguardian/phraselists/intolerance/weighted.dist
etc/dansguardian/phraselists/italianbadwords/weighted.dist
etc/dansguardian/phraselists/legaldrugs/weighted.dist
etc/dansguardian/phraselists/personals/weighted.dist
etc/dansguardian/phraselists/pornography/banned.dist
etc/dansguardian/phraselists/pornography/weighted.dist
etc/dansguardian/phraselists/violence/weighted.dist
etc/dansguardian/phraselists/warezhacking/weighted.dist
etc/dansguardian/phraselists/weapons/weighted.dist
etc/dansguardian/pics.dist
etc/dansguardian/template.html.dist
etc/dansguardian/weightedphraselist.dist
etc/dansguardian/weightedphraselist
etc/rc.d/start-dg.sh
sbin/dansguardian
www/cgi-bin/dansguardian.pl.dist
@dirrm etc/dansguardian/phraselists/chat
@dirrm etc/dansguardian/phraselists/drugadvocacy
@dirrm etc/dansguardian/phraselists/dutchbadwords

@dirrm etc/dansguardian/phraselists
@dirrm etc/dansguardian
@unexec echo If permanently deleting this package, /var/log/dansguardian.log must be removed manually
@unexec echo If permanently deleting this package, custom configuration files must be removed manually

Return to bug 61048

Lines 2-12 Link Here

(-)dansguardian/Makefile (-3 / +3 lines)
2	# Date created: March 26, 2002	2	# Date created: March 26, 2002
3	# Whom: Freddie Cash <fcash@sd73.bc.ca>	3	# Whom: Freddie Cash <fcash@sd73.bc.ca>
4	#	4	#
5	# $FreeBSD: ports/www/dansguardian/Makefile,v 1.11 2004/01/07 08:33:41 linimon Exp $	5	# $FreeBSD: ports/www/dansguardian/Makefile,v 1.10 2003/11/07 09:12:49 marcus Exp $
6	#	6	#
7		7
8	PORTNAME= dansguardian	8	PORTNAME= dansguardian
9	PORTVERSION= 2.6.1.6	9	PORTVERSION= 2.6.1.11
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= # empty, see below	11	MASTER_SITES= # empty, see below
12	DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source	12	DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
Lines 14-20 Link Here
14	MAINTAINER= fcash@sd73.bc.ca	14	MAINTAINER= fcash@sd73.bc.ca
15	COMMENT= A fast, feature-rich web content filter for Squid proxy servers	15	COMMENT= A fast, feature-rich web content filter for Squid proxy servers
16		16
17	RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \	17	RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid:install \
18	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install	18	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install
19		19
20	CONFLICTS= dansguardian-devel	20	CONFLICTS= dansguardian-devel

Lines 1-5 Link Here

(-)dansguardian/files/patch-autoconf::fbsd.in (-81 / +71 lines)
1	--- autoconf/fbsd.in.orig Wed Nov 19 16:06:41 2003	1	--- autoconf/fbsd.in.orig Tue Dec 23 16:17:18 2003
2	+++ autoconf/fbsd.in Mon Nov 24 11:14:17 2003	2	+++ autoconf/fbsd.in Wed Jan 7 14:48:42 2004
3	@@ -20,7 +20,7 @@	3	@@ -20,7 +20,7 @@
4	logrotate.dansguardian	4	logrotate.dansguardian
5		5
Lines 9-25 Link Here
9	PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"	9	PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
10	PASSVARS += -DPIDDIR=\"${PIDDIR}\"	10	PASSVARS += -DPIDDIR=\"${PIDDIR}\"
11		11
12	@@ -41,52 +41,83 @@	12	@@ -44,49 +44,79 @@
13	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp	13	@test -d $I$(SYSVLOCATION) \|\| install -d $I$(SYSVLOCATION)
14		14	@test -d $I$(CONFFILELOCATION) \|\| install -d $I$(CONFFILELOCATION)
15	install:	15	@test -d $I$(CONFFILELOCATION)phraselists \|\| install -d $I$(CONFFILELOCATION)phraselists
16	- @test -d $I$(SYSVLOCATION) \|\| install -d $I$(SYSVLOCATION)	16	+ @test -d $I$(CONFFILELOCATION)phraselists/chat \|\| install -d $I$(CONFFILELOCATION)phraselists/chat
17	- @test -d $I$(CONFFILELOCATION) \|\| install -d $I$(CONFFILELOCATION)	17	+ @test -d $I$(CONFFILELOCATION)phraselists/drugadvocacy \|\| install -d $I$(CONFFILELOCATION)phraselists/drugadvocacy
18	- @test -d $I$(CONFFILELOCATION)phraselists \|\| install -d $I$(CONFFILELOCATION)phraselists	18	+ @test -d $I$(CONFFILELOCATION)phraselists/dutchbadwords \|\| install -d $I$(CONFFILELOCATION)phraselists/dutchbadwords
19	- @test -d $I$(CGIBINLOCATION) \|\| install -d $I$(CGIBINLOCATION)	19	+ @test -d $I$(CONFFILELOCATION)phraselists/frenchbadwords \|\| install -d $I$(CONFFILELOCATION)phraselists/frenchbadwords
20	- @test -d $I$(MANUALFILES)man8/ \|\| install -d $I$(MANUALFILES)man8/	20	+ @test -d $I$(CONFFILELOCATION)phraselists/gambling \|\| install -d $I$(CONFFILELOCATION)phraselists/gambling
		21	+ @test -d $I$(CONFFILELOCATION)phraselists/germanpornography \|\| install -d $I$(CONFFILELOCATION)phraselists/germanpornography
		22	+ @test -d $I$(CONFFILELOCATION)phraselists/goodphrases \|\| install -d $I$(CONFFILELOCATION)phraselists/goodphrases
		23	+ @test -d $I$(CONFFILELOCATION)phraselists/gore \|\| install -d $I$(CONFFILELOCATION)phraselists/gore
		24	+ @test -d $I$(CONFFILELOCATION)phraselists/illegaldrugs \|\| install -d $I$(CONFFILELOCATION)phraselists/illegaldrugs
		25	+ @test -d $I$(CONFFILELOCATION)phraselists/intolerance \|\| install -d $I$(CONFFILELOCATION)phraselists/intolerance
		26	+ @test -d $I$(CONFFILELOCATION)phraselists/italianbadwords \|\| install -d $I$(CONFFILELOCATION)phraselists/italianbadwords
		27	+ @test -d $I$(CONFFILELOCATION)phraselists/legaldrugs \|\| install -d $I$(CONFFILELOCATION)phraselists/legaldrugs
		28	+ @test -d $I$(CONFFILELOCATION)phraselists/personals \|\| install -d $I$(CONFFILELOCATION)phraselists/personals
		29	+ @test -d $I$(CONFFILELOCATION)phraselists/pornography \|\| install -d $I$(CONFFILELOCATION)phraselists/pornography
		30	+ @test -d $I$(CONFFILELOCATION)phraselists/violence \|\| install -d $I$(CONFFILELOCATION)phraselists/violence
		31	+ @test -d $I$(CONFFILELOCATION)phraselists/warezhacking \|\| install -d $I$(CONFFILELOCATION)phraselists/warezhacking
		32	+ @test -d $I$(CONFFILELOCATION)phraselists/weapons \|\| install -d $I$(CONFFILELOCATION)phraselists/weapons
		33	@test -d $I$(CGIBINLOCATION) \|\| install -d $I$(CGIBINLOCATION)
		34	@test -d $I$(MANUALFILES)man8/ \|\| install -d $I$(MANUALFILES)man8/
21	- @test -d $I$(LOGLOCATION) \|\| install -d $I$(LOGLOCATION)	35	- @test -d $I$(LOGLOCATION) \|\| install -d $I$(LOGLOCATION)
22	- @test -d $I$(BINARYLOCATION) \|\| install -d $I$(BINARYLOCATION)	36	@test -d $I$(BINARYLOCATION) \|\| install -d $I$(BINARYLOCATION)
23	- cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian	37	- cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
24	- cp -f ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf	38	- cp -f ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf
25	- cp -f ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist	39	- cp -f ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist
Lines 50-135 Link Here
50	- chmod -R u+wr $I$(LOGLOCATION)	64	- chmod -R u+wr $I$(LOGLOCATION)
51	- chmod u+wrx $I$(LOGLOCATION)	65	- chmod u+wrx $I$(LOGLOCATION)
52	- if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi	66	- if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi
53	+ install -d $I$(CONFFILELOCATION)
54	+ install -d $I$(CONFFILELOCATION)phraselists
55	+ install -d $I$(CONFFILELOCATION)phraselists/chat
56	+ install -d $I$(CONFFILELOCATION)phraselists/drugadvocacy
57	+ install -d $I$(CONFFILELOCATION)phraselists/dutchbadwords
58	+ install -d $I$(CONFFILELOCATION)phraselists/frenchbadwords
59	+ install -d $I$(CONFFILELOCATION)phraselists/gambling
60	+ install -d $I$(CONFFILELOCATION)phraselists/germanpornography
61	+ install -d $I$(CONFFILELOCATION)phraselists/goodphrases
62	+ install -d $I$(CONFFILELOCATION)phraselists/gore
63	+ install -d $I$(CONFFILELOCATION)phraselists/illegaldrugs
64	+ install -d $I$(CONFFILELOCATION)phraselists/intolerance
65	+ install -d $I$(CONFFILELOCATION)phraselists/italianbadwords
66	+ install -d $I$(CONFFILELOCATION)phraselists/legaldrugs
67	+ install -d $I$(CONFFILELOCATION)phraselists/personals
68	+ install -d $I$(CONFFILELOCATION)phraselists/pornography
69	+ install -d $I$(CONFFILELOCATION)phraselists/violence
70	+ install -d $I$(CONFFILELOCATION)phraselists/warezhacking
71	+ install -d $I$(CONFFILELOCATION)phraselists/weapons
72	+ install -d $I$(CGIBINLOCATION)
73	+ install -d $I$(MANUALFILES)man8/
74	+ install -d $I$(LOGLOCATION)
75	+ install -d $I$(BINARYLOCATION)
76	+ install -o root -g wheel -m 755 ./dansguardian $I$(BINARYLOCATION)dansguardian	67	+ install -o root -g wheel -m 755 ./dansguardian $I$(BINARYLOCATION)dansguardian
77	+ install -o root -g wheel -m 644 ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf	68	+ install -o root -g wheel -m 644 ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf.dist
78	+ install -o root -g wheel -m 644 ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist	69	+ install -o root -g wheel -m 644 ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist.dist
79	+ install -o root -g wheel -m 644 ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist	70	+ install -o root -g wheel -m 644 ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist.dist
80	+ install -o root -g wheel -m 644 ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist	71	+ install -o root -g wheel -m 644 ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist.dist
81	+ install -o root -g wheel -m 644 ./phraselists/chat/weighted $I$(CONFFILELOCATION)phraselists/chat/weighted	72	+ install -o root -g wheel -m 644 ./phraselists/chat/weighted $I$(CONFFILELOCATION)phraselists/chat/weighted.dist
82	+ install -o root -g wheel -m 644 ./phraselists/drugadvocacy/weighted $I$(CONFFILELOCATION)phraselists/drugadvocacy/weighted	73	+ install -o root -g wheel -m 644 ./phraselists/drugadvocacy/weighted $I$(CONFFILELOCATION)phraselists/drugadvocacy/weighted.dist
83	+ install -o root -g wheel -m 644 ./phraselists/dutchbadwords/weighted $I$(CONFFILELOCATION)phraselists/dutchbadwords/weighted	74	+ install -o root -g wheel -m 644 ./phraselists/dutchbadwords/weighted $I$(CONFFILELOCATION)phraselists/dutchbadwords/weighted.dist
84	+ install -o root -g wheel -m 644 ./phraselists/frenchbadwords/weighted $I$(CONFFILELOCATION)phraselists/frenchbadwords/weighted	75	+ install -o root -g wheel -m 644 ./phraselists/frenchbadwords/weighted $I$(CONFFILELOCATION)phraselists/frenchbadwords/weighted.dist
85	+ install -o root -g wheel -m 644 ./phraselists/gambling/banned $I$(CONFFILELOCATION)phraselists/gambling/banned	76	+ install -o root -g wheel -m 644 ./phraselists/gambling/banned $I$(CONFFILELOCATION)phraselists/gambling/banned.dist
86	+ install -o root -g wheel -m 644 ./phraselists/gambling/weighted $I$(CONFFILELOCATION)phraselists/gambling/weighted	77	+ install -o root -g wheel -m 644 ./phraselists/gambling/weighted $I$(CONFFILELOCATION)phraselists/gambling/weighted.dist
87	+ install -o root -g wheel -m 644 ./phraselists/germanpornography/weighted $I$(CONFFILELOCATION)phraselists/germanpornography/weighted	78	+ install -o root -g wheel -m 644 ./phraselists/germanpornography/weighted $I$(CONFFILELOCATION)phraselists/germanpornography/weighted.dist
88	+ install -o root -g wheel -m 644 ./phraselists/goodphrases/exception $I$(CONFFILELOCATION)phraselists/goodphrases/exception	79	+ install -o root -g wheel -m 644 ./phraselists/goodphrases/exception $I$(CONFFILELOCATION)phraselists/goodphrases/exception.dist
89	+ install -o root -g wheel -m 644 ./phraselists/goodphrases/weighted $I$(CONFFILELOCATION)phraselists/goodphrases/weighted	80	+ install -o root -g wheel -m 644 ./phraselists/goodphrases/weighted $I$(CONFFILELOCATION)phraselists/goodphrases/weighted.dist
90	+ install -o root -g wheel -m 644 ./phraselists/gore/weighted $I$(CONFFILELOCATION)phraselists/gore/weighted	81	+ install -o root -g wheel -m 644 ./phraselists/gore/weighted $I$(CONFFILELOCATION)phraselists/gore/weighted.dist
91	+ install -o root -g wheel -m 644 ./phraselists/illegaldrugs/banned $I$(CONFFILELOCATION)phraselists/illegaldrugs/banned	82	+ install -o root -g wheel -m 644 ./phraselists/illegaldrugs/banned $I$(CONFFILELOCATION)phraselists/illegaldrugs/banned.dist
92	+ install -o root -g wheel -m 644 ./phraselists/illegaldrugs/weighted $I$(CONFFILELOCATION)phraselists/illegaldrugs/weighted	83	+ install -o root -g wheel -m 644 ./phraselists/illegaldrugs/weighted $I$(CONFFILELOCATION)phraselists/illegaldrugs/weighted.dist
93	+ install -o root -g wheel -m 644 ./phraselists/intolerance/banned $I$(CONFFILELOCATION)phraselists/intolerance/banned	84	+ install -o root -g wheel -m 644 ./phraselists/intolerance/weighted $I$(CONFFILELOCATION)phraselists/intolerance/weighted.dist
94	+ install -o root -g wheel -m 644 ./phraselists/intolerance/weighted $I$(CONFFILELOCATION)phraselists/intolerance/weighted	85	+ install -o root -g wheel -m 644 ./phraselists/italianbadwords/weighted $I$(CONFFILELOCATION)phraselists/italianbadwords/weighted.dist
95	+ install -o root -g wheel -m 644 ./phraselists/italianbadwords/weighted $I$(CONFFILELOCATION)phraselists/italianbadwords/weighted	86	+ install -o root -g wheel -m 644 ./phraselists/legaldrugs/weighted $I$(CONFFILELOCATION)phraselists/legaldrugs/weighted.dist
96	+ install -o root -g wheel -m 644 ./phraselists/legaldrugs/weighted $I$(CONFFILELOCATION)phraselists/legaldrugs/weighted	87	+ install -o root -g wheel -m 644 ./phraselists/personals/weighted $I$(CONFFILELOCATION)phraselists/personals/weighted.dist
97	+ install -o root -g wheel -m 644 ./phraselists/personals/weighted $I$(CONFFILELOCATION)phraselists/personals/weighted	88	+ install -o root -g wheel -m 644 ./phraselists/pornography/banned $I$(CONFFILELOCATION)phraselists/pornography/banned.dist
98	+ install -o root -g wheel -m 644 ./phraselists/pornography/banned $I$(CONFFILELOCATION)phraselists/pornography/banned	89	+ install -o root -g wheel -m 644 ./phraselists/pornography/weighted $I$(CONFFILELOCATION)phraselists/pornography/weighted.dist
99	+ install -o root -g wheel -m 644 ./phraselists/pornography/weighted $I$(CONFFILELOCATION)phraselists/pornography/weighted	90	+ install -o root -g wheel -m 644 ./phraselists/violence/weighted $I$(CONFFILELOCATION)phraselists/violence/weighted.dist
100	+ install -o root -g wheel -m 644 ./phraselists/violence/weighted $I$(CONFFILELOCATION)phraselists/violence/weighted	91	+ install -o root -g wheel -m 644 ./phraselists/warezhacking/weighted $I$(CONFFILELOCATION)phraselists/warezhacking/weighted.dist
101	+ install -o root -g wheel -m 644 ./phraselists/warezhacking/weighted $I$(CONFFILELOCATION)phraselists/warezhacking/weighted	92	+ install -o root -g wheel -m 644 ./phraselists/weapons/weighted $I$(CONFFILELOCATION)phraselists/weapons/weighted.dist
102	+ install -o root -g wheel -m 644 ./phraselists/weapons/weighted $I$(CONFFILELOCATION)phraselists/weapons/weighted	93	+ install -o root -g wheel -m 644 ./bannediplist $I$(CONFFILELOCATION)bannediplist.dist
103	+ install -o root -g wheel -m 644 ./bannediplist $I$(CONFFILELOCATION)bannediplist	94	+ install -o root -g wheel -m 644 ./banneduserlist $I$(CONFFILELOCATION)banneduserlist.dist
104	+ install -o root -g wheel -m 644 ./banneduserlist $I$(CONFFILELOCATION)banneduserlist	95	+ install -o root -g wheel -m 644 ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist.dist
105	+ install -o root -g wheel -m 644 ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist	96	+ install -o root -g wheel -m 644 ./bannedmimetypelist $I$(CONFFILELOCATION)bannedmimetypelist.dist
106	+ install -o root -g wheel -m 644 ./bannedmimetypelist $I$(CONFFILELOCATION)bannedmimetypelist	97	+ install -o root -g wheel -m 644 ./bannedurllist $I$(CONFFILELOCATION)bannedurllist.dist
107	+ install -o root -g wheel -m 644 ./bannedurllist $I$(CONFFILELOCATION)bannedurllist	98	+ install -o root -g wheel -m 644 ./bannedregexpurllist $I$(CONFFILELOCATION)bannedregexpurllist.dist
108	+ install -o root -g wheel -m 644 ./bannedregexpurllist $I$(CONFFILELOCATION)bannedregexpurllist	99	+ install -o root -g wheel -m 644 ./bannedsitelist $I$(CONFFILELOCATION)bannedsitelist.dist
109	+ install -o root -g wheel -m 644 ./bannedsitelist $I$(CONFFILELOCATION)bannedsitelist	100	+ install -o root -g wheel -m 644 ./contentregexplist $I$(CONFFILELOCATION)contentregexplist.dist
110	+ install -o root -g wheel -m 644 ./contentregexplist $I$(CONFFILELOCATION)contentregexplist	101	+ install -o root -g wheel -m 644 ./exceptionsitelist $I$(CONFFILELOCATION)exceptionsitelist.dist
111	+ install -o root -g wheel -m 644 ./exceptionsitelist $I$(CONFFILELOCATION)exceptionsitelist	102	+ install -o root -g wheel -m 644 ./exceptionurllist $I$(CONFFILELOCATION)exceptionurllist.dist
112	+ install -o root -g wheel -m 644 ./exceptionurllist $I$(CONFFILELOCATION)exceptionurllist	103	+ install -o root -g wheel -m 644 ./exceptionuserlist $I$(CONFFILELOCATION)exceptionuserlist.dist
113	+ install -o root -g wheel -m 644 ./exceptionuserlist $I$(CONFFILELOCATION)exceptionuserlist	104	+ install -o root -g wheel -m 644 ./exceptioniplist $I$(CONFFILELOCATION)exceptioniplist.dist
114	+ install -o root -g wheel -m 644 ./exceptioniplist $I$(CONFFILELOCATION)exceptioniplist	105	+ install -o root -g wheel -m 644 ./pics $I$(CONFFILELOCATION)pics.dist
115	+ install -o root -g wheel -m 644 ./pics $I$(CONFFILELOCATION)pics	106	+ install -o root -g wheel -m 644 ./template.html $I$(CONFFILELOCATION)template.html.dist
116	+ install -o root -g wheel -m 644 ./template.html $I$(CONFFILELOCATION)template.html	107	+ install -o root -g wheel -m 644 ./messages $I$(CONFFILELOCATION)messages.dist
117	+ install -o root -g wheel -m 644 ./messages $I$(CONFFILELOCATION)messages	108	+ install -o root -g wheel -m 755 ./dansguardian.bsdv $I$(SYSVLOCATION)start-dg.sh.dist
118	+ install -o root -g wheel -m 755 ./dansguardian.bsdv $I$(SYSVLOCATION)start-dg.sh	109	+ install -o root -g wheel -m 755 ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl.dist
119	+ install -o root -g wheel -m 755 ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl
120	+ install -o root -g wheel -m 644 ./dansguardian.8 $I$(MANUALFILES)man8/dansguardian.8	110	+ install -o root -g wheel -m 644 ./dansguardian.8 $I$(MANUALFILES)man8/dansguardian.8
121	+ install -o nobody -g nogroup -m 644 /dev/null $I$(LOGLOCATION)dansguardian.log	111	+ @test -f $I$(LOGLOCATION)/dansguardian.log \|\| install -o nobody -g nogroup -m 644 /dev/null $I$(LOGLOCATION)dansguardian.log
122		112
123	uninstall:	113	uninstall:
124	rm -f $(BINARYLOCATION)dansguardian	114	rm -f $(BINARYLOCATION)dansguardian
125	rm -f $(SYSVLOCATION)dansguardian	115	rm -f $(SYSVLOCATION)dansguardian
126	rm -f $(CGIBINLOCATION)dansguardian.pl	116	rm -f $(CGIBINLOCATION)dansguardian.pl
127	- rm -f $(MANUALFILES)man8/dansguardian.8.gz	117	- rm -f $(MANUALFILES)man8/dansguardian.8.gz
128	+ rm -f $(MANUALFILES)man8/dansguardian.8*	118	+ rm -fr $(MANUALFILES)man8/dansguardian.8*
129	rm -fr $(CONFFILELOCATION)	119	rm -fr $(CONFFILELOCATION)
130	- rm -fr $(LOGLOCATION)	120	- rm -fr $(LOGLOCATION)
131	- if [ -f $(LOGROTATELOCATION)dansguardian ]; then rm -f $(LOGROTATELOCATION)dansguardian; fi	121	- if [ -f $(LOGROTATELOCATION)dansguardian ]; then rm -f $(LOGROTATELOCATION)dansguardian; fi
132	+ rm -fr $(LOGLOCATION)dansguardian.log	122	+ rm -f $(LOGLOCATION)/dansguardian.log
133		123
134	clean:	124	clean:
135	rm -f $(OBJ) $(PROG)	125	rm -f $(OBJ) $(PROG)

Lines 1-5 Link Here

(-)dansguardian/files/patch-configure (-2 / +83 lines)
1	--- configure.orig Mon Jul 7 12:09:35 2003	1	--- configure.orig Wed Jan 7 11:29:38 2004
2	+++ configure Mon Jul 7 12:10:25 2003	2	+++ configure Wed Jan 7 11:54:02 2004
3	@@ -2540,7 +2540,7 @@	3	@@ -2540,7 +2540,7 @@
4	$extendedecho "SYSVLOCATION = \${PREFIX}$sysvdir" >>Makefile	4	$extendedecho "SYSVLOCATION = \${PREFIX}$sysvdir" >>Makefile
5	$extendedecho "CGIBINLOCATION = \${PREFIX}$cgidir" >>Makefile	5	$extendedecho "CGIBINLOCATION = \${PREFIX}$cgidir" >>Makefile
Lines 46-51 Link Here
46	echo "" >>logrotation	46	echo "" >>logrotation
47		47
48	case `uname -s` in	48	case `uname -s` in
		49	@@ -3098,7 +3077,7 @@
		50	;;
		51	FreeBSD*)
		52	$extendedecho "$prefixdir$sysvdir\c" >>logrotation
		53	- echo "dansguardian.sh stop > /dev/null" >>logrotation
		54	+ echo "start-dg.sh stop > /dev/null" >>logrotation
		55	echo "" >>logrotation
		56	;;
		57	NetBSD*)
		58	@@ -3114,7 +3093,7 @@
		59	Linux*)
		60	$extendedecho "$prefixdir$sysvdir\c" >>logrotation
		61	echo "dansguardian stop > /dev/null" >>logrotation
		62	- echo "" >>logrotation
		63	+ echo "" >>logrotation
		64	;;
		65	esac
		66
		67	@@ -3148,7 +3127,7 @@
		68	;;
		69	FreeBSD*)
		70	$extendedecho "$prefixdir$sysvdir\c" >>logrotation
		71	- echo "dansguardian.sh start > /dev/null" >>logrotation
		72	+ echo "start-dg.sh start > /dev/null" >>logrotation
		73	echo "" >>logrotation
		74	;;
		75	NetBSD*)
		76	@@ -3164,7 +3143,7 @@
		77	Linux*)
		78	$extendedecho "$prefixdir$sysvdir\c" >>logrotation
		79	echo "dansguardian start > /dev/null" >>logrotation
		80	- echo "" >>logrotation
		81	+ echo "" >>logrotation
		82	;;
		83	esac
		84
49	@@ -3176,7 +3155,7 @@	85	@@ -3176,7 +3155,7 @@
50	fi	86	fi
51		87
Lines 55-57 Link Here
55	echo " rotate 4" >>logrotate.dansguardian	91	echo " rotate 4" >>logrotate.dansguardian
56	echo " weekly" >>logrotate.dansguardian	92	echo " weekly" >>logrotate.dansguardian
57	echo " sharedscripts" >>logrotate.dansguardian	93	echo " sharedscripts" >>logrotate.dansguardian
		94	@@ -3192,7 +3171,7 @@
		95	;;
		96	FreeBSD*)
		97	$extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian
		98	- echo "dansguardian.sh stop > /dev/null" >>logrotate.dansguardian
		99	+ echo "start-dg.sh stop > /dev/null" >>logrotate.dansguardian
		100	;;
		101	NetBSD*)
		102	$extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian
		103	@@ -3201,7 +3180,7 @@
		104	Darwin*)
		105	$extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian
		106	echo "dansguardian.sh stop > /dev/null" >>logrotate.dansguardian
		107	- ;;
		108	+ ;;
		109	Linux*)
		110	echo " killall dansguardian > /dev/null" >>logrotate.dansguardian
		111	echo " sleep 5" >>logrotate.dansguardian
		112	@@ -3223,7 +3202,7 @@
		113	;;
		114	FreeBSD*)
		115	$extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian
		116	- echo "dansguardian.sh start > /dev/null" >>logrotate.dansguardian
		117	+ echo "start-dg.sh start > /dev/null" >>logrotate.dansguardian
		118	;;
		119	NetBSD*)
		120	$extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian
		121	@@ -3232,7 +3211,7 @@
		122	Darwin*)
		123	$extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian
		124	echo "dansguardian.sh start > /dev/null" >>logrotate.dansguardian
		125	- ;;
		126	+ ;;
		127	Linux*)
		128	$extendedecho " $prefixdir$bindir\c" >>logrotate.dansguardian
		129	echo "dansguardian > /dev/null" >>logrotate.dansguardian
		130	@@ -3241,7 +3220,7 @@
		131	echo " endscript" >>logrotate.dansguardian
		132	echo "}" >>logrotate.dansguardian
		133
		134	-# END DansGuardian
		135	+# END DansGuardian
		136
		137	trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
		138

Lines 17-66 Link Here

(-)dansguardian/pkg-plist (-42 / +42 lines)
17	@exec mkdir -p etc/dansguardian/phraselists/violence	17	@exec mkdir -p etc/dansguardian/phraselists/violence
18	@exec mkdir -p etc/dansguardian/phraselists/warezhacking	18	@exec mkdir -p etc/dansguardian/phraselists/warezhacking
19	@exec mkdir -p etc/dansguardian/phraselists/weapons	19	@exec mkdir -p etc/dansguardian/phraselists/weapons
20	etc/dansguardian/bannedextensionlist	20	etc/dansguardian/bannedextensionlist.dist
21	etc/dansguardian/bannediplist	21	etc/dansguardian/bannediplist.dist
22	etc/dansguardian/bannedmimetypelist	22	etc/dansguardian/bannedmimetypelist.dist
23	etc/dansguardian/bannedphraselist	23	etc/dansguardian/bannedphraselist.dist
24	etc/dansguardian/bannedregexpurllist	24	etc/dansguardian/bannedregexpurllist.dist
25	etc/dansguardian/bannedsitelist	25	etc/dansguardian/bannedsitelist.dist
26	etc/dansguardian/bannedurllist	26	etc/dansguardian/bannedurllist.dist
27	etc/dansguardian/banneduserlist	27	etc/dansguardian/banneduserlist.dist
28	etc/dansguardian/contentregexplist	28	etc/dansguardian/contentregexplist.dist
29	etc/dansguardian/dansguardian.conf	29	etc/dansguardian/dansguardian.conf.dist
30	etc/dansguardian/exceptioniplist	30	etc/dansguardian/exceptioniplist.dist
31	etc/dansguardian/exceptionphraselist	31	etc/dansguardian/exceptionphraselist.dist
32	etc/dansguardian/exceptionsitelist	32	etc/dansguardian/exceptionurllist.dist
33	etc/dansguardian/exceptionurllist	33	etc/dansguardian/exceptionuserlist.dist
34	etc/dansguardian/exceptionuserlist	34	etc/dansguardian/exceptionsitelist.dist
35	etc/dansguardian/messages	35	etc/dansguardian/messages.dist
36	etc/dansguardian/phraselists/chat/weighted	36	etc/dansguardian/phraselists/chat/weighted.dist
37	etc/dansguardian/phraselists/drugadvocacy/weighted	37	etc/dansguardian/phraselists/drugadvocacy/weighted.dist
38	etc/dansguardian/phraselists/dutchbadwords/weighted	38	etc/dansguardian/phraselists/dutchbadwords/weighted.dist
39	etc/dansguardian/phraselists/frenchbadwords/weighted	39	etc/dansguardian/phraselists/frenchbadwords/weighted.dist
40	etc/dansguardian/phraselists/gambling/banned	40	etc/dansguardian/phraselists/gambling/banned.dist
41	etc/dansguardian/phraselists/gambling/weighted	41	etc/dansguardian/phraselists/gambling/weighted.dist
42	etc/dansguardian/phraselists/germanpornography/weighted	42	etc/dansguardian/phraselists/germanpornography/weighted.dist
43	etc/dansguardian/phraselists/goodphrases/exception	43	etc/dansguardian/phraselists/goodphrases/exception.dist
44	etc/dansguardian/phraselists/goodphrases/weighted	44	etc/dansguardian/phraselists/goodphrases/weighted.dist
45	etc/dansguardian/phraselists/gore/weighted	45	etc/dansguardian/phraselists/gore/weighted.dist
46	etc/dansguardian/phraselists/illegaldrugs/banned	46	etc/dansguardian/phraselists/illegaldrugs/banned.dist
47	etc/dansguardian/phraselists/illegaldrugs/weighted	47	etc/dansguardian/phraselists/illegaldrugs/weighted.dist
48	etc/dansguardian/phraselists/intolerance/banned	48	etc/dansguardian/phraselists/intolerance/weighted.dist
49	etc/dansguardian/phraselists/intolerance/weighted	49	etc/dansguardian/phraselists/italianbadwords/weighted.dist
50	etc/dansguardian/phraselists/italianbadwords/weighted	50	etc/dansguardian/phraselists/legaldrugs/weighted.dist
51	etc/dansguardian/phraselists/legaldrugs/weighted	51	etc/dansguardian/phraselists/personals/weighted.dist
52	etc/dansguardian/phraselists/personals/weighted	52	etc/dansguardian/phraselists/pornography/banned.dist
53	etc/dansguardian/phraselists/pornography/banned	53	etc/dansguardian/phraselists/pornography/weighted.dist
54	etc/dansguardian/phraselists/pornography/weighted	54	etc/dansguardian/phraselists/violence/weighted.dist
55	etc/dansguardian/phraselists/violence/weighted	55	etc/dansguardian/phraselists/warezhacking/weighted.dist
56	etc/dansguardian/phraselists/warezhacking/weighted	56	etc/dansguardian/phraselists/weapons/weighted.dist
57	etc/dansguardian/phraselists/weapons/weighted	57	etc/dansguardian/pics.dist
58	etc/dansguardian/pics	58	etc/dansguardian/template.html.dist
59	etc/dansguardian/template.html	59	etc/dansguardian/weightedphraselist.dist
60	etc/dansguardian/weightedphraselist
61	etc/rc.d/start-dg.sh	60	etc/rc.d/start-dg.sh
62	sbin/dansguardian	61	sbin/dansguardian
63	www/cgi-bin/dansguardian.pl	62	www/cgi-bin/dansguardian.pl.dist
64	@dirrm etc/dansguardian/phraselists/chat	63	@dirrm etc/dansguardian/phraselists/chat
65	@dirrm etc/dansguardian/phraselists/drugadvocacy	64	@dirrm etc/dansguardian/phraselists/drugadvocacy
66	@dirrm etc/dansguardian/phraselists/dutchbadwords	65	@dirrm etc/dansguardian/phraselists/dutchbadwords
Lines 81-83 Link Here
81	@dirrm etc/dansguardian/phraselists	80	@dirrm etc/dansguardian/phraselists
82	@dirrm etc/dansguardian	81	@dirrm etc/dansguardian
83	@unexec echo If permanently deleting this package, /var/log/dansguardian.log must be removed manually	82	@unexec echo If permanently deleting this package, /var/log/dansguardian.log must be removed manually
		83	@unexec echo If permanently deleting this package, custom configuration files must be removed manually