Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Nov 2003 12:00:26 -0800 (PST)
From:      Freddie Cash <fcash@sd73.bc.ca>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/57162: The latest stable release of DansGuardian is 2.6.1-5
Message-ID:  <200311242000.hAOK0Q9x064599@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/57162; it has been noted by GNATS.

From: Freddie Cash <fcash@sd73.bc.ca>
To: freebsd-gnats-submit@freebsd.org
Cc: petr.rehor@i.cz
Subject: Re: ports/57162: The latest stable release of DansGuardian is 2.6.1-5
Date: Mon, 24 Nov 2003 11:53:57 -0800

 --Boundary-00=_VHmw/Ij7lc1HI5s
 Content-Type: text/plain;
   charset="iso-8859-1"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 On November 24, 2003 11:33 am, Freddie Cash wrote:
 > There was an error in the previous patch.  Didn't include one of the
 > configuration files.  Attached is a new patch that takes www/
 > dansguardian from 2.6.1-3 to 2.6.1-6.
 
 D'oh!  Forgot to attach the patch.  Here it is, for real this time.  :)
 
 -- 
 Freddie Cash			District HelpDesk / Network Admin
 fcash@sd73.bc.ca		helpdesk@sd73.bc.ca
 				(250) 377-HELP [(250) 377-4357]
 
 --Boundary-00=_VHmw/Ij7lc1HI5s
 Content-Type: text/x-diff;
   charset="iso-8859-1";
   name="patch-dansguardian-2.6.1-6"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="patch-dansguardian-2.6.1-6"
 
 diff -ruN dansguardian.orig/Makefile dansguardian/Makefile
 --- dansguardian.orig/Makefile	Mon Nov 17 09:54:16 2003
 +++ dansguardian/Makefile	Mon Nov 24 11:01:24 2003
 @@ -6,16 +6,18 @@
  #
  
  PORTNAME=	dansguardian
 -PORTVERSION=	2.6.1.3
 +PORTVERSION=	2.6.1.6
  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 -ruN dansguardian.orig/distinfo dansguardian/distinfo
 --- dansguardian.orig/distinfo	Mon Nov 17 09:54:16 2003
 +++ dansguardian/distinfo	Mon Nov 24 11:01:24 2003
 @@ -1 +1 @@
 -MD5 (DansGuardian-2.6.1-3.source.tar.gz) = 21fa3b79fb66817c95003d320b62a4c1
 +MD5 (DansGuardian-2.6.1-6.source.tar.gz) = 9f550a23fd692f3df0850b93dfefaf14
 diff -ruN dansguardian.orig/files/patch-FatController.cpp dansguardian/files/patch-FatController.cpp
 --- dansguardian.orig/files/patch-FatController.cpp	Mon Nov 17 09:54:16 2003
 +++ dansguardian/files/patch-FatController.cpp	Wed Dec 31 16:00:00 1969
 @@ -1,11 +0,0 @@
 ---- FatController.cpp.orig	Mon Jul  7 14:59:33 2003
 -+++ FatController.cpp	Mon Jul  7 14:59:52 2003
 -@@ -513,7 +513,7 @@
 -     if (conn) {
 -         if (report) {
 -             if (!isDaemonised) {
 --                std::cerr << "Error creating connecting to test proxy" << std::endl;
 -+                std::cerr << "Error creating connection to test proxy" << std::endl;
 -             }
 -             syslog(LOG_ERR, "%s","Error creating connection to test proxy");
 -         }
 diff -ruN 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 24 11:14:40 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	Wed Nov 19 16:06:41 2003
 ++++ autoconf/fbsd.in	Mon Nov 24 11:14:17 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,83 @@
   	$(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,29 @@
  -	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/germanpornography
 ++	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
 @@ -83,6 +84,7 @@
  +	install -o root -g wheel -m 644 ./phraselists/frenchbadwords/weighted $I$(CONFFILELOCATION)phraselists/frenchbadwords/weighted
  +	install -o root -g wheel -m 644 ./phraselists/gambling/banned $I$(CONFFILELOCATION)phraselists/gambling/banned
  +	install -o root -g wheel -m 644 ./phraselists/gambling/weighted $I$(CONFFILELOCATION)phraselists/gambling/weighted
 ++	install -o root -g wheel -m 644 ./phraselists/germanpornography/weighted $I$(CONFFILELOCATION)phraselists/germanpornography/weighted
  +	install -o root -g wheel -m 644 ./phraselists/goodphrases/exception $I$(CONFFILELOCATION)phraselists/goodphrases/exception
  +	install -o root -g wheel -m 644 ./phraselists/goodphrases/weighted $I$(CONFFILELOCATION)phraselists/goodphrases/weighted
  +	install -o root -g wheel -m 644 ./phraselists/gore/weighted $I$(CONFFILELOCATION)phraselists/gore/weighted
 @@ -127,7 +129,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 -ruN dansguardian.orig/pkg-plist dansguardian/pkg-plist
 --- dansguardian.orig/pkg-plist	Mon Nov 17 09:54:16 2003
 +++ dansguardian/pkg-plist	Mon Nov 24 11:29:55 2003
 @@ -5,6 +5,7 @@
  @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
 @@ -28,9 +29,9 @@
  etc/dansguardian/dansguardian.conf
  etc/dansguardian/exceptioniplist
  etc/dansguardian/exceptionphraselist
 +etc/dansguardian/exceptionsitelist
  etc/dansguardian/exceptionurllist
  etc/dansguardian/exceptionuserlist
 -etc/dansguardian/exceptionsitelist
  etc/dansguardian/messages
  etc/dansguardian/phraselists/chat/weighted
  etc/dansguardian/phraselists/drugadvocacy/weighted
 @@ -38,6 +39,7 @@
  etc/dansguardian/phraselists/frenchbadwords/weighted
  etc/dansguardian/phraselists/gambling/banned
  etc/dansguardian/phraselists/gambling/weighted
 +etc/dansguardian/phraselists/germanpornography/weighted
  etc/dansguardian/phraselists/goodphrases/exception
  etc/dansguardian/phraselists/goodphrases/weighted
  etc/dansguardian/phraselists/gore/weighted
 @@ -64,6 +66,7 @@
  @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
 @@ -78,4 +81,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=_VHmw/Ij7lc1HI5s--
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311242000.hAOK0Q9x064599>