Attachment #20829 for bug #36677

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




# New ports collection makefile for:	dansguardian
# Date created:				April 02, 2002
# Whom:					Freddie Cash <fcash@bigfoot.com>
#
# $FreeBSD$
#

PORTNAME=	dansguardian
PORTVERSION=	2.2.8.0
CATEGORIES=	www
MASTER_SITES=	# empty, see below
DISTNAME=	DansGuardian-2.2.8-0.source

MAINTAINER=	fcash@bigfoot.com

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

WRKSRC=		${WRKDIR}/DansGuardian-2.2.8
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--prefix=${PREFIX} \
		--bindir=/sbin/ \
		--sysconfdir=/etc/dansguardian/ \
		--sysvdir=/etc/rc.d/ \
		--mandir=/man/ \
		--logdir=/var/log/ \
		--cgidir=/www/cgi-bin/ \
		--piddir=/var/run/

DG_URL=		http://dansguardian.org/index.php?page=copyright2

.if defined(WITHOUT_PICS)
CONFIGURE_ARGS+=	--without-pics-filter
.endif

MAN8=		dansguardian.8

NO_CDROM=	"Commercial download is restricted.  Check ${DG_URL} for more info"
NO_PACKAGE=	"Redistribution is restricted.  Check ${DG_URL} for more info"

.include <bsd.port.pre.mk>

.if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}))
FORBIDDEN="Commercial source download is restricted.  Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make"
.endif

post-install:
	@${CAT} pkg-message

.include <bsd.port.post.mk>

Line 1 Link Here

(-)../dansguardian-2.2.8/distinfo (-1 / +1 lines)
1	MD5 (DansGuardian-2.2.7-1.source.tar.gz) = f2157a54a2a07d78323e2cc64072ff6e	1	MD5 (DansGuardian-2.2.8-0.source.tar.gz) = 36eab61ddb5639d1aaed677a6da764e6




--- ConnectionHandler.cpp.orig	Tue Mar 26 08:22:34 2002
+++ ConnectionHandler.cpp	Tue Mar 26 08:25:12 2002
@@ -293,7 +293,9 @@
 
                         checkme.checkphrase(docbodyblock, dblen, options);
 
+#ifndef WITHOUT_PICS_FILTER
                         checkme.checkPICS(docbodyblock, dblen, options);
+#endif
                     } catch (exception& e) {}
                     delete[] docbodyblock;
                 }




--- autoconf/fbsd.in.orig	Tue Apr  2 11:51:15 2002
+++ autoconf/fbsd.in	Tue Apr  2 11:54:12 2002
@@ -17,7 +17,7 @@
                  dansguardian.conf config.cache Makefile logrotation
 

 PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
 PASSVARS += -DPIDDIR=\"${PIDDIR}\"
 
@@ -34,36 +34,31 @@
 
 
 CFLAGS = $(OPTIMISE) $(WARNING)
-DGCFLAGS = $(OPTIMISE) $(PASSVARS) -lz $(STATIC)
+DGCFLAGS = $(OPTIMISE) $(PASSVARS) $(PICS_FLAG) -lz $(STATIC)
 
 .cpp.o:
 	$(CPP) $(DEBUG) $(CFLAGS) -c $<
 
-all:	$(OBJ) 
+all:	$(OBJ)
 	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
 
 install:
 	@test -d $(SYSVLOCATION) || install -d $(SYSVLOCATION)
 	@test -d $(CONFFILELOCATION) || install -d $(CONFFILELOCATION)
 	@test -d $(CGIBINLOCATION) || install -d $(CGIBINLOCATION)
-	@test -d $(MANUALFILES)man8/ || install -d $(MANUALFILES)man8/
-	@test -d $(LOGLOCATION) || install -d $(LOGLOCATION)
-	@test -d $(BINARYLOCATION) || /usr/sbin/install -d $(BINARYLOCATION)
-	cp -f ./dansguardian $(BINARYLOCATION)dansguardian
-	cp -f ./dansguardian.conf $(CONFFILELOCATION)dansguardian.conf
-	cp -f ./bannedphraselist $(CONFFILELOCATION)bannedphraselist

