pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/dansguardian Update dansguardian to 2.12.0.3
details: https://anonhg.NetBSD.org/pkgsrc/rev/51cb509c91a0
branches: trunk
changeset: 632423:51cb509c91a0
user: prlw1 <prlw1%pkgsrc.org@localhost>
date: Fri Mar 28 14:13:25 2014 +0000
description:
Update dansguardian to 2.12.0.3
* 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.
diffstat:
www/dansguardian/Makefile | 211 ++---------
www/dansguardian/PLIST | 336 +++++++++++------
www/dansguardian/distinfo | 32 +-
www/dansguardian/files/configdirs | 43 ++
www/dansguardian/files/configfiles | 118 ++++++
www/dansguardian/files/dansguardian.sh | 6 +-
www/dansguardian/patches/patch-DataBuffer.cpp | 12 -
www/dansguardian/patches/patch-DynamicURLList.cpp | 12 -
www/dansguardian/patches/patch-FDTunnel.cpp | 15 -
www/dansguardian/patches/patch-FOptionContainer.cpp | 12 -
www/dansguardian/patches/patch-FatController.cpp | 13 -
www/dansguardian/patches/patch-ListContainer.cpp | 12 -
www/dansguardian/patches/patch-RegExp.cpp | 12 -
www/dansguardian/patches/patch-Socket.cpp | 12 -
www/dansguardian/patches/patch-String.cpp | 33 -
www/dansguardian/patches/patch-String.hpp | 13 -
www/dansguardian/patches/patch-SysV.cpp | 12 -
www/dansguardian/patches/patch-UDSocket.cpp | 12 -
www/dansguardian/patches/patch-aa | 67 ---
www/dansguardian/patches/patch-configure | 15 +
www/dansguardian/patches/patch-dansguardian.cpp | 12 -
www/dansguardian/patches/patch-fbsd.in | 30 -
www/dansguardian/patches/patch-linux.in | 30 -
www/dansguardian/patches/patch-md5.cpp | 17 -
www/dansguardian/patches/patch-nbsd.in | 30 -
www/dansguardian/patches/patch-obsd.in | 30 -
www/dansguardian/patches/patch-solaris.in | 31 -
www/dansguardian/patches/patch-src_ImageContainer.cpp | 14 +
www/dansguardian/patches/patch-src_SocketArray.cpp | 14 +
www/dansguardian/patches/patch-src_UDSocket.cpp | 14 +
30 files changed, 484 insertions(+), 736 deletions(-)
diffs (truncated from 1382 to 300 lines):
diff -r ea18696ebb96 -r 51cb509c91a0 www/dansguardian/Makefile
--- a/www/dansguardian/Makefile Fri Mar 28 11:58:48 2014 +0000
+++ b/www/dansguardian/Makefile Fri Mar 28 14:13:25 2014 +0000
@@ -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= sborrill%NetBSD.org@localhost
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
+PKG_SYSCONFSUBDIR= dansguardian
+BUILD_DEFS+= VARBASE
-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
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}
+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
+
+CHECK_WRKREF_SKIP+= sbin/dansguardian
+
+REPLACE_PERL= data/dansguardian.pl
+
+EGDIR= ${PREFIX}/share/examples/dansguardian
+INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
+
+EGDIRS!= cat ${.CURDIR}/files/configdirs
+.for d in ${EGDIRS}
+OWN_DIRS+= ${PKG_SYSCONFDIR}/${d}
+INSTALLATION_DIRS+= ${EGDIR}/${d}
.endfor
-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}
+EGFILES!= cat ${.CURDIR}/files/configfiles
+.for f in ${EGFILES}
+CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.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
-
-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
-
-USE_LANGUAGES= c c++
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ea18696ebb96 -r 51cb509c91a0 www/dansguardian/PLIST
--- a/www/dansguardian/PLIST Fri Mar 28 11:58:48 2014 +0000
+++ b/www/dansguardian/PLIST Fri Mar 28 14:13:25 2014 +0000
@@ -1,127 +1,217 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:17 jperkin Exp $
-libexec/cgi-bin/dansguardian.pl
+@comment $NetBSD: PLIST,v 1.4 2014/03/28 14:13:25 prlw1 Exp $
man/man8/dansguardian.8
sbin/dansguardian
-share/examples/dansguardian/bannedextensionlist
-share/examples/dansguardian/bannediplist
-share/examples/dansguardian/bannedmimetypelist
-share/examples/dansguardian/bannedphraselist
-share/examples/dansguardian/bannedregexpurllist
-share/examples/dansguardian/bannedsitelist
-share/examples/dansguardian/bannedurllist
-share/examples/dansguardian/banneduserlist
-share/examples/dansguardian/contentregexplist
+share/dansguardian/blockedflash.swf
+share/dansguardian/dansguardian.pl
+share/dansguardian/languages/arspanish/fancydmtemplate.html
+share/dansguardian/languages/arspanish/messages
+share/dansguardian/languages/arspanish/template.html
+share/dansguardian/languages/bulgarian/fancydmtemplate.html
+share/dansguardian/languages/bulgarian/messages
+share/dansguardian/languages/bulgarian/template.html
+share/dansguardian/languages/chinesebig5/fancydmtemplate.html
+share/dansguardian/languages/chinesebig5/messages
+share/dansguardian/languages/chinesebig5/template.html
+share/dansguardian/languages/chinesegb2312/fancydmtemplate.html
+share/dansguardian/languages/chinesegb2312/messages
+share/dansguardian/languages/chinesegb2312/template.html
+share/dansguardian/languages/czech/fancydmtemplate.html
+share/dansguardian/languages/czech/messages
+share/dansguardian/languages/czech/template.html
+share/dansguardian/languages/danish/fancydmtemplate.html
+share/dansguardian/languages/danish/messages
+share/dansguardian/languages/danish/template.html
+share/dansguardian/languages/dutch/fancydmtemplate.html
+share/dansguardian/languages/dutch/messages
+share/dansguardian/languages/dutch/template.html
+share/dansguardian/languages/french/fancydmtemplate.html
+share/dansguardian/languages/french/messages
+share/dansguardian/languages/french/template.html
+share/dansguardian/languages/german/fancydmtemplate.html
+share/dansguardian/languages/german/messages
+share/dansguardian/languages/german/template.html
+share/dansguardian/languages/hebrew/fancydmtemplate.html
+share/dansguardian/languages/hebrew/messages
+share/dansguardian/languages/hebrew/template.html
+share/dansguardian/languages/hungarian/fancydmtemplate.html
+share/dansguardian/languages/hungarian/messages
+share/dansguardian/languages/hungarian/template.html
+share/dansguardian/languages/indonesian/fancydmtemplate.html
+share/dansguardian/languages/indonesian/messages
+share/dansguardian/languages/indonesian/template.html
+share/dansguardian/languages/italian/fancydmtemplate.html
+share/dansguardian/languages/italian/messages
+share/dansguardian/languages/italian/template.html
+share/dansguardian/languages/japanese/fancydmtemplate.html
Home |
Main Index |
Thread Index |
Old Index