diff options
| author | prlw1 <prlw1> | 2014-03-28 14:13:25 +0000 |
|---|---|---|
| committer | prlw1 <prlw1> | 2014-03-28 14:13:25 +0000 |
| commit | b46ebdf0a26813b9969d0ee20d3b6490463d92bc (patch) | |
| tree | f69b77de7aca58b872d6797bbd4707d3483d9f2f /www | |
| parent | da0db51f7c4fafa6318f6150530eebc457d1d268 (diff) | |
| download | pkgsrc-b46ebdf0a26813b9969d0ee20d3b6490463d92bc.tar.gz | |
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 (limited to 'www')
30 files changed, 484 insertions, 736 deletions
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile index c0c7ca99b37..50c855caa47 100644 --- a/www/dansguardian/Makefile +++ b/www/dansguardian/Makefile @@ -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 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" diff --git a/www/dansguardian/PLIST b/www/dansguardian/PLIST index 2c3eab1f5db..b7ff18e81f5 100644 --- a/www/dansguardian/PLIST +++ b/www/dansguardian/PLIST @@ -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 +share/dansguardian/languages/japanese/messages +share/dansguardian/languages/japanese/template.html +share/dansguardian/languages/lithuanian/fancydmtemplate.html +share/dansguardian/languages/lithuanian/messages +share/dansguardian/languages/lithuanian/template.html +share/dansguardian/languages/malay/fancydmtemplate.html +share/dansguardian/languages/malay/messages +share/dansguardian/languages/malay/template.html +share/dansguardian/languages/mxspanish/fancydmtemplate.html +share/dansguardian/languages/mxspanish/messages +share/dansguardian/languages/mxspanish/template.html +share/dansguardian/languages/polish/fancydmtemplate.html +share/dansguardian/languages/polish/messages +share/dansguardian/languages/polish/template.html +share/dansguardian/languages/portuguese/fancydmtemplate.html +share/dansguardian/languages/portuguese/messages +share/dansguardian/languages/portuguese/template.html +share/dansguardian/languages/ptbrazilian/fancydmtemplate.html +share/dansguardian/languages/ptbrazilian/messages +share/dansguardian/languages/ptbrazilian/template.html +share/dansguardian/languages/russian-1251/fancydmtemplate.html +share/dansguardian/languages/russian-1251/messages +share/dansguardian/languages/russian-1251/template.html +share/dansguardian/languages/russian-koi8-r/fancydmtemplate.html +share/dansguardian/languages/russian-koi8-r/messages +share/dansguardian/languages/russian-koi8-r/template.html +share/dansguardian/languages/slovak/fancydmtemplate.html +share/dansguardian/languages/slovak/messages +share/dansguardian/languages/slovak/template.html +share/dansguardian/languages/spanish/fancydmtemplate.html +share/dansguardian/languages/spanish/messages +share/dansguardian/languages/spanish/template.html +share/dansguardian/languages/swedish/fancydmtemplate.html +share/dansguardian/languages/swedish/messages +share/dansguardian/languages/swedish/template.html +share/dansguardian/languages/turkish/fancydmtemplate.html +share/dansguardian/languages/turkish/messages +share/dansguardian/languages/turkish/template.html +share/dansguardian/languages/ukenglish/fancydmtemplate.html +share/dansguardian/languages/ukenglish/messages +share/dansguardian/languages/ukenglish/template.html +share/dansguardian/scripts/bsd-init +share/dansguardian/scripts/dansguardian +share/dansguardian/scripts/logrotation +share/dansguardian/scripts/solaris-init +share/dansguardian/scripts/systemv-init +share/dansguardian/transparent1x1.gif +share/doc/dansguardian/AuthPlugins +share/doc/dansguardian/ContentScanners +share/doc/dansguardian/DownloadManagers +share/doc/dansguardian/FAQ +share/doc/dansguardian/FAQ.html +share/doc/dansguardian/Plugins +share/examples/dansguardian/authplugins/ident.conf +share/examples/dansguardian/authplugins/ip.conf +share/examples/dansguardian/authplugins/proxy-basic.conf +share/examples/dansguardian/authplugins/proxy-digest.conf share/examples/dansguardian/dansguardian.conf share/examples/dansguardian/dansguardianf1.conf -share/examples/dansguardian/exceptioniplist -share/examples/dansguardian/exceptionphraselist -share/examples/dansguardian/exceptionsitelist -share/examples/dansguardian/exceptionurllist -share/examples/dansguardian/exceptionuserlist -share/examples/dansguardian/filtergroupslist -share/examples/dansguardian/greysitelist -share/examples/dansguardian/greyurllist -share/examples/dansguardian/languages/ReadMe -share/examples/dansguardian/languages/arspanish/messages -share/examples/dansguardian/languages/arspanish/template.html -share/examples/dansguardian/languages/bulgarian/messages -share/examples/dansguardian/languages/bulgarian/template.html -share/examples/dansguardian/languages/chinesebig5/messages -share/examples/dansguardian/languages/chinesebig5/template.html -share/examples/dansguardian/languages/chinesegb2312/messages -share/examples/dansguardian/languages/chinesegb2312/template.html -share/examples/dansguardian/languages/czech/messages -share/examples/dansguardian/languages/czech/template.html -share/examples/dansguardian/languages/danish/messages -share/examples/dansguardian/languages/danish/template.html -share/examples/dansguardian/languages/dutch/messages -share/examples/dansguardian/languages/dutch/template.html -share/examples/dansguardian/languages/french/messages -share/examples/dansguardian/languages/french/template.html -share/examples/dansguardian/languages/german/messages -share/examples/dansguardian/languages/german/template.html -share/examples/dansguardian/languages/hebrew/messages -share/examples/dansguardian/languages/hebrew/template.html -share/examples/dansguardian/languages/indonesian/messages -share/examples/dansguardian/languages/indonesian/template.html -share/examples/dansguardian/languages/italian/messages -share/examples/dansguardian/languages/italian/template.html -share/examples/dansguardian/languages/lithuanian/messages -share/examples/dansguardian/languages/lithuanian/template.html -share/examples/dansguardian/languages/mxspanish/messages -share/examples/dansguardian/languages/mxspanish/template.html -share/examples/dansguardian/languages/polish/messages -share/examples/dansguardian/languages/polish/template.html -share/examples/dansguardian/languages/portuguese/messages -share/examples/dansguardian/languages/portuguese/messagesaccents -share/examples/dansguardian/languages/portuguese/template.html -share/examples/dansguardian/languages/russian-1251/messages -share/examples/dansguardian/languages/russian-1251/template.html -share/examples/dansguardian/languages/slovak/messages -share/examples/dansguardian/languages/slovak/template.html -share/examples/dansguardian/languages/spanish/messages -share/examples/dansguardian/languages/spanish/template.html -share/examples/dansguardian/languages/swedish/messages -share/examples/dansguardian/languages/swedish/template.html -share/examples/dansguardian/languages/turkish/messages -share/examples/dansguardian/languages/turkish/template.html -share/examples/dansguardian/languages/ukenglish/messages -share/examples/dansguardian/languages/ukenglish/template.html -share/examples/dansguardian/logrotation -share/examples/dansguardian/phraselists/badwords/weighted_dutch -share/examples/dansguardian/phraselists/badwords/weighted_french -share/examples/dansguardian/phraselists/badwords/weighted_german -share/examples/dansguardian/phraselists/badwords/weighted_portuguese -share/examples/dansguardian/phraselists/badwords/weighted_spanish -share/examples/dansguardian/phraselists/chat/weighted -share/examples/dansguardian/phraselists/chat/weighted_italian -share/examples/dansguardian/phraselists/drugadvocacy/weighted -share/examples/dansguardian/phraselists/gambling/banned -share/examples/dansguardian/phraselists/gambling/banned_portuguese -share/examples/dansguardian/phraselists/gambling/weighted -share/examples/dansguardian/phraselists/gambling/weighted_portuguese -share/examples/dansguardian/phraselists/games/weighted -share/examples/dansguardian/phraselists/goodphrases/exception -share/examples/dansguardian/phraselists/goodphrases/exception_email -share/examples/dansguardian/phraselists/goodphrases/weighted_general -share/examples/dansguardian/phraselists/goodphrases/weighted_general_danish -share/examples/dansguardian/phraselists/goodphrases/weighted_general_portuguese -share/examples/dansguardian/phraselists/goodphrases/weighted_news -share/examples/dansguardian/phraselists/googlesearches/banned -share/examples/dansguardian/phraselists/gore/weighted -share/examples/dansguardian/phraselists/gore/weighted_portuguese -share/examples/dansguardian/phraselists/illegaldrugs/banned -share/examples/dansguardian/phraselists/illegaldrugs/banned_portuguese -share/examples/dansguardian/phraselists/illegaldrugs/weighted -share/examples/dansguardian/phraselists/illegaldrugs/weighted_portuguese -share/examples/dansguardian/phraselists/intolerance/banned_portuguese -share/examples/dansguardian/phraselists/intolerance/weighted -share/examples/dansguardian/phraselists/intolerance/weighted_portuguese -share/examples/dansguardian/phraselists/legaldrugs/weighted -share/examples/dansguardian/phraselists/malware/weighted -share/examples/dansguardian/phraselists/news/weighted -share/examples/dansguardian/phraselists/nudism/weighted -share/examples/dansguardian/phraselists/peer2peer/weighted -share/examples/dansguardian/phraselists/personals/weighted -share/examples/dansguardian/phraselists/personals/weighted_portuguese -share/examples/dansguardian/phraselists/pornography/banned -share/examples/dansguardian/phraselists/pornography/banned_portuguese -share/examples/dansguardian/phraselists/pornography/weighted -share/examples/dansguardian/phraselists/pornography/weighted_danish -share/examples/dansguardian/phraselists/pornography/weighted_dutch -share/examples/dansguardian/phraselists/pornography/weighted_french -share/examples/dansguardian/phraselists/pornography/weighted_german -share/examples/dansguardian/phraselists/pornography/weighted_italian -share/examples/dansguardian/phraselists/pornography/weighted_portuguese -share/examples/dansguardian/phraselists/pornography/weighted_spanish -share/examples/dansguardian/phraselists/proxies/weighted -share/examples/dansguardian/phraselists/sport/weighted -share/examples/dansguardian/phraselists/violence/weighted -share/examples/dansguardian/phraselists/violence/weighted_portuguese -share/examples/dansguardian/phraselists/warezhacking/weighted -share/examples/dansguardian/phraselists/weapons/weighted -share/examples/dansguardian/phraselists/weapons/weighted_portuguese -share/examples/dansguardian/phraselists/webmail/weighted -share/examples/dansguardian/pics -share/examples/dansguardian/transparent1x1.gif -share/examples/dansguardian/weightedphraselist +share/examples/dansguardian/downloadmanagers/default.conf +share/examples/dansguardian/downloadmanagers/fancy.conf +share/examples/dansguardian/lists/authplugins/ipgroups +share/examples/dansguardian/lists/bannedextensionlist +share/examples/dansguardian/lists/bannediplist +share/examples/dansguardian/lists/bannedmimetypelist +share/examples/dansguardian/lists/bannedphraselist +share/examples/dansguardian/lists/bannedregexpheaderlist +share/examples/dansguardian/lists/bannedregexpurllist +share/examples/dansguardian/lists/bannedrooms/default +share/examples/dansguardian/lists/bannedsitelist +share/examples/dansguardian/lists/bannedurllist +share/examples/dansguardian/lists/blacklists/ads/domains +share/examples/dansguardian/lists/blacklists/ads/urls +share/examples/dansguardian/lists/contentregexplist +share/examples/dansguardian/lists/downloadmanagers/managedextensionlist +share/examples/dansguardian/lists/downloadmanagers/managedmimetypelist +share/examples/dansguardian/lists/exceptionextensionlist +share/examples/dansguardian/lists/exceptionfilesitelist +share/examples/dansguardian/lists/exceptionfileurllist +share/examples/dansguardian/lists/exceptioniplist +share/examples/dansguardian/lists/exceptionmimetypelist +share/examples/dansguardian/lists/exceptionphraselist +share/examples/dansguardian/lists/exceptionregexpurllist +share/examples/dansguardian/lists/exceptionsitelist +share/examples/dansguardian/lists/exceptionurllist +share/examples/dansguardian/lists/filtergroupslist +share/examples/dansguardian/lists/greysitelist +share/examples/dansguardian/lists/greyurllist +share/examples/dansguardian/lists/headerregexplist +share/examples/dansguardian/lists/logregexpurllist +share/examples/dansguardian/lists/logsitelist +share/examples/dansguardian/lists/logurllist +share/examples/dansguardian/lists/phraselists/badwords/weighted_dutch +share/examples/dansguardian/lists/phraselists/badwords/weighted_french +share/examples/dansguardian/lists/phraselists/badwords/weighted_german +share/examples/dansguardian/lists/phraselists/badwords/weighted_portuguese +share/examples/dansguardian/lists/phraselists/badwords/weighted_spanish +share/examples/dansguardian/lists/phraselists/chat/weighted +share/examples/dansguardian/lists/phraselists/chat/weighted_italian +share/examples/dansguardian/lists/phraselists/conspiracy/weighted +share/examples/dansguardian/lists/phraselists/domainsforsale/weighted +share/examples/dansguardian/lists/phraselists/drugadvocacy/weighted +share/examples/dansguardian/lists/phraselists/forums/weighted +share/examples/dansguardian/lists/phraselists/gambling/banned +share/examples/dansguardian/lists/phraselists/gambling/banned_portuguese +share/examples/dansguardian/lists/phraselists/gambling/weighted +share/examples/dansguardian/lists/phraselists/gambling/weighted_portuguese +share/examples/dansguardian/lists/phraselists/games/weighted +share/examples/dansguardian/lists/phraselists/goodphrases/exception +share/examples/dansguardian/lists/phraselists/goodphrases/exception_email +share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general +share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general_danish +share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general_dutch +share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general_malay +share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general_polish +share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general_portuguese +share/examples/dansguardian/lists/phraselists/goodphrases/weighted_general_swedish +share/examples/dansguardian/lists/phraselists/goodphrases/weighted_news +share/examples/dansguardian/lists/phraselists/googlesearches/banned +share/examples/dansguardian/lists/phraselists/gore/weighted +share/examples/dansguardian/lists/phraselists/gore/weighted_portuguese +share/examples/dansguardian/lists/phraselists/idtheft/weighted +share/examples/dansguardian/lists/phraselists/illegaldrugs/banned +share/examples/dansguardian/lists/phraselists/illegaldrugs/weighted +share/examples/dansguardian/lists/phraselists/illegaldrugs/weighted_portuguese +share/examples/dansguardian/lists/phraselists/intolerance/banned_portuguese +share/examples/dansguardian/lists/phraselists/intolerance/weighted +share/examples/dansguardian/lists/phraselists/intolerance/weighted_portuguese +share/examples/dansguardian/lists/phraselists/legaldrugs/weighted +share/examples/dansguardian/lists/phraselists/malware/weighted +share/examples/dansguardian/lists/phraselists/music/weighted +share/examples/dansguardian/lists/phraselists/news/weighted +share/examples/dansguardian/lists/phraselists/nudism/weighted +share/examples/dansguardian/lists/phraselists/peer2peer/weighted +share/examples/dansguardian/lists/phraselists/personals/weighted +share/examples/dansguardian/lists/phraselists/personals/weighted_portuguese +share/examples/dansguardian/lists/phraselists/pornography/banned +share/examples/dansguardian/lists/phraselists/pornography/banned_portuguese +share/examples/dansguardian/lists/phraselists/pornography/weighted +share/examples/dansguardian/lists/phraselists/pornography/weighted_chinese +share/examples/dansguardian/lists/phraselists/pornography/weighted_danish +share/examples/dansguardian/lists/phraselists/pornography/weighted_dutch +share/examples/dansguardian/lists/phraselists/pornography/weighted_french +share/examples/dansguardian/lists/phraselists/pornography/weighted_german +share/examples/dansguardian/lists/phraselists/pornography/weighted_italian +share/examples/dansguardian/lists/phraselists/pornography/weighted_japanese +share/examples/dansguardian/lists/phraselists/pornography/weighted_malay +share/examples/dansguardian/lists/phraselists/pornography/weighted_norwegian +share/examples/dansguardian/lists/phraselists/pornography/weighted_polish +share/examples/dansguardian/lists/phraselists/pornography/weighted_portuguese +share/examples/dansguardian/lists/phraselists/pornography/weighted_russian +share/examples/dansguardian/lists/phraselists/pornography/weighted_russian_utf8 +share/examples/dansguardian/lists/phraselists/pornography/weighted_spanish +share/examples/dansguardian/lists/phraselists/pornography/weighted_swedish +share/examples/dansguardian/lists/phraselists/proxies/weighted +share/examples/dansguardian/lists/phraselists/rta/banned +share/examples/dansguardian/lists/phraselists/safelabel/banned +share/examples/dansguardian/lists/phraselists/secretsocieties/weighted +share/examples/dansguardian/lists/phraselists/sport/weighted +share/examples/dansguardian/lists/phraselists/translation/weighted +share/examples/dansguardian/lists/phraselists/travel/weighted +share/examples/dansguardian/lists/phraselists/upstreamfilter/weighted +share/examples/dansguardian/lists/phraselists/violence/weighted +share/examples/dansguardian/lists/phraselists/violence/weighted_portuguese +share/examples/dansguardian/lists/phraselists/warezhacking/weighted +share/examples/dansguardian/lists/phraselists/weapons/weighted +share/examples/dansguardian/lists/phraselists/weapons/weighted_portuguese +share/examples/dansguardian/lists/phraselists/webmail/weighted +share/examples/dansguardian/lists/pics +share/examples/dansguardian/lists/urlregexplist +share/examples/dansguardian/lists/weightedphraselist +@pkgdir var/run diff --git a/www/dansguardian/distinfo b/www/dansguardian/distinfo index 804e7fb3bf6..05a8bb2928e 100644 --- a/www/dansguardian/distinfo +++ b/www/dansguardian/distinfo @@ -1,25 +1,9 @@ -$NetBSD: distinfo,v 1.7 2013/12/10 12:35:41 jperkin Exp $ +$NetBSD: distinfo,v 1.8 2014/03/28 14:13:25 prlw1 Exp $ -SHA1 (dansguardian-2.8.0.6.source.tar.gz) = 6d82eed13536a64a2f6711fa221756fa0bfe19f0 -RMD160 (dansguardian-2.8.0.6.source.tar.gz) = cf3493b26b4fcd5b366a6fe472e3c6c9e3cfe6d3 -Size (dansguardian-2.8.0.6.source.tar.gz) = 212737 bytes -SHA1 (patch-DataBuffer.cpp) = 7447cb436dffdda90192c5ac731add5224c26898 -SHA1 (patch-DynamicURLList.cpp) = a4a4472a1e387d850c64d3cfb9f75091bb8c4df6 -SHA1 (patch-FDTunnel.cpp) = 40f958f2559a0fb2977a94763d64b621cd5ac7aa -SHA1 (patch-FOptionContainer.cpp) = b86ee1542d9aace89192c8c41399dd38b7972d0f -SHA1 (patch-FatController.cpp) = 1e3eb5d866f5ec5edda9f3e6e8e7a2b107e99d04 -SHA1 (patch-ListContainer.cpp) = e38034615e831c9dd45eb861f97a6c2cf381e631 -SHA1 (patch-RegExp.cpp) = a1b56dedd627afaaf00aac8285874b508db348d4 -SHA1 (patch-Socket.cpp) = f8c6f13266f33bb03ffac57ca4734708640b1c77 -SHA1 (patch-String.cpp) = 8a86a27aa1d9d5b90b12fdf18562c830ec0e27d3 -SHA1 (patch-String.hpp) = fa6855e70356e1390d8fad0c878427430f0696e7 -SHA1 (patch-SysV.cpp) = bc173150d4663d90672298361589bfd8919d519b -SHA1 (patch-UDSocket.cpp) = d047b546a9bee74ff8dbccfe66bf75f2e61738a5 -SHA1 (patch-aa) = c4af2622ee48dedb15f5a22874c1c1bff5ea51ef -SHA1 (patch-dansguardian.cpp) = 93b34d9ca5ce371c178e68f0054088f177843407 -SHA1 (patch-fbsd.in) = c030c845e66225212052012e09d81f3b8817d97c -SHA1 (patch-linux.in) = 2ea47d4f5c5787302cc983939ea2454df29da5ef -SHA1 (patch-md5.cpp) = fc52f212aaa71436e30dbfb0021ebe2fbe54b326 -SHA1 (patch-nbsd.in) = e1d4fa9d7a839b1458c0bacdea30f70112c67a75 -SHA1 (patch-obsd.in) = 0002cc48b4e7201add7546e40b0a6f4fba70fe4e -SHA1 (patch-solaris.in) = aaa8b67f398a2b56d7679f5c636d14aee1bfe3e7 +SHA1 (dansguardian-2.12.0.3.tar.bz2) = c5d8175910310f9a03efc2e6cb440ea418adb896 +RMD160 (dansguardian-2.12.0.3.tar.bz2) = 312db0ce2db9d1b2ed537807f9b2eca5d76a4123 +Size (dansguardian-2.12.0.3.tar.bz2) = 577701 bytes +SHA1 (patch-configure) = be2ccff5ecd42994cf8727843372e5997004e5e4 +SHA1 (patch-src_ImageContainer.cpp) = b1296ac496a699d2089255b61841f607eba9d084 +SHA1 (patch-src_SocketArray.cpp) = 393bb901cf090b543a16da27f16c1bc99db8f155 +SHA1 (patch-src_UDSocket.cpp) = d022e2b44023dbac0d0f46bae4adf003efa000a1 diff --git a/www/dansguardian/files/configdirs b/www/dansguardian/files/configdirs new file mode 100644 index 00000000000..01ffdb34e44 --- /dev/null +++ b/www/dansguardian/files/configdirs @@ -0,0 +1,43 @@ +lists +lists/phraselists +lists/phraselists/badwords +lists/phraselists/chat +lists/phraselists/drugadvocacy +lists/phraselists/gambling +lists/phraselists/games +lists/phraselists/goodphrases +lists/phraselists/googlesearches +lists/phraselists/gore +lists/phraselists/illegaldrugs +lists/phraselists/intolerance +lists/phraselists/legaldrugs +lists/phraselists/malware +lists/phraselists/news +lists/phraselists/nudism +lists/phraselists/peer2peer +lists/phraselists/personals +lists/phraselists/pornography +lists/phraselists/proxies +lists/phraselists/sport +lists/phraselists/violence +lists/phraselists/warezhacking +lists/phraselists/weapons +lists/phraselists/webmail +lists/phraselists/forums +lists/phraselists/rta +lists/phraselists/conspiracy +lists/phraselists/domainsforsale +lists/phraselists/idtheft +lists/phraselists/safelabel +lists/phraselists/travel +lists/phraselists/upstreamfilter +lists/phraselists/secretsocieties +lists/phraselists/translation +lists/phraselists/music +lists/blacklists +lists/blacklists/ads +lists/authplugins +lists/bannedrooms +lists/downloadmanagers +downloadmanagers +authplugins diff --git a/www/dansguardian/files/configfiles b/www/dansguardian/files/configfiles new file mode 100644 index 00000000000..48e0332d155 --- /dev/null +++ b/www/dansguardian/files/configfiles @@ -0,0 +1,118 @@ +authplugins/ident.conf +authplugins/ip.conf +authplugins/proxy-basic.conf +authplugins/proxy-digest.conf +dansguardian.conf +dansguardianf1.conf +downloadmanagers/default.conf +downloadmanagers/fancy.conf +lists/authplugins/ipgroups +lists/bannedextensionlist +lists/bannediplist +lists/bannedmimetypelist +lists/bannedphraselist +lists/bannedregexpheaderlist +lists/bannedregexpurllist +lists/bannedrooms/default +lists/bannedsitelist +lists/bannedurllist +lists/blacklists/ads/domains +lists/blacklists/ads/urls +lists/contentregexplist +lists/downloadmanagers/managedextensionlist +lists/downloadmanagers/managedmimetypelist +lists/exceptionextensionlist +lists/exceptionfilesitelist +lists/exceptionfileurllist +lists/exceptioniplist +lists/exceptionmimetypelist +lists/exceptionphraselist +lists/exceptionregexpurllist +lists/exceptionsitelist +lists/exceptionurllist +lists/filtergroupslist +lists/greysitelist +lists/greyurllist +lists/headerregexplist +lists/logregexpurllist +lists/logsitelist +lists/logurllist +lists/phraselists/badwords/weighted_dutch +lists/phraselists/badwords/weighted_french +lists/phraselists/badwords/weighted_german +lists/phraselists/badwords/weighted_portuguese +lists/phraselists/badwords/weighted_spanish +lists/phraselists/chat/weighted +lists/phraselists/chat/weighted_italian +lists/phraselists/conspiracy/weighted +lists/phraselists/domainsforsale/weighted +lists/phraselists/drugadvocacy/weighted +lists/phraselists/forums/weighted +lists/phraselists/gambling/banned +lists/phraselists/gambling/banned_portuguese +lists/phraselists/gambling/weighted +lists/phraselists/gambling/weighted_portuguese +lists/phraselists/games/weighted +lists/phraselists/goodphrases/exception +lists/phraselists/goodphrases/exception_email +lists/phraselists/goodphrases/weighted_general +lists/phraselists/goodphrases/weighted_general_danish +lists/phraselists/goodphrases/weighted_general_dutch +lists/phraselists/goodphrases/weighted_general_malay +lists/phraselists/goodphrases/weighted_general_polish +lists/phraselists/goodphrases/weighted_general_portuguese +lists/phraselists/goodphrases/weighted_general_swedish +lists/phraselists/goodphrases/weighted_news +lists/phraselists/googlesearches/banned +lists/phraselists/gore/weighted +lists/phraselists/gore/weighted_portuguese +lists/phraselists/idtheft/weighted +lists/phraselists/illegaldrugs/banned +lists/phraselists/illegaldrugs/weighted +lists/phraselists/illegaldrugs/weighted_portuguese +lists/phraselists/intolerance/banned_portuguese +lists/phraselists/intolerance/weighted +lists/phraselists/intolerance/weighted_portuguese +lists/phraselists/legaldrugs/weighted +lists/phraselists/malware/weighted +lists/phraselists/music/weighted +lists/phraselists/news/weighted +lists/phraselists/nudism/weighted +lists/phraselists/peer2peer/weighted +lists/phraselists/personals/weighted +lists/phraselists/personals/weighted_portuguese +lists/phraselists/pornography/banned +lists/phraselists/pornography/banned_portuguese +lists/phraselists/pornography/weighted +lists/phraselists/pornography/weighted_chinese +lists/phraselists/pornography/weighted_danish +lists/phraselists/pornography/weighted_dutch +lists/phraselists/pornography/weighted_french +lists/phraselists/pornography/weighted_german +lists/phraselists/pornography/weighted_italian +lists/phraselists/pornography/weighted_japanese +lists/phraselists/pornography/weighted_malay +lists/phraselists/pornography/weighted_norwegian +lists/phraselists/pornography/weighted_polish +lists/phraselists/pornography/weighted_portuguese +lists/phraselists/pornography/weighted_russian +lists/phraselists/pornography/weighted_russian_utf8 +lists/phraselists/pornography/weighted_spanish +lists/phraselists/pornography/weighted_swedish +lists/phraselists/proxies/weighted +lists/phraselists/rta/banned +lists/phraselists/safelabel/banned +lists/phraselists/secretsocieties/weighted +lists/phraselists/sport/weighted +lists/phraselists/translation/weighted +lists/phraselists/travel/weighted +lists/phraselists/upstreamfilter/weighted +lists/phraselists/violence/weighted +lists/phraselists/violence/weighted_portuguese +lists/phraselists/warezhacking/weighted +lists/phraselists/weapons/weighted +lists/phraselists/weapons/weighted_portuguese +lists/phraselists/webmail/weighted +lists/pics +lists/urlregexplist +lists/weightedphraselist diff --git a/www/dansguardian/files/dansguardian.sh b/www/dansguardian/files/dansguardian.sh index 6ce66a7a3f4..5c78e919bbc 100644 --- a/www/dansguardian/files/dansguardian.sh +++ b/www/dansguardian/files/dansguardian.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: dansguardian.sh,v 1.2 2008/04/16 14:55:29 sborrill Exp $ +# $NetBSD: dansguardian.sh,v 1.3 2014/03/28 14:13:25 prlw1 Exp $ # # PROVIDE: dansguardian # REQUIRE: DAEMON LOGIN @@ -10,8 +10,8 @@ name="dansguardian" rcvar=$name -command="/usr/pkg/sbin/${name}" -pidfile="/var/run/${name}.pid" +command="@PREFIX@/sbin/${name}" +pidfile="@VARBASE@/run/${name}.pid" required_files="@PKG_SYSCONFDIR@/${name}.conf" extra_commands="reload" diff --git a/www/dansguardian/patches/patch-DataBuffer.cpp b/www/dansguardian/patches/patch-DataBuffer.cpp deleted file mode 100644 index c30d8bc005a..00000000000 --- a/www/dansguardian/patches/patch-DataBuffer.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-DataBuffer.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- DataBuffer.cpp.orig 2011-11-25 17:12:27.000000000 +0000 -+++ DataBuffer.cpp -@@ -22,6 +22,7 @@ - #include <algorithm> - #include "DataBuffer.hpp" - #include <cstdlib> -+#include <cstring> - #include <unistd.h> - #include <zlib.h> - #include <cerrno> diff --git a/www/dansguardian/patches/patch-DynamicURLList.cpp b/www/dansguardian/patches/patch-DynamicURLList.cpp deleted file mode 100644 index c463f48f18e..00000000000 --- a/www/dansguardian/patches/patch-DynamicURLList.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-DynamicURLList.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- DynamicURLList.cpp.orig 2011-11-25 17:14:23.000000000 +0000 -+++ DynamicURLList.cpp -@@ -23,6 +23,7 @@ - #include "OptionContainer.hpp" - #include <sys/stat.h> - #include <sys/time.h> -+#include <cstring> - - extern OptionContainer o; - extern bool isDaemonised; diff --git a/www/dansguardian/patches/patch-FDTunnel.cpp b/www/dansguardian/patches/patch-FDTunnel.cpp deleted file mode 100644 index f8808827369..00000000000 --- a/www/dansguardian/patches/patch-FDTunnel.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-FDTunnel.cpp,v 1.1 2013/12/10 12:35:41 jperkin Exp $ - -Need string.h on SunOS. - ---- FDTunnel.cpp.orig 2005-08-13 23:47:57.000000000 +0000 -+++ FDTunnel.cpp -@@ -34,6 +34,8 @@ - #ifdef __BSD - #include "autoconf/select.h" - #include <string.h> -+#elif defined(__sun) -+ #include <string.h> - #else - #include <sys/select.h> - #endif diff --git a/www/dansguardian/patches/patch-FOptionContainer.cpp b/www/dansguardian/patches/patch-FOptionContainer.cpp deleted file mode 100644 index 77907db9022..00000000000 --- a/www/dansguardian/patches/patch-FOptionContainer.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-FOptionContainer.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- FOptionContainer.cpp.orig 2011-11-25 17:14:40.000000000 +0000 -+++ FOptionContainer.cpp -@@ -22,6 +22,7 @@ - #include "FOptionContainer.hpp" - #include "OptionContainer.hpp" - #include "RegExp.hpp" -+#include <cstdlib> - #include <string> - #include <iostream> - #include <fstream> diff --git a/www/dansguardian/patches/patch-FatController.cpp b/www/dansguardian/patches/patch-FatController.cpp deleted file mode 100644 index e8c8505824b..00000000000 --- a/www/dansguardian/patches/patch-FatController.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-FatController.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- FatController.cpp.orig 2011-11-25 17:13:02.000000000 +0000 -+++ FatController.cpp -@@ -44,6 +44,8 @@ - #include <fstream> - #include <sys/time.h> - #include <sys/poll.h> -+#include <cstdlib> -+#include <cstring> - - #ifdef __GCCVER3 - #include <istream> diff --git a/www/dansguardian/patches/patch-ListContainer.cpp b/www/dansguardian/patches/patch-ListContainer.cpp deleted file mode 100644 index 1de56e9e992..00000000000 --- a/www/dansguardian/patches/patch-ListContainer.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ListContainer.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- ListContainer.cpp.orig 2011-11-25 17:14:09.000000000 +0000 -+++ ListContainer.cpp -@@ -24,6 +24,7 @@ - #include "RegExp.hpp" - #include <cstdlib> - #include <cstdio> -+#include <cstring> - #include <unistd.h> - #include "String.hpp" - #include <iostream> diff --git a/www/dansguardian/patches/patch-RegExp.cpp b/www/dansguardian/patches/patch-RegExp.cpp deleted file mode 100644 index 2ea0cb26979..00000000000 --- a/www/dansguardian/patches/patch-RegExp.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-RegExp.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- RegExp.cpp.orig 2011-11-25 17:13:26.000000000 +0000 -+++ RegExp.cpp -@@ -19,6 +19,7 @@ - - #include "RegExp.hpp" - #include <iostream> -+#include <cstring> - - RegExp::RegExp() - :imatched(false),wascompiled(false) {} diff --git a/www/dansguardian/patches/patch-Socket.cpp b/www/dansguardian/patches/patch-Socket.cpp deleted file mode 100644 index 57373f17d13..00000000000 --- a/www/dansguardian/patches/patch-Socket.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-Socket.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- Socket.cpp.orig 2011-11-25 17:12:45.000000000 +0000 -+++ Socket.cpp -@@ -34,6 +34,7 @@ - #include <pwd.h> - #include <cerrno> - #include <unistd.h> -+#include <cstring> - #include <string> - #include <stdexcept> - diff --git a/www/dansguardian/patches/patch-String.cpp b/www/dansguardian/patches/patch-String.cpp deleted file mode 100644 index 410a9f2ced0..00000000000 --- a/www/dansguardian/patches/patch-String.cpp +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-String.cpp,v 1.1 2013/07/11 14:05:14 sborrill Exp $ - -Fix build with 64-bit time_t ---- String.cpp.orig 2013-07-11 14:43:00.000000000 +0100 -+++ String.cpp 2013-07-11 14:46:38.000000000 +0100 -@@ -102,6 +102,27 @@ - } - #endif - -+#ifdef __GCCVER3 -+ String::String(const long long num) { -+ std::ostringstream buf; -+ buf << num << std::ends; -+ std::string s = buf.str(); -+ char* bs = (char*)s.c_str(); -+ int l = strlen(bs); -+ data = new char[l + 1]; -+ memcpy(data, bs, l); -+ sl = l; -+ data[sl] = '\0'; -+ } -+#else -+ String::String(const long long num) { -+ std::ostrstream buf; -+ buf << num << std::ends; -+ data = buf.str(); // with side effect: it calls buf.freeze() -+ sl = buf.pcount() - 1; -+ } -+#endif -+ - String::String(const char* bs, int len) { - data = new char[len + 1]; - memcpy(data, bs, len); diff --git a/www/dansguardian/patches/patch-String.hpp b/www/dansguardian/patches/patch-String.hpp deleted file mode 100644 index 7130bbaff38..00000000000 --- a/www/dansguardian/patches/patch-String.hpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-String.hpp,v 1.1 2013/07/11 14:05:14 sborrill Exp $ - -Fix build with 64-bit time_t ---- String.hpp.orig 2013-07-11 14:41:21.000000000 +0100 -+++ String.hpp 2013-07-11 14:41:38.000000000 +0100 -@@ -38,6 +38,7 @@ - String(const String& s); - String(const int num); - String(const long num); -+ String(const long long num); - String(const char bs[], int len); - String(const char bs[], int start, int len); - friend ostream & operator << (ostream & out, const String& s); diff --git a/www/dansguardian/patches/patch-SysV.cpp b/www/dansguardian/patches/patch-SysV.cpp deleted file mode 100644 index d1f61cde8c5..00000000000 --- a/www/dansguardian/patches/patch-SysV.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-SysV.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- SysV.cpp.orig 2011-11-25 17:13:55.000000000 +0000 -+++ SysV.cpp -@@ -20,6 +20,7 @@ - #include <cstdio> - #include <unistd.h> - #include <cstdlib> -+#include <cstring> - #include <fcntl.h> - #include <csignal> - #include "SysV.hpp" diff --git a/www/dansguardian/patches/patch-UDSocket.cpp b/www/dansguardian/patches/patch-UDSocket.cpp deleted file mode 100644 index 07311a3b0db..00000000000 --- a/www/dansguardian/patches/patch-UDSocket.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-UDSocket.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- UDSocket.cpp.orig 2011-11-25 17:13:40.000000000 +0000 -+++ UDSocket.cpp -@@ -21,6 +21,7 @@ - #include <syslog.h> - #include "UDSocket.hpp" - #include <csignal> -+#include <cstring> - #ifdef __BSD - #include <sys/wait.h> - #else diff --git a/www/dansguardian/patches/patch-aa b/www/dansguardian/patches/patch-aa deleted file mode 100644 index 71f7c8b0963..00000000000 --- a/www/dansguardian/patches/patch-aa +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2009/07/21 05:31:46 hasso Exp $ - ---- configure.orig 2005-08-14 02:47:57 +0300 -+++ configure 2009-07-21 07:13:41 +0300 -@@ -54,7 +54,7 @@ case `uname -s` in - OpenBSD*) - extendedecho='echo -e' - ;; -- FreeBSD*) -+ FreeBSD*|DragonFly*) - extendedecho='echo -e' - ;; - NetBSD*) -@@ -2538,7 +2538,7 @@ case `uname -s` in - $extendedecho "#define __PROXYGROUP \"$runas_grp\"" >>autoconf/platform.h - $extendedecho "#define __ENDIANH \"$endianh\"" >>autoconf/platform.h - ;; -- FreeBSD*) -+ FreeBSD*|DragonFly*) - echo "#define __BSD 1" >autoconf/platform.h - $extendedecho "#define __CONFFILE \"$prefixdir$sysconfdir\c" >>autoconf/platform.h; - echo "dansguardian.conf\"" >>autoconf/platform.h; -@@ -2662,7 +2662,7 @@ case `uname -s` in - echo "exit 0" >> dansguardian.bsdv - chmod u+x dansguardian.bsdv - ;; -- FreeBSD*) -+ FreeBSD*|DragonFly*) - if [ -f dansguardian.bsdv ]; then - rm -f dansguardian.bsdv - fi -@@ -3451,7 +3451,7 @@ case `uname -s` in - echo "dansguardian.sh stop > /dev/null" >>logrotation - echo "" >>logrotation - ;; -- FreeBSD*) -+ FreeBSD*|DragonFly*) - $extendedecho "$prefixdir$sysvdir\c" >>logrotation - echo "dansguardian.sh stop > /dev/null" >>logrotation - echo "" >>logrotation -@@ -3508,7 +3508,7 @@ case `uname -s` in - echo "dansguardian.sh start > /dev/null" >>logrotation - echo "" >>logrotation - ;; -- FreeBSD*) -+ FreeBSD*|DragonFly*) - $extendedecho "$prefixdir$sysvdir\c" >>logrotation - echo "dansguardian.sh start > /dev/null" >>logrotation - echo "" >>logrotation -@@ -3552,7 +3552,7 @@ case `uname -s` in - $extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian - echo "dansguardian.sh stop > /dev/null" >>logrotate.dansguardian - ;; -- FreeBSD*) -+ FreeBSD*|DragonFly*) - $extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian - echo "dansguardian.sh stop > /dev/null" >>logrotate.dansguardian - ;; -@@ -3583,7 +3583,7 @@ case `uname -s` in - $extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian - echo "dansguardian.sh start > /dev/null" >>logrotate.dansguardian - ;; -- FreeBSD*) -+ FreeBSD*|DragonFly*) - $extendedecho " $prefixdir$sysvdir\c" >>logrotate.dansguardian - echo "dansguardian.sh start > /dev/null" >>logrotate.dansguardian - ;; diff --git a/www/dansguardian/patches/patch-configure b/www/dansguardian/patches/patch-configure new file mode 100644 index 00000000000..744bbc310f7 --- /dev/null +++ b/www/dansguardian/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2014/03/28 14:13:25 prlw1 Exp $ + +https://sourceforge.net/p/dansguardian/patches/16/ + +--- configure.orig 2012-09-29 20:09:06.000000000 +0000 ++++ configure +@@ -6148,7 +6148,7 @@ $as_echo_n "checking for debug option... + + # Check whether --with-dgdebug was given. + if test "${with_dgdebug+set}" = set; then : +- withval=$with_dgdebug; if test "x${withval}" == "xoff" ; then ++ withval=$with_dgdebug; if test "x${withval}" = "xoff" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + else diff --git a/www/dansguardian/patches/patch-dansguardian.cpp b/www/dansguardian/patches/patch-dansguardian.cpp deleted file mode 100644 index 41d5fd614e6..00000000000 --- a/www/dansguardian/patches/patch-dansguardian.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-dansguardian.cpp,v 1.1 2011/11/25 22:24:39 joerg Exp $ - ---- dansguardian.cpp.orig 2011-11-25 17:15:02.000000000 +0000 -+++ dansguardian.cpp -@@ -24,6 +24,7 @@ - #include <iostream> - #include <arpa/inet.h> - #include <cstdio> -+#include <cstdlib> - #include <string> - #include <unistd.h> - #include <cerrno> diff --git a/www/dansguardian/patches/patch-fbsd.in b/www/dansguardian/patches/patch-fbsd.in deleted file mode 100644 index d8a8a9b8906..00000000000 --- a/www/dansguardian/patches/patch-fbsd.in +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-fbsd.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $ - ---- autoconf/fbsd.in.orig 2005-08-14 00:47:57.000000000 +0100 -+++ autoconf/fbsd.in 2010-03-29 20:16:46.000000000 +0100 -@@ -43,14 +43,6 @@ - $(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)languages || install -d $I$(CONFFILELOCATION)languages -- @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 ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist - cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf - cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian -@@ -81,10 +73,6 @@ - cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl - chmod o+x $I$(CGIBINLOCATION)dansguardian.pl - cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz -- chown -R $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION) -- chmod -R u+wr $I$(LOGLOCATION) -- chmod -R og-w $I$(LOGLOCATION) -- chmod u+wrx $I$(LOGLOCATION) - if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi - - uninstall: diff --git a/www/dansguardian/patches/patch-linux.in b/www/dansguardian/patches/patch-linux.in deleted file mode 100644 index 76e1465989f..00000000000 --- a/www/dansguardian/patches/patch-linux.in +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-linux.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $ - ---- autoconf/linux.in.orig 2005-08-14 00:47:57.000000000 +0100 -+++ autoconf/linux.in 2010-03-29 20:16:54.000000000 +0100 -@@ -47,14 +47,6 @@ - $(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)languages || install -d $I$(CONFFILELOCATION)languages -- @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 ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist - cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf - cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian -@@ -85,10 +77,6 @@ - cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl - chmod o+x $I$(CGIBINLOCATION)dansguardian.pl - cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz -- chown -R $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION) -- chmod -R u+wr $I$(LOGLOCATION) -- chmod -R og-w $I$(LOGLOCATION) -- chmod u+wrx $I$(LOGLOCATION) - if [ -f $(CHKCONF) ]; then $(CHKCONFIG); fi - if [ -f $(DEB_RC) ]; then $(DEB_RC) dansguardian defaults 50; fi - if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi diff --git a/www/dansguardian/patches/patch-md5.cpp b/www/dansguardian/patches/patch-md5.cpp deleted file mode 100644 index 1a810211a38..00000000000 --- a/www/dansguardian/patches/patch-md5.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-md5.cpp,v 1.1 2013/12/10 12:35:41 jperkin Exp $ - -Avoid __ENDIANH on SunOS. - ---- md5.cpp.orig 2005-08-13 23:47:57.000000000 +0000 -+++ md5.cpp -@@ -30,7 +30,9 @@ - //These lines modified Tue 24th February 2004 by Daniel Barron - #include "autoconf/platform.h" - #ifdef __ENDIANH -- #include __ENDIANH -+ #if !defined(__sun) -+ #include __ENDIANH -+ #endif - #else - #include <endian.h> - #endif diff --git a/www/dansguardian/patches/patch-nbsd.in b/www/dansguardian/patches/patch-nbsd.in deleted file mode 100644 index dc3ab0cc7cc..00000000000 --- a/www/dansguardian/patches/patch-nbsd.in +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-nbsd.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $ - ---- autoconf/nbsd.in.orig 2005-08-14 00:47:57.000000000 +0100 -+++ autoconf/nbsd.in 2010-03-29 20:16:51.000000000 +0100 -@@ -42,14 +42,6 @@ - $(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)languages || install -d $I$(CONFFILELOCATION)languages -- @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 ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist - cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf - cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian -@@ -80,10 +72,6 @@ - cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl - chmod o+x $I$(CGIBINLOCATION)dansguardian.pl - cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz -- chown -R $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION) -- chmod -R u+wr $I$(LOGLOCATION) -- chmod -R og-w $I$(LOGLOCATION) -- chmod u+wrx $I$(LOGLOCATION) - if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi - - uninstall: diff --git a/www/dansguardian/patches/patch-obsd.in b/www/dansguardian/patches/patch-obsd.in deleted file mode 100644 index 855fb337812..00000000000 --- a/www/dansguardian/patches/patch-obsd.in +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-obsd.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $ - ---- autoconf/obsd.in.orig 2005-08-14 00:47:57.000000000 +0100 -+++ autoconf/obsd.in 2010-03-29 20:16:49.000000000 +0100 -@@ -44,14 +44,6 @@ - $(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)languages || install -d $I$(CONFFILELOCATION)languages -- @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 ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist - cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf - cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian -@@ -82,10 +74,6 @@ - cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl - chmod o+x $I$(CGIBINLOCATION)dansguardian.pl - cp -f ./dansguardian.8.gz $I$(MANUALFILES)man8/dansguardian.8.gz -- chown -R $(PROXYUSER):$(PROXYGROUP) $I$(LOGLOCATION) -- chmod -R u+wr $I$(LOGLOCATION) -- chmod -R og-w $I$(LOGLOCATION) -- chmod u+wrx $I$(LOGLOCATION) - if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi - - uninstall: diff --git a/www/dansguardian/patches/patch-solaris.in b/www/dansguardian/patches/patch-solaris.in deleted file mode 100644 index 7c7d49a111f..00000000000 --- a/www/dansguardian/patches/patch-solaris.in +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-solaris.in,v 1.1 2010/03/29 19:38:54 sborrill Exp $ - ---- autoconf/solaris.in.orig 2005-08-14 00:47:57.000000000 +0100 -+++ autoconf/solaris.in 2010-03-29 20:17:06.000000000 +0100 -@@ -42,14 +42,6 @@ - $(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)languages || install -d $I$(CONFFILELOCATION)languages -- @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 ./filtergroupslist $I$(CONFFILELOCATION)filtergroupslist - cp -f ./dansguardianf1.conf $I$(CONFFILELOCATION)dansguardianf1.conf - cp -f ./dansguardian $I$(BINARYLOCATION)dansguardian -@@ -80,11 +72,6 @@ - cp -f ./dansguardian.pl $I$(CGIBINLOCATION)dansguardian.pl - chmod o+x $I$(CGIBINLOCATION)dansguardian.pl - cp -f ./dansguardian.8 $I$(MANUALFILES)man8/dansguardian.8 -- chmod -R u+wr $I$(LOGLOCATION) -- chmod -R og-w $I$(LOGLOCATION) -- chmod u+wrx $I$(LOGLOCATION) -- chgrp -R $(PROXYGROUP) $I$(LOGLOCATION) -- chown -R $(PROXYUSER) $I$(LOGLOCATION) - $(CHKCONFIG) - if [ -d $(LOGROTATELOCATION) ]; then cp -f ./logrotate.dansguardian $I$(LOGROTATELOCATION)dansguardian; fi - diff --git a/www/dansguardian/patches/patch-src_ImageContainer.cpp b/www/dansguardian/patches/patch-src_ImageContainer.cpp new file mode 100644 index 00000000000..66c872d6d90 --- /dev/null +++ b/www/dansguardian/patches/patch-src_ImageContainer.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-src_ImageContainer.cpp,v 1.1 2014/03/28 14:13:25 prlw1 Exp $ + +https://sourceforge.net/p/dansguardian/bugs/55/ + +--- src/ImageContainer.cpp.orig 2012-09-29 20:06:45.000000000 +0000 ++++ src/ImageContainer.cpp +@@ -15,6 +15,7 @@ + #include <fstream> + #include <stdexcept> + #include <cerrno> ++#include <cstring> + #include <limits.h> + + diff --git a/www/dansguardian/patches/patch-src_SocketArray.cpp b/www/dansguardian/patches/patch-src_SocketArray.cpp new file mode 100644 index 00000000000..0fe8c6e3fab --- /dev/null +++ b/www/dansguardian/patches/patch-src_SocketArray.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-src_SocketArray.cpp,v 1.1 2014/03/28 14:13:25 prlw1 Exp $ + +https://sourceforge.net/p/dansguardian/bugs/55/ + +--- src/SocketArray.cpp.orig 2011-08-02 13:31:45.000000000 +0000 ++++ src/SocketArray.cpp +@@ -14,6 +14,7 @@ + + #include <syslog.h> + #include <cerrno> ++#include <cstring> + + + // GLOBALS diff --git a/www/dansguardian/patches/patch-src_UDSocket.cpp b/www/dansguardian/patches/patch-src_UDSocket.cpp new file mode 100644 index 00000000000..fd34ef49258 --- /dev/null +++ b/www/dansguardian/patches/patch-src_UDSocket.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-src_UDSocket.cpp,v 1.1 2014/03/28 14:13:25 prlw1 Exp $ + +https://sourceforge.net/p/dansguardian/bugs/55/ + +--- src/UDSocket.cpp.orig 2012-09-29 20:06:45.000000000 +0000 ++++ src/UDSocket.cpp +@@ -18,6 +18,7 @@ + #include <sys/time.h> + #include <pwd.h> + #include <cerrno> ++#include <cstring> + #include <unistd.h> + #include <stdexcept> + #include <stddef.h> |