-	chown -R $(PROXYUSER).$(PROXYGROUP) $(LOGLOCATION)
-	chmod -R u+wr $(LOGLOCATION)
-	chmod u+wrx $(LOGLOCATION)
+	@test -d $(BINARYLOCATION) || install -d $(BINARYLOCATION)
+	@install -m 755 -o root -g wheel ./dansguardian $(BINARYLOCATION)dansguardian
+	@install -m 644 -o root -g wheel ./dansguardian.conf $(CONFFILELOCATION)dansguardian.conf
+	@install -m 644 -o root -g wheel ./bannedphraselist $(CONFFILELOCATION)bannedphraselist

+	@install -m 644 -o root -g wheel ./exceptionuserlist $(CONFFILELOCATION)exceptionuserlist
+	@install -m 644 -o root -g wheel ./exceptioniplist $(CONFFILELOCATION)exceptioniplist
+	@install -m 644 -o root -g wheel ./pics $(CONFFILELOCATION)pics
+	@install -m 755 -o root -g wheel ./logrotation $(CONFFILELOCATION)logrotation
+	@install -m 755 -o root -g wheel ./dansguardian.bsdv $(SYSVLOCATION)dansguardian.sh
+	@install -m 755 -o root -g wheel ./dansguardian.pl $(CGIBINLOCATION)dansguardian.pl
+	@install -m 644 -o root -g wheel ./dansguardian.8 $(MANUALFILES)man8/dansguardian.8

 
 uninstall:
 	rm -f $(BINARYLOCATION)dansguardian
@@ -71,7 +66,7 @@
 	rm -f $(CGIBINLOCATION)dansguardian.pl
 	rm -f $(MANUALFILES)man8/dansguardian.8.gz
 	rm -fr $(CONFFILELOCATION)




--- configure.orig	Tue Apr  2 09:15:26 2002
+++ configure	Tue Apr  2 09:29:41 2002
@@ -2667,7 +2667,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
 echo "PROXYUSER = $runas_usr" >>Makefile
 case `uname -s` in
@@ -112,7 +113,10 @@
   --runas_usr=USER        run as user DEFAULT [$runas_usr]
   --runas_grp=GROUP       run as group DEFAULT [$runas_grp]
   --piddir=DIR            pid file in DIR [$piddir] (ignores prefix)
   --prefix=DIR            prefix root path DEFAULT [$prefixdir] (no trailing /)
+Features and packages:
+  --without-pics-filter   Disables PICS/ICRA filtering
+
 Do not forget the heading *and* trailing / except for prefix which only needs
 a heading /
 EOF
@@ -2668,6 +2672,13 @@
 echo "PROXYGROUP = $runas_grp" >>Makefile
 echo "PIDDIR = $piddir" >>Makefile
 
+case "${with_pics_filter}" in
+	no)
+		$extendedecho "  Turning off PICS/ICRA filtering."
+		$extendedecho "\n\${PICS_FLAG} = -DWITHOUT_PICS_FILTER" >> Makefile
+	;;
+esac
+
 case `uname -s` in
 	SunOS*)
 		echo "#undef __BSD" >autoconf/platform.h
@@ -2740,31 +2751,24 @@
                 chmod u+x dansguardian.bsdv
 	;;
 	FreeBSD*)
