From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 17 11:10:16 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F287A16A4CE for ; Mon, 17 Nov 2003 11:10:15 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0599343FBF for ; Mon, 17 Nov 2003 11:10:15 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hAHJAEFY012791 for ; Mon, 17 Nov 2003 11:10:14 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hAHJAEYw012790; Mon, 17 Nov 2003 11:10:14 -0800 (PST) (envelope-from gnats) Date: Mon, 17 Nov 2003 11:10:14 -0800 (PST) Message-Id: <200311171910.hAHJAEYw012790@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Freddie Cash Subject: Re: ports/57162: The latest stable release of DansGuardian is 2.6.1-5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Freddie Cash List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2003 19:10:16 -0000 The following reply was made to PR ports/57162; it has been noted by GNATS. From: Freddie Cash To: freebsd-gnats-submit@FreeBSD.org, petr.rehor@i.cz Cc: Subject: Re: ports/57162: The latest stable release of DansGuardian is 2.6.1-5 Date: Mon, 17 Nov 2003 11:05:09 -0800 --Boundary-00=_lvRu/ZnxdzIDjQQ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Attached is a patch to bring the port up to the latest stable release of DansGuardian. -- Freddie Cash District HelpDesk / Network Admin fcash@sd73.bc.ca helpdesk@sd73.bc.ca (250) 377-HELP [(250) 377-4357] --Boundary-00=_lvRu/ZnxdzIDjQQ Content-Type: text/x-diff; charset="us-ascii"; name="patch-dansguardian-2.6.1-5" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-dansguardian-2.6.1-5" diff -ruH dansguardian.orig/Makefile dansguardian/Makefile --- dansguardian.orig/Makefile Mon Nov 17 09:54:16 2003 +++ dansguardian/Makefile Mon Nov 17 11:01:51 2003 @@ -6,16 +6,18 @@ # PORTNAME= dansguardian -PORTVERSION= 2.6.1.3 +PORTVERSION= 2.6.1.5 CATEGORIES= www MASTER_SITES= # empty, see below DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source MAINTAINER= fcash@sd73.bc.ca -COMMENT= A fast, featureful web content filter for Squid proxy servers +COMMENT= A fast, feature-rich web content filter for Squid proxy servers RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \ ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install + +CONFLICTS= dansguardian-devel WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} GNU_CONFIGURE= yes diff -ruH dansguardian.orig/distinfo dansguardian/distinfo --- dansguardian.orig/distinfo Mon Nov 17 09:54:16 2003 +++ dansguardian/distinfo Mon Nov 17 09:57:00 2003 @@ -1 +1 @@ -MD5 (DansGuardian-2.6.1-3.source.tar.gz) = 21fa3b79fb66817c95003d320b62a4c1 +MD5 (DansGuardian-2.6.1-5.source.tar.gz) = 0e08d5071548c2e41a3e44c7403d95a7 Only in dansguardian.orig/files: patch-FatController.cpp diff -ruH dansguardian.orig/files/patch-autoconf::fbsd.in dansguardian/files/patch-autoconf::fbsd.in --- dansguardian.orig/files/patch-autoconf::fbsd.in Mon Nov 17 09:54:16 2003 +++ dansguardian/files/patch-autoconf::fbsd.in Mon Nov 17 10:44:46 2003 @@ -1,5 +1,5 @@ ---- autoconf/fbsd.in.orig Mon Jul 7 02:47:25 2003 -+++ autoconf/fbsd.in Mon Jul 7 14:51:43 2003 +--- autoconf/fbsd.in.orig Mon Nov 17 10:01:30 2003 ++++ autoconf/fbsd.in Mon Nov 17 10:17:07 2003 @@ -20,7 +20,7 @@ logrotate.dansguardian @@ -9,38 +9,17 @@ PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\" PASSVARS += -DPIDDIR=\"${PIDDIR}\" -@@ -37,56 +37,86 @@ - .cpp.o: - $(CPP) $(DEBUG) $(CFLAGS) -c $< - --all: $(OBJ) -+all: $(OBJ) +@@ -41,52 +41,81 @@ $(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/goodphrases || install -d $I$(CONFFILELOCATION)phraselists/goodphrases -+ @test -d $I$(CONFFILELOCATION)phraselists/gore || install -d $I$(CONFFILELOCATION)phraselists/gore -+ @test -d $I$(CONFFILELOCATION)phraselists/illegaldrugs || install -d $I$(CONFFILELOCATION)phraselists/illegaldrugs -+ @test -d $I$(CONFFILELOCATION)phraselists/intolerance || install -d $I$(CONFFILELOCATION)phraselists/intolerance -+ @test -d $I$(CONFFILELOCATION)phraselists/italianbadwords || install -d $I$(CONFFILELOCATION)phraselists/italianbadwords -+ @test -d $I$(CONFFILELOCATION)phraselists/legaldrugs || install -d $I$(CONFFILELOCATION)phraselists/legaldrugs -+ @test -d $I$(CONFFILELOCATION)phraselists/personals || install -d $I$(CONFFILELOCATION)phraselists/personals -+ @test -d $I$(CONFFILELOCATION)phraselists/pornography || install -d $I$(CONFFILELOCATION)phraselists/pornography -+ @test -d $I$(CONFFILELOCATION)phraselists/violence || install -d $I$(CONFFILELOCATION)phraselists/violence -+ @test -d $I$(CONFFILELOCATION)phraselists/warezhacking || install -d $I$(CONFFILELOCATION)phraselists/warezhacking -+ @test -d $I$(CONFFILELOCATION)phraselists/weapons || install -d $I$(CONFFILELOCATION)phraselists/weapons - @test -d $I$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION) - @test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/ - @test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION) -- @test -d $I$(BINARYLOCATION) || /usr/sbin/install -d $I$(BINARYLOCATION) +- @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$(CGIBINLOCATION) || install -d $I$(CGIBINLOCATION) +- @test -d $I$(MANUALFILES)man8/ || install -d $I$(MANUALFILES)man8/ +- @test -d $I$(LOGLOCATION) || install -d $I$(LOGLOCATION) +- @test -d $I$(BINARYLOCATION) || install -d $I$(BINARYLOCATION) - cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian - cp -f ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf - cp -f ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist @@ -71,7 +50,28 @@ - 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$(BINARYLOCATION) || install -d $I$(BINARYLOCATION) ++ install -d $I$(CONFFILELOCATION) ++ install -d $I$(CONFFILELOCATION)phraselists ++ install -d $I$(CONFFILELOCATION)phraselists/chat ++ install -d $I$(CONFFILELOCATION)phraselists/drugadvocacy ++ install -d $I$(CONFFILELOCATION)phraselists/dutchbadwords ++ install -d $I$(CONFFILELOCATION)phraselists/frenchbadwords ++ install -d $I$(CONFFILELOCATION)phraselists/gambling ++ install -d $I$(CONFFILELOCATION)phraselists/goodphrases ++ install -d $I$(CONFFILELOCATION)phraselists/gore ++ install -d $I$(CONFFILELOCATION)phraselists/illegaldrugs ++ install -d $I$(CONFFILELOCATION)phraselists/intolerance ++ install -d $I$(CONFFILELOCATION)phraselists/italianbadwords ++ install -d $I$(CONFFILELOCATION)phraselists/legaldrugs ++ install -d $I$(CONFFILELOCATION)phraselists/personals ++ install -d $I$(CONFFILELOCATION)phraselists/pornography ++ install -d $I$(CONFFILELOCATION)phraselists/violence ++ install -d $I$(CONFFILELOCATION)phraselists/warezhacking ++ install -d $I$(CONFFILELOCATION)phraselists/weapons ++ install -d $I$(CGIBINLOCATION) ++ install -d $I$(MANUALFILES)man8/ ++ install -d $I$(LOGLOCATION) ++ install -d $I$(BINARYLOCATION) + install -o root -g wheel -m 755 ./dansguardian $I$(BINARYLOCATION)dansguardian + install -o root -g wheel -m 644 ./dansguardian.conf $I$(CONFFILELOCATION)dansguardian.conf + install -o root -g wheel -m 644 ./bannedphraselist $I$(CONFFILELOCATION)bannedphraselist @@ -127,7 +127,7 @@ rm -fr $(CONFFILELOCATION) - rm -fr $(LOGLOCATION) - if [ -f $(LOGROTATELOCATION)dansguardian ]; then rm -f $(LOGROTATELOCATION)dansguardian; fi -+ rm -f $(LOGLOCATION)/dansguardian.log ++ rm -fr $(LOGLOCATION)dansguardian.log clean: rm -f $(OBJ) $(PROG) diff -ruH dansguardian.orig/pkg-plist dansguardian/pkg-plist --- dansguardian.orig/pkg-plist Mon Nov 17 09:54:16 2003 +++ dansguardian/pkg-plist Mon Nov 17 11:02:14 2003 @@ -78,4 +78,3 @@ @dirrm etc/dansguardian/phraselists @dirrm etc/dansguardian @unexec echo If permanently deleting this package, /var/log/dansguardian.log must be removed manually - --Boundary-00=_lvRu/ZnxdzIDjQQ--