- Update to 2.7.7-8

- Convert to RCng
- Define latest link

PR:		ports/66336
Submitted by:	Freddie Cash <fcash@sd73.bc.ca> (maintainer)
This commit is contained in:
Pav Lucistnik 2004-05-09 21:41:15 +00:00
parent a335212ff8
commit 25823620e7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=108768
8 changed files with 167 additions and 280 deletions

View File

@ -6,21 +6,24 @@
#
PORTNAME= dansguardian
PORTVERSION= 2.7.6.7
PORTVERSION= 2.7.7.8
CATEGORIES= www
MASTER_SITES= # empty, see below
DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
MAINTAINER= fcash@bigfoot.com
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 \
${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}
${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}
USE_RC_SUBR= yes
RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
CONFLICTS= dansguardian-2.6*
LATEST_LINK= dansguardian-devel
WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --bindir=/sbin/ \
--sysconfdir=/etc/dansguardian/ \
@ -29,10 +32,13 @@ CONFIGURE_ARGS= --bindir=/sbin/ \
--logdir=/var/log/ \
--cgidir=/www/cgi-bin/ \
--piddir=/var/run/
MAN8= dansguardian.8
OPTIONS= DG_GCC3 "Compile using GCC 3.x on FreeBSD 4.x." off \
DG_PHRASELISTS "Install new phraselists." off
DG_URL= http://dansguardian.org/index.php?page=copyright2
MAN8= dansguardian.8
CONFDIR= ${PREFIX}/etc/dansguardian
NO_CDROM= "Commercial download is restricted. Check ${DG_URL} for more info"
NO_PACKAGE= "Redistribution is restricted. Check ${DG_URL} for more info"
@ -40,17 +46,44 @@ RESTRICTED= ${NO_PACKAGE}
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 500000 || defined(WITH_GCC3)
# On FreeBSD 4.x, user can choose which GCC version to use
.if ${OSVERSION} > 500000 || defined(WITH_DG_GCC3)
CONFIGURE_ARGS+= --gccver=3
.else
CONFIGURE_ARGS+= --gccver=2
.endif
# User needs to manually download the distfile
.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"
.endif
post-extract:
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/dansguardian.sh > ${WRKSRC}/dansguardian.sh
pre-install:
# Configure pkg-plist based on whether phraselists are to be installed or not
.if defined(WITH_DG_PHRASELISTS)
PLIST_SUB= PHRASELISTS=""
.else
PLIST_SUB= PHRASELISTS="@comment "
.endif
post-install:
# Check whether to install default phraselists
.if defined(WITH_DG_PHRASELISTS)
@${ECHO_MSG} "===> Installing default phraselists into ${CONFDIR}/phraselists"
@${CP} -R ${WRKSRC}/phraselists ${CONFDIR}
.else
@${ECHO_MSG} "===> Skipping installation of phraselists."
.endif
# Install startup script
@${ECHO_MSG} "===> Installing startup script into ${PREFIX}/etc/rc.d"
@${INSTALL_SCRIPT} ${WRKSRC}/dansguardian.sh ${PREFIX}/etc/rc.d/start-dg.sh
# Display post-install message
@${CAT} pkg-message
.include <bsd.port.post.mk>

View File

@ -1 +1,2 @@
MD5 (DansGuardian-2.7.6-7.source.tar.gz) = fc36f029745f78f6fa37d54fb143f7e7
MD5 (DansGuardian-2.7.7-8.source.tar.gz) = b7528fee2409a0d1b5789f5650c0b23c
SIZE (DansGuardian-2.7.7-8.source.tar.gz) = 187086

View File

@ -0,0 +1,30 @@
#!/bin/sh
# $FreeBSD$
# PROVIDE: dansguardian
# REQUIRE: DAEMON squid
# BEFORE: LOGIN
# KEYWORD: FreeBSD shutdown
# Define these dansguardian_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/dansguardian
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
dansguardian_enable="NO"
dansguardian_flags=""
dansguardian_pidfile="/var/run/dansguardian.pid"
. %%RC_SUBR%%
name="dansguardian"
rcvar=`set_rcvar`
command="%%PREFIX%%/sbin/dansguardian"
load_rc_config $name
pidfile="${dansguardian_pidfile}"
run_rc_command "$1"

View File

