Attachment 42551 Details for Bug 66333 – dansguardian.diff

[patch] dansguardian.diff

dansguardian.diff (text/plain), 27.94 KB, created by Freddie Cash on 2004-05-06 17:00:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Freddie Cash

Created: 2004-05-06 17:00:39 UTC

Size: 27.94 KB

patch

obsolete

>diff -ruN dansguardian.orig/Makefile dansguardian/Makefile
>--- dansguardian.orig/Makefile	Wed May  5 09:10:46 2004
>+++ dansguardian/Makefile	Wed May  5 16:06:16 2004
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME=	dansguardian
>-PORTVERSION=	2.6.1.11
>-PORTREVISION=	2
>+PORTVERSION=	2.6.1.13
>+PORTREVISION=	0
> CATEGORIES=	www
> MASTER_SITES=	# empty, see below
> DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
>@@ -16,9 +16,12 @@
> 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
> 
>-CONFLICTS=	dansguardian-2.7*
>+USE_RC_SUBR=	yes
>+RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
>+
>+CONFLICTS=	dansguardian*
> LATEST_LINK=	dansguardian
> 
> WRKSRC=		${WRKDIR}/DansGuardian-${PORTVERSION:R}
>@@ -30,12 +33,13 @@
> 		--logdir=/var/log/ \
> 		--cgidir=/www/cgi-bin/ \
> 		--piddir=/var/run/
>+MAN8=		dansguardian.8
> 
>-OPTIONS=	WITH_GCC3 "Compile using GCC 3.x." off
>+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"
>@@ -43,17 +47,45 @@
> 
> .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)
>+USE_GCC=	3
> CONFIGURE_ARGS+=	--gccver=3
> .else
> CONFIGURE_ARGS+=	--gccver=2
> .endif
> 
>+# User needs to manually download the distfile
> .if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}))
> 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>
>diff -ruN dansguardian.orig/distinfo dansguardian/distinfo
>--- dansguardian.orig/distinfo	Wed May  5 09:10:46 2004
>+++ dansguardian/distinfo	Wed May  5 09:20:29 2004
>@@ -1,2 +1,2 @@
>-MD5 (DansGuardian-2.6.1-11.source.tar.gz) = 74f30ec2f7915f1ea72ff03332359889
>-SIZE (DansGuardian-2.6.1-11.source.tar.gz) = 155249
>+MD5 (DansGuardian-2.6.1-13.source.tar.gz) = d45bdfd96020b9a9cc24a856d9362f75
>+SIZE (DansGuardian-2.6.1-13.source.tar.gz) = 156619
>diff -ruN dansguardian.orig/files/dansguardian.sh dansguardian/files/dansguardian.sh
>--- dansguardian.orig/files/dansguardian.sh	Wed Dec 31 16:00:00 1969
>+++ dansguardian/files/dansguardian.sh	Wed May  5 11:13:06 2004
>@@ -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"
>diff -ruN dansguardian.orig/files/patch-autoconf::bsdv.in dansguardian/files/patch-autoconf::bsdv.in
>--- dansguardian.orig/files/patch-autoconf::bsdv.in	Wed May  5 09:10:46 2004
>+++ dansguardian/files/patch-autoconf::bsdv.in	Wed Dec 31 16:00:00 1969
>@@ -1,42 +0,0 @@
>---- autoconf/bsdv.in.orig	Wed Jan  7 11:28:16 2004
>-+++ autoconf/bsdv.in	Wed Jan  7 11:28:24 2004
>-@@ -1,16 +1,32 @@
>- #!/bin/sh
>- #
>--# BSD startup script for dansguardian
>--# partly based on httpd startup script
>-+# BSD startup script for dansguardian.
>- #
>--# description: A web content filtering plugin for web \
>--#              proxies, developed to filter using lists of \
>--#              banned phrases, MIME types, filename \
>-+# description: A web content filtering plugin for web
>-+#              proxies, developed to filter using lists of
>-+#              banned phrases, MIME types, filename
>- #              extensions and PICS labling.
>- # processname: dansguardian
>- 
>--
>- # See how we were called.
>--
>- case "$1" in
>- start)
>-+	[ -x /usr/local/sbin/dansguardian ] && /usr/local/sbin/dansguardian
>-+	echo -n " dansguardian"
>-+	;;
>-+stop)
>-+	/usr/local/sbin/dansguardian -q
>-+	rm -f /tmp/.dguardianipc
>-+	echo -n " dansguardian"
>-+	;;
>-+restart)
>-+	/usr/local/sbin/dansguardian -r
>-+	;;
>-+graceful)
>-+	/usr/local/sbin/dansguardian -g
>-+	;;
>-+*)
>-+	echo "Usage: $0 {start|stop|restart|graceful}"
>-+	;;
>-+esac
>-+exit 0
>diff -ruN dansguardian.orig/files/patch-autoconf::fbsd.in dansguardian/files/patch-autoconf::fbsd.in
>--- dansguardian.orig/files/patch-autoconf::fbsd.in	Wed May  5 09:10:46 2004
>+++ dansguardian/files/patch-autoconf::fbsd.in	Wed May  5 16:21:12 2004
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- autoconf/fbsd.in.orig	Wed Apr 14 08:06:42 2004
>++++ autoconf/fbsd.in	Wed May  5 15:12:36 2004
>+@@ -20,13 +20,13 @@
>  		 logrotate.dansguardian
>  
>  PASSVARS = -DPROXYUSER=\"${PROXYUSER}\"
>@@ -9,29 +9,23 @@
>  PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
>  PASSVARS += -DPIDDIR=\"${PIDDIR}\"
>  
>-@@ -44,49 +44,79 @@
>- 	@test -d $I$(SYSVLOCATION) || install -d $I$(SYSVLOCATION)
>+ #Some advanced options:
>+-WARNING = -Wall
>+-OPTIMISE = -O2
>++#WARNING = -Wall
>++OPTIMISE = ${CXXFLAGS}
>+ #DEBUG += -DDGDEBUG
>+ #STATIC = -static
>+ 
>+@@ -41,43 +41,32 @@
>+ 	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
>+ 
>+ install:
>+-	@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)phraselists || install -d $I$(CONFFILELOCATION)phraselists
>  	@test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION)
>- 	@test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/
>+-	@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
>@@ -69,27 +63,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 ./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
>@@ -105,21 +78,9 @@
> +	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 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
>++	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)
>diff -ruN dansguardian.orig/files/patch-configure dansguardian/files/patch-configure
>--- dansguardian.orig/files/patch-configure	Wed May  5 09:10:46 2004
>+++ dansguardian/files/patch-configure	Wed May  5 14:57:00 2004
>@@ -1,5 +1,5 @@
>---- configure.orig	Wed Jan  7 11:29:38 2004
>-+++ configure	Wed Jan  7 11:54:02 2004
>+--- configure.orig	Wed May  5 14:46:40 2004
>++++ configure	Wed May  5 14:47:23 2004
> @@ -2540,7 +2540,7 @@
>  $extendedecho "SYSVLOCATION = \${PREFIX}$sysvdir" >>Makefile
>  $extendedecho "CGIBINLOCATION = \${PREFIX}$cgidir" >>Makefile
>@@ -9,130 +9,3 @@
>  $extendedecho "LOGROTATELOCATION = \${PREFIX}$logrotatedir" >>Makefile
>  echo "PROXYUSER = $runas_usr" >>Makefile
>  echo "PROXYGROUP = $runas_grp" >>Makefile
>-@@ -2665,27 +2665,6 @@
>-                         rm -f dansguardian.bsdv
>-                 fi
>-                 cat autoconf/bsdv.in > dansguardian.bsdv
>--                $extendedecho "        [ -x $prefixdir$bindir\c" >> dansguardian.bsdv
>--                $extendedecho "dansguardian ] && $prefixdir$bindir\c" >> 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
>-@@ -3082,7 +3061,7 @@
>- echo "" >>logrotation
>- echo "LOG_DIR=$prefixdir$logdir" >>logrotation
>- echo "NUM_LOGS=4" >>logrotation
>--echo "LOG=\$LOG_DIR/access.log" >>logrotation
>-+echo "LOG=\$LOG_DIR/dansguardian.log" >>logrotation
>- echo "" >>logrotation
>- 
>- case `uname -s` in
>-@@ -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
>- 
>- $extendedecho "$prefixdir$logdir\c" >>logrotate.dansguardian
>--echo "access.log {" >>logrotate.dansguardian
>-+echo "dansguardian.log {" >>logrotate.dansguardian
>- echo "  rotate 4" >>logrotate.dansguardian
>- echo "  weekly" >>logrotate.dansguardian
>- echo "  sharedscripts" >>logrotate.dansguardian
>-@@ -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
>- 
>diff -ruN dansguardian.orig/files/patch-dansguardian.8 dansguardian/files/patch-dansguardian.8
>--- dansguardian.orig/files/patch-dansguardian.8	Wed May  5 09:10:46 2004
>+++ dansguardian/files/patch-dansguardian.8	Wed May  5 10:55:39 2004
>@@ -1,11 +1,11 @@
>---- dansguardian.8.orig	Mon Jul  7 11:37:24 2003
>-+++ dansguardian.8	Mon Jul  7 11:38:15 2003
>+--- 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.sh [stop|start|restart]
>++/usr/local/etc/rc.d/start-dg.sh [start|stop|restart|status]
>  .SH DESCRIPTION
>  A Introduction
>  
>diff -ruN dansguardian.orig/pkg-message dansguardian/pkg-message
>--- dansguardian.orig/pkg-message	Wed May  5 09:10:46 2004
>+++ dansguardian/pkg-message	Wed May  5 15:57:25 2004
>@@ -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.
> *******************************************************************************
>diff -ruN dansguardian.orig/pkg-plist dansguardian/pkg-plist
>--- dansguardian.orig/pkg-plist	Wed May  5 09:10:46 2004
>+++ dansguardian/pkg-plist	Wed May  5 15:44:00 2004
>@@ -1,22 +1,22 @@
> @exec mkdir -p etc/dansguardian
>-@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
>@@ -33,51 +33,51 @@
> etc/dansguardian/exceptionurllist.dist
> etc/dansguardian/exceptionuserlist.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
>+%%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/dansguardian/pics.dist
> etc/dansguardian/template.html.dist
> etc/dansguardian/weightedphraselist.dist
>-etc/rc.d/start-dg.sh.dist
>+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/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, custom configuration files must be removed manually

Actions: View | Diff

Attachments on bug 66333: 42551