From owner-freebsd-ports Wed May 22 13:11: 4 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2F0FA37B412 for ; Wed, 22 May 2002 13:10:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4MKA2I15031; Wed, 22 May 2002 13:10:02 -0700 (PDT) (envelope-from gnats) Received: from lug.kamloops.net (lug2.kamloops.net [209.52.173.193]) by hub.freebsd.org (Postfix) with ESMTP id AA29537B400 for ; Wed, 22 May 2002 13:00:21 -0700 (PDT) Received: from fcash by lug.kamloops.net with local (Exim 3.16 #1) id 17AcfB-00069E-00 for freebsd-gnats-submit@freebsd.org; Wed, 22 May 2002 13:24:49 -0700 Message-Id: Date: Wed, 22 May 2002 13:24:49 -0700 From: fcash@lug.kamloops.net To: freebsd-gnats-submit@FreeBSD.org Subject: ports/38430: Port Update: www/dansguardian-deve/ to version 2.4.3-2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 38430 >Category: ports >Synopsis: update: www/dansguardian-devel/ to version 2.4.3-2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 22 13:10:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Freddie Cash >Release: FreeBSD 4.5-RELEASE-p4 i386 >Organization: PhoenixTek Consulting >Environment: System: FreeBSD phoenix.xtest.sd73.bc.ca 4.5-RELEASE-p4 FreeBSD 4.5-RELEASE-p4 #0: Fri May 10 14:51:04 PDT 2002 root@phoenix.sd73.bc.ca:/usr/obj/usr/src/sys/PHOENIX i386 >Description: Version 2.4.3-2 of the developmental/beta branch of DansGuardian (see www/dansguardian/) has been released. This updates the port to use that version of the source. >How-To-Repeat: >Fix: Attached is a recursive diff against www/dansguardian-devel/ A SHAR is also available if needed (just ask). --- patch-dansguardian-devel begins here --- diff -ruNH dansguardian-devel.orig/Makefile dansguardian-devel/Makefile --- dansguardian-devel.orig/Makefile Sun Apr 7 18:51:57 2002 +++ dansguardian-devel/Makefile Wed May 22 12:11:28 2002 @@ -6,17 +6,18 @@ # PORTNAME= dansguardian -PORTVERSION= 2.4.2.1 +PORTVERSION= 2.4.3.2 CATEGORIES= www MASTER_SITES= # empty, see below -DISTNAME= DansGuardian-2.4.2-1.source +DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.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.4.2 +WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} + GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --bindir=/sbin/ \ diff -ruNH dansguardian-devel.orig/distinfo dansguardian-devel/distinfo --- dansguardian-devel.orig/distinfo Sun Apr 7 18:51:57 2002 +++ dansguardian-devel/distinfo Wed May 22 10:11:52 2002 @@ -1 +1 @@ -MD5 (DansGuardian-2.4.2-1.source.tar.gz) = eaa18fb257362d4b505ee7deb6402f28 +MD5 (DansGuardian-2.4.3-2.source.tar.gz) = 736fdc249d56d175bfdb8b1e32a36a75 diff -ruNH dansguardian-devel.orig/files/patch-autoconf::fbsd.in dansguardian-devel/files/patch-autoconf::fbsd.in --- dansguardian-devel.orig/files/patch-autoconf::fbsd.in Sun Apr 7 18:51:57 2002 +++ dansguardian-devel/files/patch-autoconf::fbsd.in Wed May 22 10:25:34 2002 @@ -1,7 +1,7 @@ ---- autoconf/fbsd.in.orig Sat Apr 6 09:54:21 2002 -+++ autoconf/fbsd.in Sat Apr 6 09:58:55 2002 +--- autoconf/fbsd.in.orig Wed May 22 10:25:23 2002 ++++ autoconf/fbsd.in Wed May 22 10:25:28 2002 @@ -18,7 +18,7 @@ - dansguardian.conf config.cache Makefile logrotation + dansguardian.conf config.cache Makefile logrotation weightedphraselist PASSVARS = -DPROXYUSER=\"${PROXYUSER}\" -PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\" @@ -9,70 +9,81 @@ PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\" PASSVARS += -DPIDDIR=\"${PIDDIR}\" -@@ -43,41 +43,37 @@ - @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 -- cp -f ./exceptionphraselist $(CONFFILELOCATION)exceptionphraselist -- cp -f ./weightedphraselist $(CONFFILELOCATION)weightedphraselist -- cp -f ./bannediplist $(CONFFILELOCATION)bannediplist -- cp -f ./banneduserlist $(CONFFILELOCATION)banneduserlist -- cp -f ./bannedextensionlist $(CONFFILELOCATION)bannedextensionlist -- cp -f ./bannedmimetypelist $(CONFFILELOCATION)bannedmimetypelist -- cp -f ./bannedurllist $(CONFFILELOCATION)bannedurllist -- cp -f ./bannedregexpurllist $(CONFFILELOCATION)bannedregexpurllist -- cp -f ./bannedsitelist $(CONFFILELOCATION)bannedsitelist -- cp -f ./exceptionsitelist $(CONFFILELOCATION)exceptionsitelist -- cp -f ./exceptionurllist $(CONFFILELOCATION)exceptionurllist -- cp -f ./exceptionuserlist $(CONFFILELOCATION)exceptionuserlist -- cp -f ./exceptioniplist $(CONFFILELOCATION)exceptioniplist -- cp -f ./pics $(CONFFILELOCATION)pics -- cp -f ./template.html $(CONFFILELOCATION)template.html -- cp -f ./logrotation $(CONFFILELOCATION)logrotation -- cp -f ./dansguardian.bsdv $(SYSVLOCATION)dansguardian.sh -- cp -f ./dansguardian.pl $(CGIBINLOCATION)dansguardian.pl -- chmod o+x $(CGIBINLOCATION)dansguardian.pl -- cp -f ./dansguardian.8.gz $(MANUALFILES)man8/dansguardian.8.gz -- 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 ./exceptionphraselist $(CONFFILELOCATION)exceptionphraselist -+ @install -m 644 -o root -g wheel ./weightedphraselist $(CONFFILELOCATION)weightedphraselist -+ @install -m 644 -o root -g wheel ./bannediplist $(CONFFILELOCATION)bannediplist -+ @install -m 644 -o root -g wheel ./banneduserlist $(CONFFILELOCATION)banneduserlist -+ @install -m 644 -o root -g wheel ./bannedextensionlist $(CONFFILELOCATION)bannedextensionlist -+ @install -m 644 -o root -g wheel ./bannedmimetypelist $(CONFFILELOCATION)bannedmimetypelist -+ @install -m 644 -o root -g wheel ./bannedurllist $(CONFFILELOCATION)bannedurllist -+ @install -m 644 -o root -g wheel ./bannedregexpurllist $(CONFFILELOCATION)bannedregexpurllist -+ @install -m 644 -o root -g wheel ./bannedsitelist $(CONFFILELOCATION)bannedsitelist -+ @install -m 644 -o root -g wheel ./exceptionsitelist $(CONFFILELOCATION)exceptionsitelist -+ @install -m 644 -o root -g wheel ./exceptionurllist $(CONFFILELOCATION)exceptionurllist -+ @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 644 -o root -g wheel ./template.html $(CONFFILELOCATION)template.html -+ @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 -+ @touch $(LOGLOCATION)dansguardian.log -+ @chown $(PROXYUSER):$(PROXYGROUP) $(LOGLOCATION)dansguardian.log +@@ -43,39 +43,36 @@ + @test -d $I$(CONFFILELOCATION) || install -d $I$(CONFFILELOCATION) + @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) || /usr/sbin/install -d $I$(BINARYLOCATION) +- cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian +- cp -f ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf +- cp -f ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist +- cp -f ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist +- cp -f ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist +- cp -f ./weightedphraselist.goodwords $I$(CONFFILELOCATION)weightedphraselist.goodwords +- cp -f ./weightedphraselist.personals $I$(CONFFILELOCATION)weightedphraselist.personals +- cp -f ./weightedphraselist.pornsites $I$(CONFFILELOCATION)weightedphraselist.pornsites +- cp -f ./weightedphraselist.pornwords $I$(CONFFILELOCATION)weightedphraselist.pornwords +- cp -f ./weightedphraselist.warez $I$(CONFFILELOCATION)weightedphraselist.warez +- cp -f ./bannediplist $I$(CONFFILELOCATION)bannediplist +- cp -f ./banneduserlist $I$(CONFFILELOCATION)banneduserlist +- cp -f ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist +- cp -f ./bannedmimetypelist $I$(CONFFILELOCATION)bannedmimetypelist +- cp -f ./bannedurllist $I$(CONFFILELOCATION)bannedurllist +- cp -f ./bannedregexpurllist $I$(CONFFILELOCATION)bannedregexpurllist +- cp -f ./bannedsitelist $I$(CONFFILELOCATION)bannedsitelist +- cp -f ./exceptionsitelist $I$(CONFFILELOCATION)exceptionsitelist +- cp -f ./exceptionurllist $I$(CONFFILELOCATION)exceptionurllist +- cp -f ./exceptionuserlist $I$(CONFFILELOCATION)exceptionuserlist +- cp -f ./exceptioniplist $I$(CONFFILELOCATION)exceptioniplist +- cp -f ./pics $I$(CONFFILELOCATION)pics +- cp -f ./template.html $I$(CONFFILELOCATION)template.html +- cp -f ./logrotation $I$(CONFFILELOCATION)logrotation +- cp -f ./dansguardian.bsdv $I$(SYSVLOCATION)dansguardian.sh +- cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl ++ @test -d $I$(BINARYLOCATION) || 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 ++ install -o root -g wheel -m 644 ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist ++ install -o root -g wheel -m 644 ./exceptionphraselist $I$(CONFFILELOCATION)exceptionphraselist ++ install -o root -g wheel -m 644 ./weightedphraselist $I$(CONFFILELOCATION)weightedphraselist ++ install -o root -g wheel -m 644 ./weightedphraselist.goodwords $I$(CONFFILELOCATION)weightedphraselist.goodwords ++ install -o root -g wheel -m 644 ./weightedphraselist.personals $I$(CONFFILELOCATION)weightedphraselist.personals ++ install -o root -g wheel -m 644 ./weightedphraselist.pornsites $I$(CONFFILELOCATION)weightedphraselist.pornsites ++ install -o root -g wheel -m 644 ./weightedphraselist.pornwords $I$(CONFFILELOCATION)weightedphraselist.pornwords ++ install -o root -g wheel -m 644 ./weightedphraselist.warez $I$(CONFFILELOCATION)weightedphraselist.warez ++ install -o root -g wheel -m 644 ./bannediplist $I$(CONFFILELOCATION)bannediplist ++ install -o root -g wheel -m 644 ./banneduserlist $I$(CONFFILELOCATION)banneduserlist ++ install -o root -g wheel -m 644 ./bannedextensionlist $I$(CONFFILELOCATION)bannedextensionlist ++ install -o root -g wheel -m 644 ./bannedmimetypelist $I$(CONFFILELOCATION)bannedmimetypelist ++ install -o root -g wheel -m 644 ./bannedurllist $I$(CONFFILELOCATION)bannedurllist ++ install -o root -g wheel -m 644 ./bannedregexpurllist $I$(CONFFILELOCATION)bannedregexpurllist ++ install -o root -g wheel -m 644 ./bannedsitelist $I$(CONFFILELOCATION)bannedsitelist ++ install -o root -g wheel -m 644 ./exceptionsitelist $I$(CONFFILELOCATION)exceptionsitelist ++ install -o root -g wheel -m 644 ./exceptionurllist $I$(CONFFILELOCATION)exceptionurllist ++ install -o root -g wheel -m 644 ./exceptionuserlist $I$(CONFFILELOCATION)exceptionuserlist ++ install -o root -g wheel -m 644 ./exceptioniplist $I$(CONFFILELOCATION)exceptioniplist ++ install -o root -g wheel -m 644 ./pics $I$(CONFFILELOCATION)pics ++ install -o root -g wheel -m 644 ./template.html $I$(CONFFILELOCATION)template.html ++ install -o root -g wheel -m 755 ./dansguardian.bsdv $I$(SYSVLOCATION)dansguardian.sh ++ install -o root -g wheel -m 755 ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl + chmod o+x $I$(CGIBINLOCATION)dansguardian.pl +- cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz +- chown -R $(PROXYUSER).$(PROXYGROUP) $I$(LOGLOCATION) +- chmod -R u+wr $I$(LOGLOCATION) +- chmod u+wrx $I$(LOGLOCATION) ++ install -o root -g wheel -m 644 ./dansguardian.8 $I$(MANUALFILES)man8/dansguardian.8 ++ touch $I$(LOGLOCATION)/dansguardian.log ++ chown $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION)/dansguardian.log uninstall: rm -f $(BINARYLOCATION)dansguardian - rm -f $(SYSVLOCATION)dansguardian +@@ -83,7 +80,7 @@ rm -f $(CGIBINLOCATION)dansguardian.pl rm -f $(MANUALFILES)man8/dansguardian.8.gz -- rm -fr $(CONFFILELOCATION) -+ rm -f $(CONFFILELOCATION)dansguardian.log - rm -fr $(LOGLOCATION) + rm -fr $(CONFFILELOCATION) +- rm -fr $(LOGLOCATION) ++ rm -f $(LOGLOCATION)dansguardian.log clean: + rm -f $(OBJ) $(PROG) diff -ruNH dansguardian-devel.orig/pkg-plist dansguardian-devel/pkg-plist --- dansguardian-devel.orig/pkg-plist Sun Apr 7 18:51:57 2002 +++ dansguardian-devel/pkg-plist Wed May 22 12:14:09 2002 @@ -16,6 +16,11 @@ etc/dansguardian/pics etc/dansguardian/template.html etc/dansguardian/weightedphraselist +etc/dansguardian/weightedphraselist.goodwords +etc/dansguardian/weightedphraselist.personals +etc/dansguardian/weightedphraselist.pornsites +etc/dansguardian/weightedphraselist.pornwords +etc/dansguardian/weightedphraselist.warez etc/rc.d/dansguardian.sh sbin/dansguardian www/cgi-bin/dansguardian.pl --- patch-dansguardian-devel ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message