Port across commandline, email and clamd options from dansguardian.

Enable NTLM support.
Bump PKGREVISION.

4 files changed, 61 insertions, 5 deletions

diff --git a/www/e2guardian/Makefile b/www/e2guardian/Makefile
index 941d9e7e3e0..98692135aa9 100644
--- a/www/e2guardian/Makefile
+++ b/www/e2guardian/Makefile
@@ -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_USER}
 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"
 
diff --git a/www/e2guardian/PLIST b/www/e2guardian/PLIST
index a4b54d995c3..471f9bb85f1 100644
--- a/www/e2guardian/PLIST
+++ b/www/e2guardian/PLIST
@@ -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/bannedsitelist
 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
diff --git a/www/e2guardian/files/configfiles.avscan b/www/e2guardian/files/configfiles.avscan
new file mode 100644
index 00000000000..243caedd52b
--- /dev/null
+++ b/www/e2guardian/files/configfiles.avscan
@@ -0,0 +1,4 @@
+lists/contentscanners/exceptionvirusextensionlist
+lists/contentscanners/exceptionvirusmimetypelist
+lists/contentscanners/exceptionvirussitelist
+lists/contentscanners/exceptionvirusurllist
diff --git a/www/e2guardian/options.mk b/www/e2guardian/options.mk
index 471c0005d1f..bdd8d5975a3 100644
--- a/www/e2guardian/options.mk
+++ b/www/e2guardian/options.mk
@@ -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