-		if [ -f dansguardian.bsdv ]; then
-                        rm -f dansguardian.bsdv
-                fi
-                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.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
+		cat autoconf/bsdv.in > dansguardian.bsdv
+		$extendedecho "\t[ -x /usr/local/sbin/dansguardian ] && /usr/local/sbin/dansguardian > /dev/null && echo -n \" dansguardian\"" >> dansguardian.bsdv
+		$extendedecho "\t;;" >> dansguardian.bsdv
+		$extendedecho "stop)" >> dansguardian.bsdv
+		$extendedecho "\t/usr/local/sbin/dansguardian -q" >> dansguardian.bsdv
+		$extendedecho "\t[ -r /tmp/.dguardianipc ] && echo -n \" dansguardian\"" >> dansguardian.bsdv
+		$extendedecho "\trm -f /tmp/.dguardianipc" >> dansguardian.bsdv
+		$extendedecho "\t;;" >> dansguardian.bsdv
+		$extendedecho "restart)" >> dansguardian.bsdv
+		$extendedecho "\t\$0 stop" >> dansguardian.bsdv
+		$extendedecho "\t\$0 start" >> dansguardian.bsdv
+		$extendedecho "\t;;" >> dansguardian.bsdv
+		$extendedecho "*)" >> dansguardian.bsdv
+		$extendedecho "\techo \"Usage: \$0 {start|stop|restart}\" >&2" >> dansguardian.bsdv
+		$extendedecho "\t;;" >> dansguardian.bsdv
+		$extendedecho "esac" >> dansguardian.bsdv
+		$extendedecho "exit 0" >> dansguardian.bsdv
+
 	;;
 	Linux*)
 		if [ -f dansguardian.sysv ]; then

Line 0 Link Here

(-)../dansguardian-2.2.8/pkg-message (+8 lines)
	1	===> Please Note:
	2
	3	*******************************************************************************
	4	This port has placed a log file in /var/log/ named dansguardian.log
	5	This log file can get quite large. Please read the newsyslog(8) man
	6	page for instructions on setting up log rotation and compression.
	7	*******************************************************************************
	8

Lines 10-17 Link Here

(-)../dansguardian-2.2.8/pkg-plist (-2 / +3 lines)
10	etc/dansguardian/exceptionuserlist	10	etc/dansguardian/exceptionuserlist
11	etc/dansguardian/exceptioniplist	11	etc/dansguardian/exceptioniplist
12	etc/dansguardian/pics	12	etc/dansguardian/pics
13	etc/dansguardian/logrotation	13	etc/rc.d/dansguardian.sh
14	sbin/dansguardian	14	sbin/dansguardian
15	squid/logs/dansguardian.log
16	www/cgi-bin/dansguardian.pl	15	www/cgi-bin/dansguardian.pl
17	@dirrm etc/dansguardian	16	@dirrm etc/dansguardian
		17	@cwd /
		18	var/log/dansguardian.log

Return to bug 36677

Lines 1-36 Link Here