@ -1,65 +1,34 @@
--- autoconf/fbsd.in.orig Sat Jan 3 12:08:29 2004
+++ autoconf/fbsd.in Thu Jan 8 13:08:56 2004
@@ -21,7 +21,7 @@
--- autoconf/fbsd.in.orig Thu May 6 09:20:45 2004
+++ autoconf/fbsd.in Thu May 6 09:31:36 2004
@@ -21,13 +21,13 @@
logrotate.dansguardian dansguardianf1.conf
PASSVARS = -DPROXYUSER=\"${PROXYUSER}\"
-#PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\"
+#PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}dansguardian.log\"
+PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}dansguardian.log\"
PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
#PASSVARS += -DPIDDIR=\"${PIDDIR}\"
@@ -38,61 +38,140 @@
.cpp.o:
$(CPP) $(DEBUG) $(CFLAGS) -c $<
#Some advanced options:
-WARNING = -Wall
-OPTIMISE = -O2
+#WARNING = -Wall
+OPTIMISE = ${CXXFLAGS}
#DEBUG += -DDGDEBUG
#STATIC = -static
-all: $(OBJ)
+all: $(OBJ)
@@ -42,48 +42,37 @@
$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
install:
@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATION)
- @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$(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/chinesegb2312 || install -d $I$(CONFFILELOCATION)languages/chineseb2312
+ @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/mxspanish || install -d $I$(CONFFILELOCATION)languages/mxspanish
+ @test -d $I$(CONFFILELOCATION)languages/polish || install -d $I$(CONFFILELOCATION)languages/polish
+ @test -d $I$(CONFFILELOCATION)languages/portuguese || install -d $I$(CONFFILELOCATION)languages/portuguese
+ @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$(CONFFILELOCATION)phraselists || install -d $I$(CONFFILELOCATION)phraselists
- @test -d $I$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
@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)
@test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION)
- cp -f ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist
- cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf
- cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian
@ -94,6 +63,8 @@
- 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$(CONFFILELOCATION)languages || install -d $I$(CONFFILELOCATION)languages
+ cp -fR ./languages/* $I$(CONFFILELOCATION)languages/
+ install -o root -g wheel -m 644 ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist.dist
+ install -o root -g wheel -m 644 ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf.dist
+ install -o root -g wheel -m 755 ./dansguardian $I$(BINARYLOCATION)dansguardian
@ -101,62 +72,6 @@
+ 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 ./languages/ReadMe $I$(CONFFILELOCATION)languages/ReadMe
+ 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/chinesegb2312/messages $I$(CONFFILELOCATION)languages/chineseb2312/messages
+ install -o root -g wheel -m 644 ./languages/chinesegb2312/template.html $I$(CONFFILELOCATION)languages/chineseb2312/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/mxspanish/messages $I$(CONFFILELOCATION)languages/mxspanish/messages
+ install -o root -g wheel -m 644 ./languages/mxspanish/template.html $I$(CONFFILELOCATION)languages/mxspanish/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/portuguese/messages
+ install -o root -g wheel -m 644 ./languages/portuguese/template.html $I$(CONFFILELOCATION)languages/portuguese/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.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
@ -173,21 +88,9 @@
+ 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 ./transparent1x1.gif $I$(CONFFILELOCATION)transparent1x1.gif
+ 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.dist
+ install -o root -g wheel -m 644 ./dansguardian.8 $I$(MANUALFILES)man8/dansguardian.8
+ @test -f $I$(LOGLOCATION)dansguardian.log || install -o root -g wheel -m 644 /dev/null $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 -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:
rm -f $(OBJ) $(PROG)

View File

@ -1,107 +1,20 @@
--- configure.orig Thu Jan 8 11:48:38 2004
+++ configure Thu Jan 8 11:53:04 2004
--- configure.orig Wed Apr 28 09:36:01 2004
+++ configure Thu May 6 10:56:21 2004
@@ -2543,7 +2543,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 "LOGLOCATION = $logdir" >>Makefile
$extendedecho "LOGROTATELOCATION = \${PREFIX}$logrotatedir" >>Makefile
echo "PROXYUSER = $runas_usr" >>Makefile
echo "PROXYGROUP = $runas_grp" >>Makefile
@@ -2708,27 +2708,6 @@
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
;;
NetBSD*)
if [ -f dansguardian.bsdv ]; then
@@ -2875,7 +2854,7 @@
@@ -2896,7 +2896,7 @@
echo "# Log file location" >>dansguardian.conf
echo "# " >>dansguardian.conf
echo "# Defines the log directory and filename." >>dansguardian.conf
-echo "#loglocation = '/var/log/dansguardian/access.log'" >>dansguardian.conf
+echo "#loglocation = '/var/log/dansguardian.log'" >>dansguardian.conf
+echo "loglocation = '/var/log/dansguardian.log'" >>dansguardian.conf
echo "" >>dansguardian.conf
echo "" >>dansguardian.conf
echo "# Network Settings" >>dansguardian.conf
@@ -3362,9 +3341,9 @@
echo "#!/bin/sh" >logrotation
echo "# DansGuardian logrotation script for version 2.7.6" >>logrotation
echo "" >>logrotation
-echo "LOG_DIR=$prefixdir$logdir" >>logrotation
+echo "LOG_DIR=$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
@@ -3380,7 +3359,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*)
@@ -3437,7 +3416,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*)
@@ -3464,8 +3443,8 @@
rm -f logrotate.dansguardian
fi
-$extendedecho "$prefixdir$logdir\c" >>logrotate.dansguardian
-echo "access.log {" >>logrotate.dansguardian
+$extendedecho "$logdir\c" >>logrotate.dansguardian
+echo "dansguardian.log {" >>logrotate.dansguardian
echo " rotate 4" >>logrotate.dansguardian
echo " weekly" >>logrotate.dansguardian
echo " sharedscripts" >>logrotate.dansguardian
@@ -3481,7 +3460,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
@@ -3512,7 +3491,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

View File

@ -1,11 +1,11 @@
--- dansguardian.8-orig Mon Oct 21 10:39:49 2002
+++ dansguardian.8 Mon Oct 21 10:40:22 2002
--- dansguardian.8.orig Wed May 5 10:54:57 2004
+++ dansguardian.8 Wed May 5 10:55:18 2004
@@ -3,7 +3,7 @@
.SH NAME
DansGuardian 2
.SH SYNOPSIS
-/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
+/usr/local/etc/rc.d/start-dg [stop|start|restart]
+/usr/local/etc/rc.d/start-dg.sh [start|stop|restart|status]
.SH DESCRIPTION
A Introduction

View File

@ -4,4 +4,7 @@
This port has placed a log file in /var/log/ named dansguardian.log
This log file can get quite large. Please read the newsyslog(8) man
page for instructions on setting up log rotation and compression.
WARNING: This port uses RCng. Please read the comments in the startup
script for instructions on enabling the daemon.
*******************************************************************************

View File

@ -17,24 +17,24 @@
@exec mkdir -p etc/dansguardian/languages/portuguese
@exec mkdir -p etc/dansguardian/languages/turkish
@exec mkdir -p etc/dansguardian/languages/ukenglish
@exec mkdir -p etc/dansguardian/phraselists
@exec mkdir -p etc/dansguardian/phraselists/chat
@exec mkdir -p etc/dansguardian/phraselists/drugadvocacy
@exec mkdir -p etc/dansguardian/phraselists/dutchbadwords
@exec mkdir -p etc/dansguardian/phraselists/frenchbadwords
@exec mkdir -p etc/dansguardian/phraselists/gambling
@exec mkdir -p etc/dansguardian/phraselists/germanpornography
@exec mkdir -p etc/dansguardian/phraselists/goodphrases
@exec mkdir -p etc/dansguardian/phraselists/gore
@exec mkdir -p etc/dansguardian/phraselists/illegaldrugs
@exec mkdir -p etc/dansguardian/phraselists/intolerance
@exec mkdir -p etc/dansguardian/phraselists/italianbadwords
@exec mkdir -p etc/dansguardian/phraselists/legaldrugs
@exec mkdir -p etc/dansguardian/phraselists/personals
@exec mkdir -p etc/dansguardian/phraselists/pornography
@exec mkdir -p etc/dansguardian/phraselists/violence
@exec mkdir -p etc/dansguardian/phraselists/warezhacking
@exec mkdir -p etc/dansguardian/phraselists/weapons
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/chat
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/drugadvocacy
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/dutchbadwords
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/frenchbadwords
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/gambling
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/germanpornography
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/goodphrases
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/gore
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/illegaldrugs
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/intolerance
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/italianbadwords
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/legaldrugs
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/personals
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/pornography
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/violence
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/warezhacking
%%PHRASELISTS%%@exec mkdir -p etc/dansguardian/phraselists/weapons
etc/dansguardian/bannedextensionlist.dist
etc/dansguardian/bannediplist.dist
etc/dansguardian/bannedmimetypelist.dist
@ -64,12 +64,14 @@ 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/chineseb2312/messages
etc/dansguardian/languages/chineseb2312/template.html
etc/dansguardian/languages/chinesegb2312/messages
etc/dansguardian/languages/chinesegb2312/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/dutch/messages
etc/dansguardian/languages/dutch/template.html
etc/dansguardian/languages/french/messages
etc/dansguardian/languages/french/template.html
etc/dansguardian/languages/german/messages
@ -92,36 +94,37 @@ etc/dansguardian/languages/turkish/messages
etc/dansguardian/languages/turkish/template.html
etc/dansguardian/languages/ukenglish/messages
etc/dansguardian/languages/ukenglish/template.html
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
%%PHRASELISTS%%etc/dansguardian/phraselists/chat/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/drugadvocacy/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/dutchbadwords/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/frenchbadwords/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/gambling/banned
%%PHRASELISTS%%etc/dansguardian/phraselists/gambling/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/germanpornography/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/goodphrases/exception
%%PHRASELISTS%%etc/dansguardian/phraselists/goodphrases/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/gore/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/illegaldrugs/banned
%%PHRASELISTS%%etc/dansguardian/phraselists/illegaldrugs/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/intolerance/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/italianbadwords/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/legaldrugs/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/personals/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/pornography/banned
%%PHRASELISTS%%etc/dansguardian/phraselists/pornography/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/violence/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/warezhacking/weighted
%%PHRASELISTS%%etc/dansguardian/phraselists/weapons/weighted
etc/rc.d/start-dg.sh
sbin/dansguardian
www/cgi-bin/dansguardian.pl.dist
@dirrm etc/dansguardian/languages/arspanish
@dirrm etc/dansguardian/languages/bulgarian
@dirrm etc/dansguardian/languages/chinesebig5
@dirrm etc/dansguardian/languages/chineseb2312
@dirrm etc/dansguardian/languages/chinesegb2312
@dirrm etc/dansguardian/languages/czech
@dirrm etc/dansguardian/languages/danish
@dirrm etc/dansguardian/languages/dutch
@dirrm etc/dansguardian/languages/french
@dirrm etc/dansguardian/languages/german
@dirrm etc/dansguardian/languages/german2
@ -134,23 +137,24 @@ www/cgi-bin/dansguardian.pl.dist
@dirrm etc/dansguardian/languages/turkish
@dirrm etc/dansguardian/languages/ukenglish
@dirrm etc/dansguardian/languages
@dirrm etc/dansguardian/phraselists/chat
@dirrm etc/dansguardian/phraselists/drugadvocacy
@dirrm etc/dansguardian/phraselists/dutchbadwords
@dirrm etc/dansguardian/phraselists/frenchbadwords
@dirrm etc/dansguardian/phraselists/gambling
@dirrm etc/dansguardian/phraselists/germanpornography
@dirrm etc/dansguardian/phraselists/goodphrases
@dirrm etc/dansguardian/phraselists/gore
@dirrm etc/dansguardian/phraselists/illegaldrugs
@dirrm etc/dansguardian/phraselists/intolerance
@dirrm etc/dansguardian/phraselists/italianbadwords
@dirrm etc/dansguardian/phraselists/legaldrugs
@dirrm etc/dansguardian/phraselists/personals
@dirrm etc/dansguardian/phraselists/pornography
@dirrm etc/dansguardian/phraselists/violence
@dirrm etc/dansguardian/phraselists/warezhacking
@dirrm etc/dansguardian/phraselists/weapons
@dirrm etc/dansguardian/phraselists
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/chat
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/drugadvocacy
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/dutchbadwords
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/frenchbadwords
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/gambling
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/germanpornography
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/goodphrases
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/gore
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/illegaldrugs
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/intolerance
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/italianbadwords
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/legaldrugs
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/personals
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/pornography
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/violence
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/warezhacking
%%PHRASELISTS%%@dirrm etc/dansguardian/phraselists/weapons
%%PHRASELISTS%%@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, /var/log/dansguardian.log must be removed manually
@unexec echo If permanently deleting this package, custom configuration files must be removed manually