Skip to content

Commit

Permalink
Update dansguardian to 2.12.0.3
Browse files Browse the repository at this point in the history 
* Applied patch #9 (Crash when more than one authplugin are selected)
  by Frederic Bourgeois
* Added feature to allow Facebook mock ajax (request #6) by Jason Spiro
* Added contrib dir
* Added a new html & css validated html template in contrib (request #3).
  By Chris Peschke
* Converted iso-8859 message files to utf-8 (bug #86). Suggested
  by Fred Ulisses Maranhao
* Fixed Error reading Content-Length (bug #84). By Carlos Soto
* Fixed compilation error BSD due lack of string.h when using
  memcpy() (bug #75). By Alexander Hornung
* Fixed exceptioniplist case sensitivity (bug #11). By Mark J Hewitt
* Fixed accept-encoding support for new tokens (bug #13). By userquin
* Applied patch 3438750 (GCC 4.4 and 4.6 compatibility) by Mathieu PARENT
* Applied patch 3438749 (French translation update) by Mathieu PARENT
* Applied patch 3418297 (Set proxy timeout in dansguardian.conf)
  by Frederic Bourgeois
* Applied patch 3419088 (login/password in URL is dropped) by Mathieu PARENT
* Applied patch 3419089 ("Expect" header should be dropped) by Mathieu PARENT
* Applied patch 3438751 (Fix queue handling in OptionContainer)
  by Mathieu PARENT
* Applied patch 3515167 (Fix digest identication) by Frederic Bourgeois
* Fixed GCC warnings
* LFS review in String.cpp (requires different arch review yet)

Previous release notes seem to be lost - the build structure changed, and:

  Both the main configuration file and the filter group configuration
  file(s) have changed since the last stable release.  If you try
  to re-use the configuration from an existing copy of 2.8.0.6 or
  earlier, the daemon will not start.  On the other hand, list
  files (phrase lists, domain lists, etc.) have not changed format,
  and should largely "just work".  There have been improvements to
  the default list files, though, so again it is recommended that
  you start from the new version and re-do any customisations.
  • Loading branch information
prlw1 committed Mar 28, 2014
1 parent 4959493 commit a9e02b3
Show file tree
Hide file tree
Showing 30 changed files with 484 additions and 736 deletions.
211 changes: 42 additions & 169 deletions www/dansguardian/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,194 +1,67 @@
# $NetBSD: Makefile,v 1.16 2014/01/09 14:31:00 jperkin Exp $
# $NetBSD: Makefile,v 1.17 2014/03/28 14:13:25 prlw1 Exp $

DISTNAME= dansguardian-${VERSION}.source
PKGNAME= dansguardian-${VERSION}
VERSION= 2.8.0.6
PKGREVISION= 12
DISTNAME= dansguardian-2.12.0.3
CATEGORIES= www
MASTER_SITES= http://dansguardian.org/downloads/2/Stable/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dansguardian/}
EXTRACT_SUFX= .tar.bz2

MAINTAINER= [email protected]
HOMEPAGE= http://dansguardian.org/
COMMENT= Fast, featureful web content filter for Squid proxy servers
LICENSE= gnu-gpl-v2

WRKSRC= ${WRKDIR}/dansguardian-${VERSION}
HAS_CONFIGURE= yes
MANCOMPRESSED= yes
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= perl pkg-config
RCD_SCRIPTS+= dansguardian

BUILD_DEFS+= VARBASE

PKG_SYSCONFSUBDIR= dansguardian

EGDIR= ${PREFIX}/share/examples/dansguardian

SUBST_CLASSES+= egconfpath
SUBST_STAGE.egconfpath= pre-configure
SUBST_MESSAGE.egconfpath= Setting example configuration path
SUBST_FILES.egconfpath= autoconf/*.in
SUBST_SED.egconfpath= -e 's,\$$(CONFFILELOCATION),${EGDIR}/,g'
SUBST_SED.egconfpath+= -e '/SYSVLOCATION/d'
SUBST_SED.egconfpath+= -e '/chmod.*dansguardian.pl/s,o\+x,+x,'

SUBST_CLASSES+= perlpath
SUBST_STAGE.perlpath= pre-configure
SUBST_MESSAGE.perlpath= Fixing path to perl executable
SUBST_FILES.perlpath= *.pl
SUBST_SED.perlpath= -e 's,/usr/bin,${PREFIX}/bin,g'
# Fix bug in configure.ac: the paths are expanded too soon
SUBST_CLASSES+= pathfix
SUBST_STAGE.pathfix= pre-configure
SUBST_MESSAGE.pathfix= Fixing premature variable expansion
SUBST_FILES.pathfix= configs/Makefile.in
SUBST_FILES.pathfix+= configs/*/Makefile.in
SUBST_FILES.pathfix+= configs/*/*/Makefile.in
SUBST_SED.pathfix= -e 's,@DGCONFDIR@,\$$(sysconfdir),'

DANSGUARDIAN_USER?= dansgrdn
DANSGUARDIAN_GROUP?= dansgrdn

PKG_USERS_VARS+= DANSGUARDIAN_USER
PKG_GROUPS_VARS+= DANSGUARDIAN_GROUP
PKG_USERS_VARS+= DANSGUARDIAN_USER
PKG_GROUPS_VARS+= DANSGUARDIAN_GROUP

PKG_GROUPS= ${DANSGUARDIAN_GROUP}
PKG_USERS= ${DANSGUARDIAN_USER}:${DANSGUARDIAN_GROUP}
PKG_GROUPS= ${DANSGUARDIAN_GROUP}
PKG_USERS= ${DANSGUARDIAN_USER}:${DANSGUARDIAN_GROUP}
PKG_GECOS.${DANSGUARDIAN_USER}= Dansguardian webfilter pseudo-user

INSTALLATION_DIRS= sbin libexec/cgi-bin ${PKGMANDIR}/man8
INSTALLATION_DIRS+= share/examples/dansguardian/phraselists
INSTALLATION_DIRS+= share/examples/dansguardian/languages

CONFIGURE_ARGS= --prefix=${PREFIX:Q} \
--cgidir=/libexec/cgi-bin/ \
--sysconfdir=/etc/dansguardian/ \
--bindir=/sbin/ \
--mandir=/man/ \
--installprefix=${DESTDIR:Q} \
--runas_usr=${DANSGUARDIAN_USER} \
--runas_grp=${DANSGUARDIAN_GROUP} \
--logdir=${VARBASE}/log/dansguardian/

OWN_DIRS+= ${VARBASE}/log/dansguardian
PKG_SYSCONFSUBDIR= dansguardian
BUILD_DEFS+= VARBASE

OWN_DIRS_PERMS+= ${VARBASE}/log/dansguardian \
${DANSGUARDIAN_USER} ${DANSGUARDIAN_GROUP} 0755

.for f in logrotation pics transparent1x1.gif \
dansguardian.conf \
dansguardianf1.conf \
bannedextensionlist \
bannediplist \
bannedmimetypelist \
bannedphraselist \
bannedregexpurllist \
bannedsitelist \
bannedurllist \
banneduserlist \
contentregexplist \
exceptioniplist \
exceptionphraselist \
exceptionsitelist \
exceptionurllist \
exceptionuserlist \
filtergroupslist \
greysitelist \
greyurllist \
weightedphraselist \
phraselists/badwords/weighted_dutch \
phraselists/badwords/weighted_french \
phraselists/badwords/weighted_german \
phraselists/badwords/weighted_portuguese \
phraselists/badwords/weighted_spanish \
phraselists/chat/weighted \
phraselists/chat/weighted_italian \
phraselists/drugadvocacy/weighted \
phraselists/gambling/banned \
phraselists/gambling/banned_portuguese \
phraselists/gambling/weighted \
phraselists/gambling/weighted_portuguese \
phraselists/games/weighted \
phraselists/goodphrases/exception \
phraselists/goodphrases/exception_email \
phraselists/goodphrases/weighted_general \
phraselists/goodphrases/weighted_general_danish \
phraselists/goodphrases/weighted_general_portuguese \
phraselists/goodphrases/weighted_news \
phraselists/googlesearches/banned \
phraselists/gore/weighted \
phraselists/gore/weighted_portuguese \
phraselists/illegaldrugs/banned \
phraselists/illegaldrugs/banned_portuguese \
phraselists/illegaldrugs/weighted \
phraselists/illegaldrugs/weighted_portuguese \
phraselists/intolerance/banned_portuguese \
phraselists/intolerance/weighted \
phraselists/intolerance/weighted_portuguese \
phraselists/legaldrugs/weighted \
phraselists/malware/weighted \
phraselists/news/weighted \
phraselists/nudism/weighted \
phraselists/peer2peer/weighted \
phraselists/personals/weighted \
phraselists/personals/weighted_portuguese \
phraselists/pornography/banned \
phraselists/pornography/banned_portuguese \
phraselists/pornography/weighted \
phraselists/pornography/weighted_danish \
phraselists/pornography/weighted_dutch \
phraselists/pornography/weighted_french \
phraselists/pornography/weighted_german \
phraselists/pornography/weighted_italian \
phraselists/pornography/weighted_portuguese \
phraselists/pornography/weighted_spanish \
phraselists/proxies/weighted \
phraselists/sport/weighted \
phraselists/violence/weighted \
phraselists/violence/weighted_portuguese \
phraselists/warezhacking/weighted \
phraselists/weapons/weighted \
phraselists/weapons/weighted_portuguese \
phraselists/webmail/weighted \
languages/ReadMe
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
CONFIGURE_ARGS+= --with-proxyuser=${DANSGUARDIAN_USER}
CONFIGURE_ARGS+= --with-proxygroup=${DANSGUARDIAN_GROUP}
CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run
CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log/dansguardian

PHRASEDIRS= badwords chat drugadvocacy gambling games \
goodphrases googlesearches gore illegaldrugs \
intolerance legaldrugs malware news nudism \
peer2peer personals pornography proxies sport \
violence warezhacking weapons webmail

LANGUAGEDIRS= arspanish bulgarian chinesebig5 chinesegb2312 \
czech danish dutch french german hebrew \
indonesian italian lithuanian mxspanish polish \
portuguese russian-1251 slovak spanish \
swedish turkish ukenglish

.for d in ${PHRASEDIRS}
OWN_DIRS+= ${PKG_SYSCONFDIR}/phraselists/${d}
INSTALLATION_DIRS+= share/examples/dansguardian/phraselists/${d}
.endfor
CHECK_WRKREF_SKIP+= sbin/dansguardian

.for d in ${LANGUAGEDIRS}
OWN_DIRS+= ${PKG_SYSCONFDIR}/languages/${d}
CONF_FILES+= ${EGDIR}/languages/${d}/messages \
${PKG_SYSCONFDIR}/languages/${d}/messages
CONF_FILES+= ${EGDIR}/languages/${d}/template.html \
${PKG_SYSCONFDIR}/languages/${d}/template.html
INSTALLATION_DIRS+= share/examples/dansguardian/languages/${d}
.endfor
REPLACE_PERL= data/dansguardian.pl

show-conffiles:
cd ${WRKSRC}; \
for file in *.conf *list; \
do \
${PRINTF} "\\t$${file}\\t\\\\\\n"; \
done; \
for dir in phraselists/* languages/*; \
do \
if [ -d $${dir} ]; then \
for file in $${dir}/*; \
do \
${PRINTF} "\\t$${file}\\t\\\\\\n"; \
done; \
else \
${PRINTF} "\\t$${dir}\\t\\\\\\n"; \
fi; \
done
EGDIR= ${PREFIX}/share/examples/dansguardian
INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}

USE_LANGUAGES= c c++
EGDIRS!= cat ${.CURDIR}/files/configdirs
.for d in ${EGDIRS}
OWN_DIRS+= ${PKG_SYSCONFDIR}/${d}
INSTALLATION_DIRS+= ${EGDIR}/${d}
.endfor

EGFILES!= cat ${.CURDIR}/files/configfiles
.for f in ${EGFILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor

.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Loading

0 comments on commit a9e02b3

Please sign in to comment.