From owner-svn-ports-all@freebsd.org Sat Nov 10 04:19:32 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 62F6B1125585; Sat, 10 Nov 2018 04:19:32 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A381E7696C; Sat, 10 Nov 2018 04:19:26 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8332F1DE15; Sat, 10 Nov 2018 04:19:26 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAA4JQQb037972; Sat, 10 Nov 2018 04:19:26 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAA4JPkI037962; Sat, 10 Nov 2018 04:19:25 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201811100419.wAA4JPkI037962@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 10 Nov 2018 04:19:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484571 - in head/www/e2guardian: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/www/e2guardian: . files X-SVN-Commit-Revision: 484571 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A381E7696C X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.998,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.88), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Nov 2018 04:19:32 -0000 Author: swills Date: Sat Nov 10 04:19:24 2018 New Revision: 484571 URL: https://svnweb.freebsd.org/changeset/ports/484571 Log: www/e2guardian: Update to 5.2.2 PR: 232442 Submitted by: Alexander (with minor changes) Approved by: maintainer timeout (marcellocoutinho@gmail.com, >2 weeks) Added: head/www/e2guardian/files/patch-configs_authplugins_Makefile.am (contents, props changed) head/www/e2guardian/files/patch-configure.ac (contents, props changed) head/www/e2guardian/files/pkg-install.in (contents, props changed) head/www/e2guardian/files/pkg-message.in (contents, props changed) Deleted: head/www/e2guardian/pkg-message Modified: head/www/e2guardian/Makefile (contents, props changed) head/www/e2guardian/distinfo (contents, props changed) head/www/e2guardian/pkg-plist (contents, props changed) Modified: head/www/e2guardian/Makefile ============================================================================== --- head/www/e2guardian/Makefile Sat Nov 10 03:40:42 2018 (r484570) +++ head/www/e2guardian/Makefile Sat Nov 10 04:19:24 2018 (r484571) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= e2guardian -PORTVERSION= 3.5.1 +PORTVERSION= 5.2.2 DISTVERSIONPREFIX= v CATEGORIES= www @@ -11,99 +11,81 @@ COMMENT= Dansguardian fork with many improvements and LICENSE= GPLv2 -BUILD_DEPENDS= rst2man:textproc/py-docutils +BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} LIB_DEPENDS= libpcre.so:devel/pcre +USES= autoreconf libtool pkgconfig python USE_GITHUB= yes -USES= autoreconf libtool iconv pkgconfig + USE_RC_SUBR= e2guardian GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-logdir=/var/log \ - --with-piddir=/var/run \ - --enable-fancydm + --with-piddir=/var/run -OPTIONS_DEFINE= APACHE TRICKLE CLISCAN CLAMD ICAP KAV NTLM DNS EMAIL DEBUG SSL DOCS -OPTIONS_DEFAULT=TRICKLE 1024 +OPTIONS_DEFINE= CLISCAN CLAMD ICAP KAV AVAST NTLM DNS EMAIL DEBUG DOCS SSL +OPTIONS_DEFAULT=CLAMD DNS OPTIONS_SUB= yes -APACHE_DESC= Enable Apache support for access denied page -TRICKLE_DESC= Enable the trickle download manager CLISCAN_DESC= Enable support for CLI content scanners CLAMD_DESC= Enable ClamD AV content scanner ICAP_DESC= Enable ICAP AV content scanner support KAV_DESC= Enable Kaspersky AV support +AVAST_DESC= Enable AvastD content scanner NTLM_DESC= Include NTLM authentication plugin DNS_DESC= Include DNS authetication plugin EMAIL_DESC= Enable e-mail reporting support +DEBUG_DESC= Enable debug build mode -OPTIONS_RADIO= DESCRIPTORS -OPTIONS_RADIO_DESCRIPTORS= 1024 2048 4096 8192 - -1024_DESC= Enable default file descriptors -2048_DESC= Enable 2048 file descriptors -4096_DESC= Enable 4096 file descriptors -8192_DESC= Enable 8192 file descriptors - CONFDIR= ${PREFIX}/etc/e2guardian CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include -APACHE_USE= APACHE_RUN=22+ -TRICKLE_CONFIGURE_ENABLE= trickledm CLISCAN_CONFIGURE_ENABLE= commandline CLAMD_CONFIGURE_ENABLE= clamd=yes CLAMD_RUN_DEPENDS= ${LOCALBASE}/sbin/clamd:security/clamav ICAP_CONFIGURE_ENABLE= icap KAV_CONFIGURE_ENABLE= kavd +AVAST_CONFIGURE_ENABLE= avastd NTLM_CONFIGURE_ENABLE= ntlm NTLM_RUN_DEPENDS= ${LOCALBASE}/bin/iconv:converters/libiconv NTLM_USES= iconv DNS_CONFIGURE_ENABLE= dnsauth EMAIL_CONFIGURE_ENABLE= email -DEBUG_CONFIGURE_ON= --with-dgdebug=on -1024_CONFIGURE_ON= --with-filedescriptors=1024 -2048_CONFIGURE_ON= --with-filedescriptors=2048 -4096_CONFIGURE_ON= --with-filedescriptors=4096 -8192_CONFIGURE_ON= --with-filedescriptors=8192 +DEBUG_CONFIGURE_ENABLE= dgdebug SSL_LDFLAGS= -lssl -lcrypto SSL_CFLAGS= -D__SSLMITM -D__SSLCERT .include .if ${PORT_OPTIONS:MCLAMD} || ${PORT_OPTIONS:MICAP} || \ - ${PORT_OPTIONS:MKAV} || ${PORT_OPTIONS:MCLISCAN} + ${PORT_OPTIONS:MKAV} || ${PORT_OPTIONS:MCLISCAN} || \ + ${PORT_OPTIONS:MAVAST} PLIST_SUB+= SCANNERS="" .else PLIST_SUB+= SCANNERS="@comment " .endif -post-extract: -.if ${PORT_OPTIONS:M2048} || ${PORT_OPTIONS:M4096} || ${PORT_OPTIONS:M8192} - @${ECHO_MSG} "" - @${ECHO_MSG} "######################################################" - @${ECHO_MSG} "WARNING! Filedescriptors option higher then 1024." - @${ECHO_MSG} "Check/raise FD_SETSIZE in /usr/include/sys/select.h" - @${ECHO_MSG} "before preceeding with e2guardian compilation" - @${ECHO_MSG} "######################################################" - @${ECHO_MSG} "" -. if !(defined(PACKAGE_BUILDING) || defined(BATCH)) - @sleep 3 -. endif -.endif +SUB_FILES= pkg-message pkg-install pre-configure: @cd ${WRKSRC} && ${SH} ${WRKSRC}/autogen.sh post-install: @${FIND} ${STAGEDIR}${ETCDIR} -type f \ - \( -name '*.conf' -or -name '*list' \) -exec ${MV} {} {}.sample \; + \( -name '*.conf' -or -name '*list' -or -name '*.story' \) \ + -exec ${MV} {} {}.sample \; @${MV} ${STAGEDIR}${ETCDIR}/lists/authplugins/ipgroups \ ${STAGEDIR}${ETCDIR}/lists/authplugins/ipgroups.sample @${MV} ${STAGEDIR}${ETCDIR}/lists/authplugins/portgroups \ ${STAGEDIR}${ETCDIR}/lists/authplugins/portgroups.sample @${MV} ${STAGEDIR}${ETCDIR}/lists/bannedrooms/default \ ${STAGEDIR}${ETCDIR}/lists/bannedrooms/default.sample - + @${MV} ${STAGEDIR}${ETCDIR}/lists/bannedsitelistwithbypass \ + ${STAGEDIR}${ETCDIR}/lists/bannedsitelistwithbypass.sample + @${MV} ${STAGEDIR}${ETCDIR}/lists/exceptionvirusextensionlist.sample \ + ${STAGEDIR}${ETCDIR}/lists/contentscanners/ + @${MV} ${STAGEDIR}${ETCDIR}/lists/exceptionvirussiteiplist.sample \ + ${STAGEDIR}${ETCDIR}/lists/contentscanners/ .include Modified: head/www/e2guardian/distinfo ============================================================================== --- head/www/e2guardian/distinfo Sat Nov 10 03:40:42 2018 (r484570) +++ head/www/e2guardian/distinfo Sat Nov 10 04:19:24 2018 (r484571) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491014016 -SHA256 (e2guardian-e2guardian-v3.5.1_GH0.tar.gz) = 700d951aec61113513ed3bd139028bd944790e09712646a54143a73851356527 -SIZE (e2guardian-e2guardian-v3.5.1_GH0.tar.gz) = 529677 +TIMESTAMP = 1539686941 +SHA256 (e2guardian-e2guardian-v5.2.2_GH0.tar.gz) = 219160755592ee0d05b2f25698ee5a4257330ff2e15ae3ca716df2df0db8b00b +SIZE (e2guardian-e2guardian-v5.2.2_GH0.tar.gz) = 2000439 Added: head/www/e2guardian/files/patch-configs_authplugins_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/e2guardian/files/patch-configs_authplugins_Makefile.am Sat Nov 10 04:19:24 2018 (r484571) @@ -0,0 +1,11 @@ +--- configs/authplugins/Makefile.am.orig 2018-10-16 12:21:11 UTC ++++ configs/authplugins/Makefile.am +@@ -4,7 +4,7 @@ DGDATADIR = $(DGCONFDIR)/authplugins + + SUBDIRS = . + +-FLISTS = proxy-basic.conf ident.conf ip.conf proxy-digest.conf \ ++FLISTS = proxy-basic.conf ident.conf ip.conf proxy-digest.conf proxy-header.conf\ + port.conf + + if ENABLE_NTLM Added: head/www/e2guardian/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/e2guardian/files/patch-configure.ac Sat Nov 10 04:19:24 2018 (r484571) @@ -0,0 +1,10 @@ +--- configure.ac.orig 2018-08-21 08:17:02 UTC ++++ configure.ac +@@ -617,7 +617,6 @@ else + AC_MSG_RESULT(yes) + dnsauth=true + DNSAUTHSUPPORT="" +- LIBS="${LIBS} -lresolv" + AC_DEFINE([PRT_DNSAUTH],[],[Define to enable DNS auth plugin]) + fi], + [ Added: head/www/e2guardian/files/pkg-install.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/e2guardian/files/pkg-install.in Sat Nov 10 04:19:24 2018 (r484571) @@ -0,0 +1,32 @@ +#!/bin/sh +# +# + +PATH=/bin:/usr/bin:/usr/sbin +pkgname=$1 +e2guardian_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/e2guardian" + +case $2 in +PRE-INSTALL) + echo "===> Pre-installation configuration for ${pkgname}" + ;; +POST-INSTALL) + # Populate initial config files in case of new install in a way + # to avoid overwrite of existing config files. + + sample_files=$(find ${e2guardian_confdir}/e2guardian -name "*.sample" -print) + echo ${sample_files} + for file in ${sample_files} ; do + file2=$(echo $file | rev | cut -c8- | rev) + if [ ! -f ${file2} -a -f ${file} ]; then + echo "Creating ${file2} from ${file}..." + install -c -o root -g wheel -m 0644 ${file} ${file2} + fi + done + ;; +*) + exit 33 + ;; +esac +exit 0 + Added: head/www/e2guardian/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/e2guardian/files/pkg-message.in Sat Nov 10 04:19:24 2018 (r484571) @@ -0,0 +1,49 @@ +#################################################################################### + o You can find the configuration files for this package in the + directory %%PREFIX%%/etc/e2guardian. + + Note: + If you just updated your e2guardian installation from an earlier version, + make sure to check your e2guardian.conf and e2guardianf[1..9].conf + configuration files against the respective e2giardian.conf.sample + and e2guardianf1.conf.sample files. + Do not forget to check/configure log rotation and compression- read + newsyslog(8) man page for details. + + o Running of e2guardian and squid on the same machine is common configuration. + In order to get reliable and fast-working configuration on heavy loaded + systems with real-time content checking with antivirus you might want to set + the following tunables (see tuning(7) man page for details prior to tuning): + + **** /boot/loader.conf **** + kern.ipc.msgmnb=8192 + kern.ipc.msgssz=64 + kern.ipc.msgtql=2048 + net.inet.tcp.syncache.hashsize=1024 + net.inet.tcp.syncache.bucketlimit=100 + + **** /etc/sysctl.conf **** + net.inet.ip.portrange.last=65535 + net.inet.ip.portrange.first=1024 + net.inet.tcp.delayed_ack=1 + net.inet.tcp.nolocaltimewait=1 + kern.ipc.soacceptqueue=8192 + net.local.stream.recvspace=65535 + net.local.stream.sendspace=65535 + net.inet.ip.portrange.randomized=0 + #Skip feeding /dev/random from network. + kern.random.harvest.mask=399 + + Also do not forget to raise kern.threads.max_threads_per_proc to the value + higher then httpworkers in e2giardian.conf. + + o As of v.4 e2guardian is a single process multithreaded application. + It might be reasonable to use sysutils/fsc or similar tools to control + it's status. + + o Useful links: + - e2guardian project web site http://e2guardian.org/ + - GitHub repository https://github.com/e2guardian/e2guardian/ + - support forum https://groups.google.com/forum/#!forum/e2guardian + - link for bug reports https://github.com/e2guardian/e2guardian/issues +#################################################################################### Modified: head/www/e2guardian/pkg-plist ============================================================================== --- head/www/e2guardian/pkg-plist Sat Nov 10 03:40:42 2018 (r484570) +++ head/www/e2guardian/pkg-plist Sat Nov 10 04:19:24 2018 (r484571) @@ -4,68 +4,93 @@ @sample %%ETCDIR%%/authplugins/port.conf.sample @sample %%ETCDIR%%/authplugins/proxy-basic.conf.sample @sample %%ETCDIR%%/authplugins/proxy-digest.conf.sample -@sample %%ETCDIR%%/authplugins/proxy-header.conf.sample -%%TRICKLE%%@sample %%ETCDIR%%/downloadmanagers/trickle.conf.sample +%%DNS%%@sample %%ETCDIR%%/authplugins/proxy-header.conf.sample %%NTLM%%@sample %%ETCDIR%%/authplugins/proxy-ntlm.conf.sample %%CLAMD%%@sample %%ETCDIR%%/contentscanners/clamdscan.conf.sample %%ICAP%%@sample %%ETCDIR%%/contentscanners/icapscan.conf.sample %%CLISCAN%%@sample %%ETCDIR%%/contentscanners/commandlinescan.conf.sample %%KAV%%@sample %%ETCDIR%%/contentscanners/kavdscan.conf.sample +%%AVAST%%@sample %%ETCDIR%%/contentscanners/avastd.conf.sample @sample %%ETCDIR%%/downloadmanagers/default.conf.sample -@sample %%ETCDIR%%/downloadmanagers/fancy.conf.sample @sample %%ETCDIR%%/e2guardian.conf.sample @sample %%ETCDIR%%/e2guardianf1.conf.sample +@sample %%ETCDIR%%/common.story.sample +@sample %%ETCDIR%%/examplef1.story.sample +@sample %%ETCDIR%%/preauth.story.sample +@sample %%ETCDIR%%/site.story.sample @sample %%ETCDIR%%/lists/addheaderregexplist.sample %%DNS%%@sample %%ETCDIR%%/lists/authexceptionsitelist.sample %%DNS%%@sample %%ETCDIR%%/lists/authexceptionurllist.sample +%%DNS%%@sample %%ETCDIR%%/lists/authexceptioniplist.sample +%%DNS%%@sample %%ETCDIR%%/lists/authexceptionsiteiplist.sample @sample %%ETCDIR%%/lists/authplugins/ipgroups.sample @sample %%ETCDIR%%/lists/authplugins/portgroups.sample +@sample %%ETCDIR%%/lists/bannedclientlist.sample @sample %%ETCDIR%%/lists/bannedextensionlist.sample @sample %%ETCDIR%%/lists/bannediplist.sample @sample %%ETCDIR%%/lists/bannedmimetypelist.sample @sample %%ETCDIR%%/lists/bannedphraselist.sample @sample %%ETCDIR%%/lists/bannedregexpheaderlist.sample @sample %%ETCDIR%%/lists/bannedregexpurllist.sample +@sample %%ETCDIR%%/lists/bannedregexpuseragentlist.sample @sample %%ETCDIR%%/lists/bannedrooms/default.sample @sample %%ETCDIR%%/lists/bannedsearchlist.sample +@sample %%ETCDIR%%/lists/bannedsearchoveridelist.sample +@sample %%ETCDIR%%/lists/bannedsiteiplist.sample @sample %%ETCDIR%%/lists/bannedsitelist.sample +@sample %%ETCDIR%%/lists/bannedsitelistwithbypass.sample +@sample %%ETCDIR%%/lists/bannedsslsiteiplist.sample @sample %%ETCDIR%%/lists/bannedsslsitelist.sample @sample %%ETCDIR%%/lists/bannedurllist.sample @sample %%ETCDIR%%/lists/contentregexplist.sample %%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusextensionlist.sample %%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusmimetypelist.sample +%%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirussiteiplist.sample %%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirussitelist.sample %%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusurllist.sample -@sample %%ETCDIR%%/lists/downloadmanagers/managedextensionlist.sample -@sample %%ETCDIR%%/lists/downloadmanagers/managedmimetypelist.sample +@sample %%ETCDIR%%/lists/embededreferersiteiplist.sample @sample %%ETCDIR%%/lists/embededreferersitelist.sample @sample %%ETCDIR%%/lists/embededrefererurllist.sample +@sample %%ETCDIR%%/lists/exceptionclientlist.sample @sample %%ETCDIR%%/lists/exceptionextensionlist.sample @sample %%ETCDIR%%/lists/exceptionfilesitelist.sample +@sample %%ETCDIR%%/lists/exceptionfilesiteiplist.sample @sample %%ETCDIR%%/lists/exceptionfileurllist.sample @sample %%ETCDIR%%/lists/exceptioniplist.sample @sample %%ETCDIR%%/lists/exceptionmimetypelist.sample @sample %%ETCDIR%%/lists/exceptionphraselist.sample +@sample %%ETCDIR%%/lists/exceptionregexpheaderlist.sample @sample %%ETCDIR%%/lists/exceptionregexpurllist.sample +@sample %%ETCDIR%%/lists/exceptionregexpuseragentlist.sample +@sample %%ETCDIR%%/lists/exceptionsiteiplist.sample @sample %%ETCDIR%%/lists/exceptionsitelist.sample @sample %%ETCDIR%%/lists/exceptionurllist.sample @sample %%ETCDIR%%/lists/filtergroupslist.sample +@sample %%ETCDIR%%/lists/greysiteiplist.sample @sample %%ETCDIR%%/lists/greysitelist.sample +@sample %%ETCDIR%%/lists/greysslsiteiplist.sample @sample %%ETCDIR%%/lists/greysslsitelist.sample @sample %%ETCDIR%%/lists/greyurllist.sample @sample %%ETCDIR%%/lists/headerregexplist.sample @sample %%ETCDIR%%/lists/localbannedsearchlist.sample +@sample %%ETCDIR%%/lists/localbannedsiteiplist.sample @sample %%ETCDIR%%/lists/localbannedsitelist.sample +@sample %%ETCDIR%%/lists/localbannedsslsiteiplist.sample @sample %%ETCDIR%%/lists/localbannedsslsitelist.sample @sample %%ETCDIR%%/lists/localbannedurllist.sample +@sample %%ETCDIR%%/lists/localexceptionsiteiplist.sample @sample %%ETCDIR%%/lists/localexceptionsitelist.sample @sample %%ETCDIR%%/lists/localexceptionurllist.sample +@sample %%ETCDIR%%/lists/localgreysiteiplist.sample @sample %%ETCDIR%%/lists/localgreysitelist.sample +@sample %%ETCDIR%%/lists/localgreysslsiteiplist.sample @sample %%ETCDIR%%/lists/localgreysslsitelist.sample @sample %%ETCDIR%%/lists/localgreyurllist.sample @sample %%ETCDIR%%/lists/logregexpurllist.sample +@sample %%ETCDIR%%/lists/logsiteiplist.sample @sample %%ETCDIR%%/lists/logsitelist.sample @sample %%ETCDIR%%/lists/logurllist.sample +@sample %%ETCDIR%%/lists/nocheckcertsiteiplist.sample @sample %%ETCDIR%%/lists/nocheckcertsitelist.sample %%ETCDIR%%/lists/phraselists/badwords/weighted_dutch %%ETCDIR%%/lists/phraselists/badwords/weighted_french @@ -143,7 +168,7 @@ %%ETCDIR%%/lists/phraselists/weapons/weighted %%ETCDIR%%/lists/phraselists/weapons/weighted_portuguese %%ETCDIR%%/lists/phraselists/webmail/weighted -%%ETCDIR%%/lists/pics +@sample %%ETCDIR%%/lists/refererexceptionsiteiplist.sample @sample %%ETCDIR%%/lists/refererexceptionsitelist.sample @sample %%ETCDIR%%/lists/refererexceptionurllist.sample @sample %%ETCDIR%%/lists/searchregexplist.sample @@ -159,89 +184,115 @@ sbin/e2guardian %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/FAQ.html %%PORTDOCS%%%%DOCSDIR%%/Plugins +%%DATADIR%%/blockedflash.swf %%DATADIR%%/e2guardian.pl %%DATADIR%%/languages/arspanish/fancydmtemplate.html %%DATADIR%%/languages/arspanish/messages +%%DATADIR%%/languages/arspanish/neterr_template.html %%DATADIR%%/languages/arspanish/template.html %%DATADIR%%/languages/bulgarian/fancydmtemplate.html %%DATADIR%%/languages/bulgarian/messages +%%DATADIR%%/languages/bulgarian/neterr_template.html %%DATADIR%%/languages/bulgarian/template.html %%DATADIR%%/languages/chinesebig5/fancydmtemplate.html %%DATADIR%%/languages/chinesebig5/messages +%%DATADIR%%/languages/chinesebig5/neterr_template.html %%DATADIR%%/languages/chinesebig5/template.html %%DATADIR%%/languages/chinesegb2312/fancydmtemplate.html %%DATADIR%%/languages/chinesegb2312/messages +%%DATADIR%%/languages/chinesegb2312/neterr_template.html %%DATADIR%%/languages/chinesegb2312/template.html %%DATADIR%%/languages/czech/fancydmtemplate.html %%DATADIR%%/languages/czech/messages +%%DATADIR%%/languages/czech/neterr_template.html %%DATADIR%%/languages/czech/template.html %%DATADIR%%/languages/danish/fancydmtemplate.html %%DATADIR%%/languages/danish/messages +%%DATADIR%%/languages/danish/neterr_template.html %%DATADIR%%/languages/danish/template.html %%DATADIR%%/languages/dutch/fancydmtemplate.html %%DATADIR%%/languages/dutch/messages +%%DATADIR%%/languages/dutch/neterr_template.html %%DATADIR%%/languages/dutch/template.html %%DATADIR%%/languages/french/fancydmtemplate.html %%DATADIR%%/languages/french/messages +%%DATADIR%%/languages/french/neterr_template.html %%DATADIR%%/languages/french/template.html %%DATADIR%%/languages/german/fancydmtemplate.html %%DATADIR%%/languages/german/messages +%%DATADIR%%/languages/german/neterr_template.html %%DATADIR%%/languages/german/template.html %%DATADIR%%/languages/hebrew/fancydmtemplate.html %%DATADIR%%/languages/hebrew/messages +%%DATADIR%%/languages/hebrew/neterr_template.html %%DATADIR%%/languages/hebrew/template.html %%DATADIR%%/languages/hungarian/fancydmtemplate.html %%DATADIR%%/languages/hungarian/messages +%%DATADIR%%/languages/hungarian/neterr_template.html %%DATADIR%%/languages/hungarian/template.html %%DATADIR%%/languages/indonesian/fancydmtemplate.html %%DATADIR%%/languages/indonesian/messages +%%DATADIR%%/languages/indonesian/neterr_template.html %%DATADIR%%/languages/indonesian/template.html %%DATADIR%%/languages/italian/fancydmtemplate.html %%DATADIR%%/languages/italian/messages +%%DATADIR%%/languages/italian/neterr_template.html %%DATADIR%%/languages/italian/template.html %%DATADIR%%/languages/japanese/fancydmtemplate.html %%DATADIR%%/languages/japanese/messages +%%DATADIR%%/languages/japanese/neterr_template.html %%DATADIR%%/languages/japanese/template.html %%DATADIR%%/languages/lithuanian/fancydmtemplate.html %%DATADIR%%/languages/lithuanian/messages +%%DATADIR%%/languages/lithuanian/neterr_template.html %%DATADIR%%/languages/lithuanian/template.html %%DATADIR%%/languages/malay/fancydmtemplate.html %%DATADIR%%/languages/malay/messages +%%DATADIR%%/languages/malay/neterr_template.html %%DATADIR%%/languages/malay/template.html %%DATADIR%%/languages/mxspanish/fancydmtemplate.html %%DATADIR%%/languages/mxspanish/messages +%%DATADIR%%/languages/mxspanish/neterr_template.html %%DATADIR%%/languages/mxspanish/template.html %%DATADIR%%/languages/polish/fancydmtemplate.html %%DATADIR%%/languages/polish/messages +%%DATADIR%%/languages/polish/neterr_template.html %%DATADIR%%/languages/polish/template.html %%DATADIR%%/languages/portuguese/fancydmtemplate.html %%DATADIR%%/languages/portuguese/messages -%%DATADIR%%/languages/portuguese/messagesaccents +%%DATADIR%%/languages/portuguese/neterr_template.html %%DATADIR%%/languages/portuguese/template.html %%DATADIR%%/languages/ptbrazilian/fancydmtemplate.html %%DATADIR%%/languages/ptbrazilian/messages +%%DATADIR%%/languages/ptbrazilian/neterr_template.html %%DATADIR%%/languages/ptbrazilian/template.html %%DATADIR%%/languages/russian-1251/fancydmtemplate.html %%DATADIR%%/languages/russian-1251/messages +%%DATADIR%%/languages/russian-1251/neterr_template.html %%DATADIR%%/languages/russian-1251/template.html %%DATADIR%%/languages/russian-koi8-r/fancydmtemplate.html %%DATADIR%%/languages/russian-koi8-r/messages +%%DATADIR%%/languages/russian-koi8-r/neterr_template.html %%DATADIR%%/languages/russian-koi8-r/template.html %%DATADIR%%/languages/slovak/fancydmtemplate.html %%DATADIR%%/languages/slovak/messages +%%DATADIR%%/languages/slovak/neterr_template.html %%DATADIR%%/languages/slovak/template.html %%DATADIR%%/languages/spanish/fancydmtemplate.html %%DATADIR%%/languages/spanish/messages +%%DATADIR%%/languages/spanish/neterr_template.html %%DATADIR%%/languages/spanish/template.html %%DATADIR%%/languages/swedish/fancydmtemplate.html %%DATADIR%%/languages/swedish/messages +%%DATADIR%%/languages/swedish/neterr_template.html %%DATADIR%%/languages/swedish/template.html %%DATADIR%%/languages/turkish/fancydmtemplate.html %%DATADIR%%/languages/turkish/messages +%%DATADIR%%/languages/turkish/neterr_template.html %%DATADIR%%/languages/turkish/template.html %%DATADIR%%/languages/ukenglish/fancydmtemplate.html %%DATADIR%%/languages/ukenglish/messages -%%DATADIR%%/languages/ukenglish/messages.alt +%%DATADIR%%/languages/ukenglish/neterr_template.html %%DATADIR%%/languages/ukenglish/template.html %%DATADIR%%/scripts/bsd-init %%DATADIR%%/scripts/e2guardian @@ -250,4 +301,3 @@ sbin/e2guardian %%DATADIR%%/scripts/solaris-init %%DATADIR%%/scripts/systemv-init %%DATADIR%%/transparent1x1.gif -%%DATADIR%%/blockedflash.swf