FreeBSD Bugzilla – Attachment 20829 Details for
Bug 36677
Updated port: DansGuardian 2.2.8 released
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 11.44 KB, created by
fcash
on 2002-04-03 01:30:02 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
fcash
Created:
2002-04-03 01:30:02 UTC
Size:
11.44 KB
patch
obsolete
>diff -ruNH ./Makefile ../dansguardian-2.2.8/Makefile >--- ./Makefile Sat Mar 30 20:28:18 2002 >+++ ../dansguardian-2.2.8/Makefile Tue Apr 2 14:15:47 2002 >@@ -1,36 +1,36 @@ > # New ports collection makefile for: dansguardian >-# Date created: March 26, 2002 >+# Date created: April 02, 2002 > # Whom: Freddie Cash <fcash@bigfoot.com> > # >-# $FreeBSD: ports/www/dansguardian/Makefile,v 1.2 2002/03/31 04:28:18 kris Exp $ >+# $FreeBSD$ > # > > PORTNAME= dansguardian >-PORTVERSION= 2.2.7.1 >+PORTVERSION= 2.2.8.0 > CATEGORIES= www > MASTER_SITES= # empty, see below >-DISTNAME= DansGuardian-2.2.7-1.source >+DISTNAME= DansGuardian-2.2.8-0.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.2.7 >+WRKSRC= ${WRKDIR}/DansGuardian-2.2.8 > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --prefix=${PREFIX} \ > --bindir=/sbin/ \ > --sysconfdir=/etc/dansguardian/ \ > --sysvdir=/etc/rc.d/ \ > --mandir=/man/ \ >- --logdir=/squid/logs/ \ >+ --logdir=/var/log/ \ > --cgidir=/www/cgi-bin/ \ > --piddir=/var/run/ > > DG_URL= http://dansguardian.org/index.php?page=copyright2 > > .if defined(WITHOUT_PICS) >-CONFIGURE_ARGS+= --without-pics-filter >+CONFIGURE_ARGS+= --without-pics-filter > .endif > > MAN8= dansguardian.8 >@@ -39,8 +39,13 @@ > NO_CDROM= "Commercial download is restricted. Check ${DG_URL} for more info" > NO_PACKAGE= "Redistribution is restricted. Check ${DG_URL} for more info" > >-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) >+.include <bsd.port.pre.mk> >+ >+.if !(exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})) > FORBIDDEN="Commercial source download is restricted. Please visit and read ${DG_URL} and download ${DISTNAME}${EXTRACT_SUFX} into ${DISTDIR} before running make" > .endif > >-.include <bsd.port.mk> >+post-install: >+ @${CAT} pkg-message >+ >+.include <bsd.port.post.mk> >diff -ruNH ./distinfo ../dansguardian-2.2.8/distinfo >--- ./distinfo Wed Mar 27 18:25:13 2002 >+++ ../dansguardian-2.2.8/distinfo Tue Apr 2 12:16:04 2002 >@@ -1 +1 @@ >-MD5 (DansGuardian-2.2.7-1.source.tar.gz) = f2157a54a2a07d78323e2cc64072ff6e >+MD5 (DansGuardian-2.2.8-0.source.tar.gz) = 36eab61ddb5639d1aaed677a6da764e6 >diff -ruNH ./files/patch-ConnectionHandler.cpp ../dansguardian-2.2.8/files/patch-ConnectionHandler.cpp >--- ./files/patch-ConnectionHandler.cpp Wed Mar 27 18:25:13 2002 >+++ ../dansguardian-2.2.8/files/patch-ConnectionHandler.cpp Wed Dec 31 16:00:00 1969 >@@ -1,12 +0,0 @@ >---- ConnectionHandler.cpp.orig Tue Mar 26 08:22:34 2002 >-+++ ConnectionHandler.cpp Tue Mar 26 08:25:12 2002 >-@@ -293,7 +293,9 @@ >- >- checkme.checkphrase(docbodyblock, dblen, options); >- >-+#ifndef WITHOUT_PICS_FILTER >- checkme.checkPICS(docbodyblock, dblen, options); >-+#endif >- } catch (exception& e) {} >- delete[] docbodyblock; >- } >diff -ruNH ./files/patch-autoconf::fbsd.in ../dansguardian-2.2.8/files/patch-autoconf::fbsd.in >--- ./files/patch-autoconf::fbsd.in Wed Mar 27 18:25:13 2002 >+++ ../dansguardian-2.2.8/files/patch-autoconf::fbsd.in Tue Apr 2 12:16:02 2002 >@@ -1,5 +1,5 @@ >---- autoconf/fbsd.in.orig Thu Mar 14 16:54:40 2002 >-+++ autoconf/fbsd.in Tue Mar 26 09:29:25 2002 >+--- autoconf/fbsd.in.orig Tue Apr 2 11:51:15 2002 >++++ autoconf/fbsd.in Tue Apr 2 11:54:12 2002 > @@ -17,7 +17,7 @@ > dansguardian.conf config.cache Makefile logrotation > >@@ -9,19 +9,21 @@ > PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\" > PASSVARS += -DPIDDIR=\"${PIDDIR}\" > >-@@ -29,7 +29,7 @@ >- >- >- CFLAGS = $(OPTIMISE) $(WARNING) >--DGCFLAGS = $(OPTIMISE) $(PASSVARS) -lz $(STATIC) >-+DGCFLAGS = $(OPTIMISE) $(PASSVARS) $(PICS_FLAG) -lz $(STATIC) >- >+@@ -34,36 +34,31 @@ > .cpp.o: > $(CPP) $(DEBUG) $(CFLAGS) -c $< >-@@ -44,26 +44,24 @@ >- @test -d $(MANUALFILES)man8/ || install -d $(MANUALFILES)man8/ >- @test -d $(LOGLOCATION) || install -d $(LOGLOCATION) >- @test -d $(BINARYLOCATION) || /usr/sbin/install -d $(BINARYLOCATION) >+ >+-all: $(OBJ) >++all: $(OBJ) >+ $(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp >+ >+ install: >+ @test -d $(SYSVLOCATION) || install -d $(SYSVLOCATION) >+ @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 >@@ -42,6 +44,7 @@ > - 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 >@@ -54,7 +57,6 @@ > + @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 755 -o root -g wheel ./logrotation $(CONFFILELOCATION)logrotation > + @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 >@@ -63,7 +65,7 @@ > > uninstall: > rm -f $(BINARYLOCATION)dansguardian >-@@ -71,7 +69,7 @@ >+@@ -71,7 +66,7 @@ > rm -f $(CGIBINLOCATION)dansguardian.pl > rm -f $(MANUALFILES)man8/dansguardian.8.gz > rm -fr $(CONFFILELOCATION) >diff -ruNH ./files/patch-configure ../dansguardian-2.2.8/files/patch-configure >--- ./files/patch-configure Wed Mar 27 18:25:13 2002 >+++ ../dansguardian-2.2.8/files/patch-configure Tue Apr 2 12:16:02 2002 >@@ -1,85 +1,11 @@ >---- configure.orig Thu Mar 14 16:54:40 2002 >-+++ configure Tue Mar 26 08:58:45 2002 >-@@ -43,6 +43,7 @@ >- mandir='/usr/man/' >- logdir='/var/log/dansguardian/' >- piddir='/var/run/' >-+with_pics_filter="yes" >- >- >- case `uname -s` in >-@@ -112,7 +113,10 @@ >- --runas_usr=USER run as user DEFAULT [$runas_usr] >- --runas_grp=GROUP run as group DEFAULT [$runas_grp] >- --piddir=DIR pid file in DIR [$piddir] (ignores prefix) >- --prefix=DIR prefix root path DEFAULT [$prefixdir] (no trailing /) >-+Features and packages: >-+ --without-pics-filter Disables PICS/ICRA filtering >-+ >- Do not forget the heading *and* trailing / except for prefix which only needs >- a heading / >- EOF >-@@ -2668,6 +2672,13 @@ >+--- configure.orig Tue Apr 2 09:15:26 2002 >++++ configure Tue Apr 2 09:29:41 2002 >+@@ -2667,7 +2667,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 >+ echo "PROXYUSER = $runas_usr" >>Makefile > echo "PROXYGROUP = $runas_grp" >>Makefile > echo "PIDDIR = $piddir" >>Makefile >- >-+case "${with_pics_filter}" in >-+ no) >-+ $extendedecho " Turning off PICS/ICRA filtering." >-+ $extendedecho "\n\${PICS_FLAG} = -DWITHOUT_PICS_FILTER" >> Makefile >-+ ;; >-+esac >-+ >- case `uname -s` in >- SunOS*) >- echo "#undef __BSD" >autoconf/platform.h >-@@ -2740,31 +2751,24 @@ >- chmod u+x dansguardian.bsdv >- ;; >- FreeBSD*) >-- if [ -f dansguardian.bsdv ]; then >-- 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 >-+ cat autoconf/bsdv.in > dansguardian.bsdv >-+ $extendedecho "\t[ -x /usr/local/sbin/dansguardian ] && /usr/local/sbin/dansguardian > /dev/null && echo -n \" dansguardian\"" >> dansguardian.bsdv >-+ $extendedecho "\t;;" >> dansguardian.bsdv >-+ $extendedecho "stop)" >> dansguardian.bsdv >-+ $extendedecho "\t/usr/local/sbin/dansguardian -q" >> dansguardian.bsdv >-+ $extendedecho "\t[ -r /tmp/.dguardianipc ] && echo -n \" dansguardian\"" >> dansguardian.bsdv >-+ $extendedecho "\trm -f /tmp/.dguardianipc" >> dansguardian.bsdv >-+ $extendedecho "\t;;" >> dansguardian.bsdv >-+ $extendedecho "restart)" >> dansguardian.bsdv >-+ $extendedecho "\t\$0 stop" >> dansguardian.bsdv >-+ $extendedecho "\t\$0 start" >> dansguardian.bsdv >-+ $extendedecho "\t;;" >> dansguardian.bsdv >-+ $extendedecho "*)" >> dansguardian.bsdv >-+ $extendedecho "\techo \"Usage: \$0 {start|stop|restart}\" >&2" >> dansguardian.bsdv >-+ $extendedecho "\t;;" >> dansguardian.bsdv >-+ $extendedecho "esac" >> dansguardian.bsdv >-+ $extendedecho "exit 0" >> dansguardian.bsdv >-+ >- ;; >- Linux*) >- if [ -f dansguardian.sysv ]; then >diff -ruNH ./pkg-message ../dansguardian-2.2.8/pkg-message >--- ./pkg-message Tue Apr 2 14:19:20 2002 >+++ ../dansguardian-2.2.8/pkg-message Tue Apr 2 12:16:03 2002 >@@ -0,0 +1,8 @@ >+===> Please Note: >+ >+******************************************************************************* >+ 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. >+******************************************************************************* >+ >diff -ruNH ./pkg-plist ../dansguardian-2.2.8/pkg-plist >--- ./pkg-plist Wed Mar 27 18:25:13 2002 >+++ ../dansguardian-2.2.8/pkg-plist Tue Apr 2 13:30:25 2002 >@@ -10,8 +10,9 @@ > etc/dansguardian/exceptionuserlist > etc/dansguardian/exceptioniplist > etc/dansguardian/pics >-etc/dansguardian/logrotation >+etc/rc.d/dansguardian.sh > sbin/dansguardian >-squid/logs/dansguardian.log > www/cgi-bin/dansguardian.pl > @dirrm etc/dansguardian >+@cwd / >+var/log/dansguardian.log
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 36677
: 20829