View | Details | Raw Unified | Return to bug 235879 | Differences between
and this patch

Collapse All | Expand All

(-)e2guardian/Makefile (-5 / +13 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	e2guardian
4
PORTNAME=	e2guardian
5
PORTVERSION=	5.2.2
5
PORTVERSION=	5.3.1
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
CATEGORIES=	www
7
CATEGORIES=	www
8
8
Lines 17-30 Link Here
17
USES=		autoreconf compiler:c++11-lang libtool pkgconfig python
17
USES=		autoreconf compiler:c++11-lang libtool pkgconfig python
18
USE_GITHUB=	yes
18
USE_GITHUB=	yes
19
19
20
USE_CXXSTD=	c++11
20
USE_RC_SUBR=	e2guardian
21
USE_RC_SUBR=	e2guardian
21
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
22
CONFIGURE_ARGS=	--localstatedir=/var \
23
CONFIGURE_ARGS=	--localstatedir=/var \
23
		--with-logdir=/var/log \
24
		--with-logdir=/var/log \
24
		--with-piddir=/var/run
25
		--with-piddir=/var/run
25
26
26
OPTIONS_DEFINE=	CLISCAN CLAMD ICAP KAV AVAST NTLM DNS EMAIL DEBUG DOCS SSL
27
OPTIONS_RADIO=  AV
27
OPTIONS_DEFAULT=CLAMD DNS
28
OPTIONS_RADIO_AV=AVAST CLAMD KAV
29
OPTIONS_DEFINE=	CLISCAN ICAP NTLM DNS EMAIL DEBUG DOCS SSL TRICKLE
30
OPTIONS_DEFAULT=CLAMD DNS TRICKLE
28
OPTIONS_SUB=	yes
31
OPTIONS_SUB=	yes
29
32
30
CLISCAN_DESC=	Enable support for CLI content scanners
33
CLISCAN_DESC=	Enable support for CLI content scanners
Lines 36-41 Link Here
36
DNS_DESC=	Include DNS authetication plugin
39
DNS_DESC=	Include DNS authetication plugin
37
EMAIL_DESC=	Enable e-mail reporting support
40
EMAIL_DESC=	Enable e-mail reporting support
38
DEBUG_DESC=	Enable debug build mode
41
DEBUG_DESC=	Enable debug build mode
42
TRICKLE_DESC=	Enable the trickle download manager
39
43
40
CONFDIR=	${PREFIX}/etc/e2guardian
44
CONFDIR=	${PREFIX}/etc/e2guardian
41
45
Lines 43-50 Link Here
43
CFLAGS+=	-I${LOCALBASE}/include
47
CFLAGS+=	-I${LOCALBASE}/include
44
48
45
CLISCAN_CONFIGURE_ENABLE=	commandline
49
CLISCAN_CONFIGURE_ENABLE=	commandline
46
CLAMD_CONFIGURE_ENABLE=		clamd=yes
50
CLAMD_CONFIGURE_ENABLE=		clamd
47
CLAMD_RUN_DEPENDS=		${LOCALBASE}/sbin/clamd:security/clamav
51
CLAMD_RUN_DEPENDS=		clamav>=0:security/clamav
48
ICAP_CONFIGURE_ENABLE=		icap
52
ICAP_CONFIGURE_ENABLE=		icap
49
KAV_CONFIGURE_ENABLE=		kavd
53
KAV_CONFIGURE_ENABLE=		kavd
50
AVAST_CONFIGURE_ENABLE=		avastd
54
AVAST_CONFIGURE_ENABLE=		avastd
Lines 54-61 Link Here
54
DNS_CONFIGURE_ENABLE=		dnsauth
58
DNS_CONFIGURE_ENABLE=		dnsauth
55
EMAIL_CONFIGURE_ENABLE=		email
59
EMAIL_CONFIGURE_ENABLE=		email
56
DEBUG_CONFIGURE_ENABLE=		dgdebug
60
DEBUG_CONFIGURE_ENABLE=		dgdebug
61
SSL_USES=			ssl
62
SSL_CONFGIGURE_ENABLE=		sslmitm
57
SSL_LDFLAGS=			-lssl -lcrypto
63
SSL_LDFLAGS=			-lssl -lcrypto
58
SSL_CFLAGS=			-D__SSLMITM -D__SSLCERT
64
SSL_CFLAGS=			-D__SSLMITM -D__SSLCERT
65
TRICKLE_CONFIGURE_ENABLE=	trickledm
59
66
60
.include <bsd.port.options.mk>
67
.include <bsd.port.options.mk>
61
68
Lines 80-85 Link Here
80
		${STAGEDIR}${ETCDIR}/lists/authplugins/ipgroups.sample
87
		${STAGEDIR}${ETCDIR}/lists/authplugins/ipgroups.sample
81
	@${MV} ${STAGEDIR}${ETCDIR}/lists/authplugins/portgroups \
88
	@${MV} ${STAGEDIR}${ETCDIR}/lists/authplugins/portgroups \
82
		${STAGEDIR}${ETCDIR}/lists/authplugins/portgroups.sample
89
		${STAGEDIR}${ETCDIR}/lists/authplugins/portgroups.sample
90
	@${MKDIR} ${STAGEDIR}${ETCDIR}/lists/contentscanners
83
	@${MV} ${STAGEDIR}${ETCDIR}/lists/bannedrooms/default \
91
	@${MV} ${STAGEDIR}${ETCDIR}/lists/bannedrooms/default \
84
		${STAGEDIR}${ETCDIR}/lists/bannedrooms/default.sample
92
		${STAGEDIR}${ETCDIR}/lists/bannedrooms/default.sample
85
	@${MV} ${STAGEDIR}${ETCDIR}/lists/bannedsitelistwithbypass \
93
	@${MV} ${STAGEDIR}${ETCDIR}/lists/bannedsitelistwithbypass \
(-)e2guardian/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1539686941
1
TIMESTAMP = 1551365013
2
SHA256 (e2guardian-e2guardian-v5.2.2_GH0.tar.gz) = 219160755592ee0d05b2f25698ee5a4257330ff2e15ae3ca716df2df0db8b00b
2
SHA256 (e2guardian-e2guardian-v5.3.1_GH0.tar.gz) = 3ccab41663b63c6a654fd9f7bf44f8598689e9940b02434a724dc137961633a9
3
SIZE (e2guardian-e2guardian-v5.2.2_GH0.tar.gz) = 2000439
3
SIZE (e2guardian-e2guardian-v5.3.1_GH0.tar.gz) = 2008811
(-)e2guardian/files/e2guardian.in (-1 / +1 lines)
Lines 1-6 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
#
2
#
3
# $FreeBSD$
3
# $FreeBSD: head/www/e2guardian/files/e2guardian.in 437392 2017-04-01 02:49:39Z wen $
4
#
4
#
5
5
6
# PROVIDE: e2guardian
6
# PROVIDE: e2guardian
(-)e2guardian/pkg-plist (-1 / +1 lines)
Lines 10-16 Link Here
10
%%ICAP%%@sample %%ETCDIR%%/contentscanners/icapscan.conf.sample
10
%%ICAP%%@sample %%ETCDIR%%/contentscanners/icapscan.conf.sample
11
%%CLISCAN%%@sample %%ETCDIR%%/contentscanners/commandlinescan.conf.sample
11
%%CLISCAN%%@sample %%ETCDIR%%/contentscanners/commandlinescan.conf.sample
12
%%KAV%%@sample %%ETCDIR%%/contentscanners/kavdscan.conf.sample
12
%%KAV%%@sample %%ETCDIR%%/contentscanners/kavdscan.conf.sample
13
%%AVAST%%@sample %%ETCDIR%%/contentscanners/avastd.conf.sample
13
%%AVAST%%@sample %%ETCDIR%%/contentscanners/avastdscan.conf.sample
14
@sample %%ETCDIR%%/downloadmanagers/default.conf.sample
14
@sample %%ETCDIR%%/downloadmanagers/default.conf.sample
15
@sample %%ETCDIR%%/e2guardian.conf.sample
15
@sample %%ETCDIR%%/e2guardian.conf.sample
16
@sample %%ETCDIR%%/e2guardianf1.conf.sample
16
@sample %%ETCDIR%%/e2guardianf1.conf.sample

Return to bug 235879