(-)../dansguardian-2.2.8/Makefile (-9 / +14 lines)
1	# New ports collection makefile for: dansguardian	1	# New ports collection makefile for: dansguardian
2	# Date created: March 26, 2002	2	# Date created: April 02, 2002
3	# Whom: Freddie Cash <fcash@bigfoot.com>	3	# Whom: Freddie Cash <fcash@bigfoot.com>
4	#	4	#
5	# $FreeBSD: ports/www/dansguardian/Makefile,v 1.2 2002/03/31 04:28:18 kris Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= dansguardian	8	PORTNAME= dansguardian
9	PORTVERSION= 2.2.7.1	9	PORTVERSION= 2.2.8.0
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= # empty, see below	11	MASTER_SITES= # empty, see below
12	DISTNAME= DansGuardian-2.2.7-1.source	12	DISTNAME= DansGuardian-2.2.8-0.source
13		13
14	MAINTAINER= fcash@bigfoot.com	14	MAINTAINER= fcash@bigfoot.com
15		15
16	RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \	16	RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \
17	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install	17	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install
18		18
19	WRKSRC= ${WRKDIR}/DansGuardian-2.2.7	19	WRKSRC= ${WRKDIR}/DansGuardian-2.2.8
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	CONFIGURE_ARGS= --prefix=${PREFIX} \	21	CONFIGURE_ARGS= --prefix=${PREFIX} \
22	--bindir=/sbin/ \	22	--bindir=/sbin/ \
23	--sysconfdir=/etc/dansguardian/ \	23	--sysconfdir=/etc/dansguardian/ \
24	--sysvdir=/etc/rc.d/ \	24	--sysvdir=/etc/rc.d/ \
25	--mandir=/man/ \	25	--mandir=/man/ \
26	--logdir=/squid/logs/ \	26	--logdir=/var/log/ \
27	--cgidir=/www/cgi-bin/ \	27	--cgidir=/www/cgi-bin/ \
28	--piddir=/var/run/	28	--piddir=/var/run/
29		29
30	DG_URL= http://dansguardian.org/index.php?page=copyright2	30	DG_URL= http://dansguardian.org/index.php?page=copyright2
31		31
32	.if defined(WITHOUT_PICS)	32	.if defined(WITHOUT_PICS)
33	CONFIGURE_ARGS+= --without-pics-filter	33	CONFIGURE_ARGS+= --without-pics-filter
34	.endif	34	.endif
35		35
36	MAN8= dansguardian.8	36	MAN8= dansguardian.8
Lines 39-46 Link Here
39	NO_CDROM= "Commercial download is restricted. Check ${DG_URL} for more info"	39	NO_CDROM= "Commercial download is restricted. Check ${DG_URL} for more info"
40	NO_PACKAGE= "Redistribution is restricted. Check ${DG_URL} for more info"	40	NO_PACKAGE= "Redistribution is restricted. Check ${DG_URL} for more info"
41		41
42	.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})	42	.include <bsd.port.pre.mk>
		43
		44	.if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}))
43	FORBIDDEN="Commercial source download is restricted. Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make"	45	FORBIDDEN="Commercial source download is restricted. Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make"
44	.endif	46	.endif
45		47
46	.include <bsd.port.mk>	48	post-install:
		49	@${CAT} pkg-message
		50
		51	.include <bsd.port.post.mk>

Lines 1-12 Link Here

(-)../dansguardian-2.2.8/files/patch-ConnectionHandler.cpp (-12 lines)
1	--- ConnectionHandler.cpp.orig Tue Mar 26 08:22:34 2002
2	+++ ConnectionHandler.cpp Tue Mar 26 08:25:12 2002
3	@@ -293,7 +293,9 @@
4
5	checkme.checkphrase(docbodyblock, dblen, options);
6
7	+#ifndef WITHOUT_PICS_FILTER
8	checkme.checkPICS(docbodyblock, dblen, options);
9	+#endif
10	} catch (exception& e) {}
11	delete[] docbodyblock;
12	}

Lines 1-5 Link Here

