CVS commit: pkgsrc/www/e2guardian

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Mar 15 13:42:04 UTC 2017

Modified Files:
        pkgsrc/www/e2guardian: Makefile PLIST options.mk
Added Files:
        pkgsrc/www/e2guardian/files: configfiles.avscan

Log Message:
Port across commandline, email and clamd options from dansguardian.
Enable NTLM support.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/e2guardian/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/e2guardian/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/e2guardian/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/e2guardian/files/configfiles.avscan

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/e2guardian/Makefile
diff -u pkgsrc/www/e2guardian/Makefile:1.3 pkgsrc/www/e2guardian/Makefile:1.4
--- pkgsrc/www/e2guardian/Makefile:1.3  Tue Mar 14 15:38:01 2017
+++ pkgsrc/www/e2guardian/Makefile      Wed Mar 15 13:42:03 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2017/03/14 15:38:01 sborrill Exp $
+# $NetBSD: Makefile,v 1.4 2017/03/15 13:42:03 sborrill Exp $
 
 DISTNAME=      e2guardian-3.5.1
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=e2guardian/}
 GITHUB_PROJECT=        e2guardian
@@ -46,6 +47,7 @@ CONFIGURE_ARGS+=      --with-proxyuser=${E2G_
 CONFIGURE_ARGS+=       --with-proxygroup=${E2G_GROUP}
 CONFIGURE_ARGS+=       --with-piddir=${VARBASE}/run
 CONFIGURE_ARGS+=       --with-logdir=${VARBASE}/log/${E2G_LOG}
+CONFIGURE_ARGS+=       --enable-ntlm
 
 .include "options.mk"
 

Index: pkgsrc/www/e2guardian/PLIST
diff -u pkgsrc/www/e2guardian/PLIST:1.2 pkgsrc/www/e2guardian/PLIST:1.3
--- pkgsrc/www/e2guardian/PLIST:1.2     Sat Mar 11 17:22:45 2017
+++ pkgsrc/www/e2guardian/PLIST Wed Mar 15 13:42:03 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/03/11 17:22:45 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/03/15 13:42:03 sborrill Exp $
 man/man8/e2guardian.8
 sbin/e2guardian
 share/doc/e2guardian/AuthPlugins
@@ -101,10 +101,13 @@ share/e2guardian/scripts/systemv-init
 share/e2guardian/transparent1x1.gif
 share/examples/e2guardian/authplugins/ident.conf
 share/examples/e2guardian/authplugins/ip.conf
+share/examples/e2guardian/authplugins/proxy-ntlm.conf
 share/examples/e2guardian/authplugins/port.conf
 share/examples/e2guardian/authplugins/proxy-basic.conf
 share/examples/e2guardian/authplugins/proxy-digest.conf
 share/examples/e2guardian/authplugins/proxy-header.conf
+${PLIST.cli}share/examples/e2guardian/contentscanners/commandlinescan.conf
+${PLIST.clamd}share/examples/e2guardian/contentscanners/clamdscan.conf
 share/examples/e2guardian/downloadmanagers/default.conf
 share/examples/e2guardian/downloadmanagers/fancy.conf
 share/examples/e2guardian/e2guardian.conf
@@ -126,6 +129,10 @@ share/examples/e2guardian/lists/bannedsi
 share/examples/e2guardian/lists/bannedsslsitelist
 share/examples/e2guardian/lists/bannedurllist
 share/examples/e2guardian/lists/contentregexplist
+${PLIST.avscan}share/examples/e2guardian/lists/contentscanners/exceptionvirusextensionlist
+${PLIST.avscan}share/examples/e2guardian/lists/contentscanners/exceptionvirusmimetypelist
+${PLIST.avscan}share/examples/e2guardian/lists/contentscanners/exceptionvirussitelist
+${PLIST.avscan}share/examples/e2guardian/lists/contentscanners/exceptionvirusurllist
 share/examples/e2guardian/lists/downloadmanagers/managedextensionlist
 share/examples/e2guardian/lists/downloadmanagers/managedmimetypelist
 share/examples/e2guardian/lists/embededreferersitelist

Index: pkgsrc/www/e2guardian/options.mk
diff -u pkgsrc/www/e2guardian/options.mk:1.1 pkgsrc/www/e2guardian/options.mk:1.2
--- pkgsrc/www/e2guardian/options.mk:1.1        Fri Mar  3 14:09:18 2017
+++ pkgsrc/www/e2guardian/options.mk    Wed Mar 15 13:42:03 2017
@@ -1,11 +1,54 @@
-# $NetBSD: options.mk,v 1.1 2017/03/03 14:09:18 prlw1 Exp $
+# $NetBSD: options.mk,v 1.2 2017/03/15 13:42:03 sborrill Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.e2guardian
-PKG_SUPPORTED_OPTIONS= debug
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS= debug email commandline clamd ssl
+PKG_SUGGESTED_OPTIONS= email ssl
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=       --with-dgdebug
 .endif
+
+##
+## Enables reporting by email
+##
+.if !empty(PKG_OPTIONS:Memail)
+CONFIGURE_ARGS+=       --enable-email
+.endif
+
+##
+## Enables ssl MITM
+##
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=       --enable-sslmitm
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+# PLIST.avscan is shared between content scanners
+PLIST_VARS+=           avscan
+##
+## Enable command line content scanner
+##
+PLIST_VARS+=           cli
+.if !empty(PKG_OPTIONS:Mcommandline)
+CONFIGURE_ARGS+=       --enable-commandline
+PLIST.cli=             yes
+PLIST.avscan=          yes
+EGFILES_EXTRA+=                contentscanners/commandlinescan.conf
+.endif
+
+##
+## Enable ClamD content scanner
+##
+PLIST_VARS+=           clamd
+.if !empty(PKG_OPTIONS:Mclamd)
+CONFIGURE_ARGS+=       --enable-clamd
+PLIST.clamd=           yes
+PLIST.avscan=          yes
+EGFILES_EXTRA+=                contentscanners/clamdscan.conf
+.endif
+
+.if !empty(PLIST.avscan)
+EGFILES_LIST+=         ${.CURDIR}/files/configfiles.avscan
+.endif

Added files:

Index: pkgsrc/www/e2guardian/files/configfiles.avscan
diff -u /dev/null pkgsrc/www/e2guardian/files/configfiles.avscan:1.1
--- /dev/null   Wed Mar 15 13:42:04 2017
+++ pkgsrc/www/e2guardian/files/configfiles.avscan      Wed Mar 15 13:42:04 2017
@@ -0,0 +1,4 @@
+lists/contentscanners/exceptionvirusextensionlist
+lists/contentscanners/exceptionvirusmimetypelist
+lists/contentscanners/exceptionvirussitelist
+lists/contentscanners/exceptionvirusurllist