(-)../dansguardian-2.2.8/files/patch-autoconf::fbsd.in (-15 / +17 lines)
1	--- autoconf/fbsd.in.orig Thu Mar 14 16:54:40 2002	1	--- autoconf/fbsd.in.orig Tue Apr 2 11:51:15 2002
2	+++ autoconf/fbsd.in Tue Mar 26 09:29:25 2002	2	+++ autoconf/fbsd.in Tue Apr 2 11:54:12 2002
3	@@ -17,7 +17,7 @@	3	@@ -17,7 +17,7 @@
4	dansguardian.conf config.cache Makefile logrotation	4	dansguardian.conf config.cache Makefile logrotation
5		5
Lines 9-27 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	@@ -29,7 +29,7 @@	12	@@ -34,36 +34,31 @@
13
14
15	CFLAGS = $(OPTIMISE) $(WARNING)
16	-DGCFLAGS = $(OPTIMISE) $(PASSVARS) -lz $(STATIC)
17	+DGCFLAGS = $(OPTIMISE) $(PASSVARS) $(PICS_FLAG) -lz $(STATIC)
18
19	.cpp.o:	13	.cpp.o:
20	$(CPP) $(DEBUG) $(CFLAGS) -c $<	14	$(CPP) $(DEBUG) $(CFLAGS) -c $<
21	@@ -44,26 +44,24 @@	15
22	@test -d $(MANUALFILES)man8/ \|\| install -d $(MANUALFILES)man8/	16	-all: $(OBJ)
23	@test -d $(LOGLOCATION) \|\| install -d $(LOGLOCATION)	17	+all: $(OBJ)
24	@test -d $(BINARYLOCATION) \|\| /usr/sbin/install -d $(BINARYLOCATION)	18	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
		19
		20	install:
		21	@test -d $(SYSVLOCATION) \|\| install -d $(SYSVLOCATION)
		22	@test -d $(CONFFILELOCATION) \|\| install -d $(CONFFILELOCATION)
		23	@test -d $(CGIBINLOCATION) \|\| install -d $(CGIBINLOCATION)
		24	- @test -d $(MANUALFILES)man8/ \|\| install -d $(MANUALFILES)man8/
		25	- @test -d $(LOGLOCATION) \|\| install -d $(LOGLOCATION)
		26	- @test -d $(BINARYLOCATION) \|\| /usr/sbin/install -d $(BINARYLOCATION)
25	- cp -f ./dansguardian $(BINARYLOCATION)dansguardian	27	- cp -f ./dansguardian $(BINARYLOCATION)dansguardian
26	- cp -f ./dansguardian.conf $(CONFFILELOCATION)dansguardian.conf	28	- cp -f ./dansguardian.conf $(CONFFILELOCATION)dansguardian.conf
27	- cp -f ./bannedphraselist $(CONFFILELOCATION)bannedphraselist	29	- cp -f ./bannedphraselist $(CONFFILELOCATION)bannedphraselist
Lines 42-47 Link Here
42	- chown -R $(PROXYUSER).$(PROXYGROUP) $(LOGLOCATION)	44	- chown -R $(PROXYUSER).$(PROXYGROUP) $(LOGLOCATION)
43	- chmod -R u+wr $(LOGLOCATION)	45	- chmod -R u+wr $(LOGLOCATION)
44	- chmod u+wrx $(LOGLOCATION)	46	- chmod u+wrx $(LOGLOCATION)
		47	+ @test -d $(BINARYLOCATION) \|\| install -d $(BINARYLOCATION)
45	+ @install -m 755 -o root -g wheel ./dansguardian $(BINARYLOCATION)dansguardian	48	+ @install -m 755 -o root -g wheel ./dansguardian $(BINARYLOCATION)dansguardian
46	+ @install -m 644 -o root -g wheel ./dansguardian.conf $(CONFFILELOCATION)dansguardian.conf	49	+ @install -m 644 -o root -g wheel ./dansguardian.conf $(CONFFILELOCATION)dansguardian.conf
47	+ @install -m 644 -o root -g wheel ./bannedphraselist $(CONFFILELOCATION)bannedphraselist	50	+ @install -m 644 -o root -g wheel ./bannedphraselist $(CONFFILELOCATION)bannedphraselist
Lines 54-60 Link Here
54	+ @install -m 644 -o root -g wheel ./exceptionuserlist $(CONFFILELOCATION)exceptionuserlist	57	+ @install -m 644 -o root -g wheel ./exceptionuserlist $(CONFFILELOCATION)exceptionuserlist
55	+ @install -m 644 -o root -g wheel ./exceptioniplist $(CONFFILELOCATION)exceptioniplist	58	+ @install -m 644 -o root -g wheel ./exceptioniplist $(CONFFILELOCATION)exceptioniplist
56	+ @install -m 644 -o root -g wheel ./pics $(CONFFILELOCATION)pics	59	+ @install -m 644 -o root -g wheel ./pics $(CONFFILELOCATION)pics
57	+ @install -m 755 -o root -g wheel ./logrotation $(CONFFILELOCATION)logrotation
58	+ @install -m 755 -o root -g wheel ./dansguardian.bsdv $(SYSVLOCATION)dansguardian.sh	60	+ @install -m 755 -o root -g wheel ./dansguardian.bsdv $(SYSVLOCATION)dansguardian.sh
59	+ @install -m 755 -o root -g wheel ./dansguardian.pl $(CGIBINLOCATION)dansguardian.pl	61	+ @install -m 755 -o root -g wheel ./dansguardian.pl $(CGIBINLOCATION)dansguardian.pl
60	+ @install -m 644 -o root -g wheel ./dansguardian.8 $(MANUALFILES)man8/dansguardian.8	62	+ @install -m 644 -o root -g wheel ./dansguardian.8 $(MANUALFILES)man8/dansguardian.8
Lines 63-69 Link Here
63		65
64	uninstall:	66	uninstall:
65	rm -f $(BINARYLOCATION)dansguardian	67	rm -f $(BINARYLOCATION)dansguardian
66	@@ -71,7 +69,7 @@	68	@@ -71,7 +66,7 @@
67	rm -f $(CGIBINLOCATION)dansguardian.pl	69	rm -f $(CGIBINLOCATION)dansguardian.pl
68	rm -f $(MANUALFILES)man8/dansguardian.8.gz	70	rm -f $(MANUALFILES)man8/dansguardian.8.gz
69	rm -fr $(CONFFILELOCATION)	71	rm -fr $(CONFFILELOCATION)

Lines 1-85 Link Here

(-)../dansguardian-2.2.8/files/patch-configure (-83 / +9 lines)
1	--- configure.orig Thu Mar 14 16:54:40 2002	1	--- configure.orig Tue Apr 2 09:15:26 2002
2	+++ configure Tue Mar 26 08:58:45 2002	2	+++ configure Tue Apr 2 09:29:41 2002
3	@@ -43,6 +43,7 @@	3	@@ -2667,7 +2667,7 @@
4	mandir='/usr/man/'	4	$extendedecho "SYSVLOCATION = \${PREFIX}$sysvdir" >>Makefile
5	logdir='/var/log/dansguardian/'	5	$extendedecho "CGIBINLOCATION = \${PREFIX}$cgidir" >>Makefile
6	piddir='/var/run/'	6	$extendedecho "MANUALFILES = \${PREFIX}$mandir" >>Makefile
7	+with_pics_filter="yes"	7	-$extendedecho "LOGLOCATION = \${PREFIX}$logdir" >>Makefile
8		8	+$extendedecho "LOGLOCATION = $logdir" >>Makefile
9		9	echo "PROXYUSER = $runas_usr" >>Makefile
10	case `uname -s` in
11	@@ -112,7 +113,10 @@
12	--runas_usr=USER run as user DEFAULT [$runas_usr]
13	--runas_grp=GROUP run as group DEFAULT [$runas_grp]
14	--piddir=DIR pid file in DIR [$piddir] (ignores prefix)
15	--prefix=DIR prefix root path DEFAULT [$prefixdir] (no trailing /)
16	+Features and packages:
17	+ --without-pics-filter Disables PICS/ICRA filtering
18	+
19	Do not forget the heading and trailing / except for prefix which only needs
20	a heading /
21	EOF
22	@@ -2668,6 +2672,13 @@
23	echo "PROXYGROUP = $runas_grp" >>Makefile	10	echo "PROXYGROUP = $runas_grp" >>Makefile
24	echo "PIDDIR = $piddir" >>Makefile	11	echo "PIDDIR = $piddir" >>Makefile
25
26	+case "${with_pics_filter}" in
27	+ no)
28	+ $extendedecho " Turning off PICS/ICRA filtering."
29	+ $extendedecho "\n\${PICS_FLAG} = -DWITHOUT_PICS_FILTER" >> Makefile
30	+ ;;
31	+esac
32	+
33	case `uname -s` in
34	SunOS*)
35	echo "#undef __BSD" >autoconf/platform.h
36	@@ -2740,31 +2751,24 @@
37	chmod u+x dansguardian.bsdv
38	;;
39	FreeBSD*)
40	- if [ -f dansguardian.bsdv ]; then
41	- rm -f dansguardian.bsdv
42	- fi
43	- cat autoconf/bsdv.in > dansguardian.bsdv
44	- $extendedecho " [ -x $prefixdir$bindir\c" >> dansguardian.bsdv
45	- $extendedecho "dansguardian ] && $prefixdir$bindir\c" >> dansguardian.bsdv
46	- echo "dansguardian > /dev/null && $extendedecho ' dansguardian\c'" >> dansguardian.bsdv
47	- echo " ;;" >> dansguardian.bsdv
48	- echo "stop)" >> dansguardian.bsdv
49	- $extendedecho " $prefixdir$bindir\c" >> dansguardian.bsdv
50	- echo "dansguardian -q" >> dansguardian.bsdv
51	- $extendedecho " [ -r /tmp/\c" >> dansguardian.bsdv
52	- echo ".dguardianipc ] && $extendedecho ' dansguardian\c'" >> dansguardian.bsdv
53	- echo " rm -f /tmp/.dguardianipc" >> dansguardian.bsdv
54	- echo " ;;" >> dansguardian.bsdv
55	- echo "restart)" >> dansguardian.bsdv
56	- echo " \$0 stop" >> dansguardian.bsdv
57	- echo " \$0 start" >> dansguardian.bsdv
58	- echo " ;;" >> dansguardian.bsdv
59	- echo "*)" >> dansguardian.bsdv
60	- echo " echo \"Usage: `basename \$0` {start\|stop\|restart}\" >&2" >> dansguardian.bsdv
61	- echo " ;;" >> dansguardian.bsdv
62	- echo "esac" >> dansguardian.bsdv
63	- echo "exit 0" >> dansguardian.bsdv
64	- chmod u+x dansguardian.bsdv
65	+ cat autoconf/bsdv.in > dansguardian.bsdv
66	+ $extendedecho "\t[ -x /usr/local/sbin/dansguardian ] && /usr/local/sbin/dansguardian > /dev/null && echo -n \" dansguardian\"" >> dansguardian.bsdv
67	+ $extendedecho "\t;;" >> dansguardian.bsdv
68	+ $extendedecho "stop)" >> dansguardian.bsdv
69	+ $extendedecho "\t/usr/local/sbin/dansguardian -q" >> dansguardian.bsdv
70	+ $extendedecho "\t[ -r /tmp/.dguardianipc ] && echo -n \" dansguardian\"" >> dansguardian.bsdv
71	+ $extendedecho "\trm -f /tmp/.dguardianipc" >> dansguardian.bsdv
72	+ $extendedecho "\t;;" >> dansguardian.bsdv
73	+ $extendedecho "restart)" >> dansguardian.bsdv
74	+ $extendedecho "\t\$0 stop" >> dansguardian.bsdv
75	+ $extendedecho "\t\$0 start" >> dansguardian.bsdv
76	+ $extendedecho "\t;;" >> dansguardian.bsdv
77	+ $extendedecho "*)" >> dansguardian.bsdv
78	+ $extendedecho "\techo \"Usage: \$0 {start\|stop\|restart}\" >&2" >> dansguardian.bsdv
79	+ $extendedecho "\t;;" >> dansguardian.bsdv
80	+ $extendedecho "esac" >> dansguardian.bsdv
81	+ $extendedecho "exit 0" >> dansguardian.bsdv
82	+
83	;;
84	Linux*)
85	if [ -f dansguardian.sysv ]; then