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

Collapse All | Expand All

(-)maia/Makefile (-9 / +17 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	maia
8
PORTNAME=	maia
9
DISTVERSION=	1.0.3-${SVNREVISION}
9
DISTVERSION=	1.0.3-${SVNREVISION}
10
PORTREVISION=	1
10
CATEGORIES=	security
11
CATEGORIES=	security
11
MASTER_SITES=	http://www.purplehat.org/downloads/maia/
12
MASTER_SITES=	http://www.purplehat.org/downloads/maia/
12
13
Lines 18-23 Link Here
18
		p5-Convert-TNEF>=0.08:${PORTSDIR}/converters/p5-Convert-TNEF \
19
		p5-Convert-TNEF>=0.08:${PORTSDIR}/converters/p5-Convert-TNEF \
19
		p5-Convert-UUlib>=1.08,1:${PORTSDIR}/converters/p5-Convert-UUlib \
20
		p5-Convert-UUlib>=1.08,1:${PORTSDIR}/converters/p5-Convert-UUlib \
20
		p5-Net-CIDR-Lite>=0.18:${PORTSDIR}/net/p5-Net-CIDR-Lite \
21
		p5-Net-CIDR-Lite>=0.18:${PORTSDIR}/net/p5-Net-CIDR-Lite \
22
		p5-forks>=0.34:${PORTSDIR}/devel/p5-forks \
21
		p5-Archive-Zip>=0.10:${PORTSDIR}/archivers/p5-Archive-Zip \
23
		p5-Archive-Zip>=0.10:${PORTSDIR}/archivers/p5-Archive-Zip \
22
		p5-IO-stringy>=1.203:${PORTSDIR}/devel/p5-IO-stringy \
24
		p5-IO-stringy>=1.203:${PORTSDIR}/devel/p5-IO-stringy \
23
		p5-IO-Socket-INET6>=1.27:${PORTSDIR}/net/p5-IO-Socket-INET6 \
25
		p5-IO-Socket-INET6>=1.27:${PORTSDIR}/net/p5-IO-Socket-INET6 \
Lines 28-34 Link Here
28
30
29
# SVN source: https://www.maiamailguard.com/svn/branches/1.0
31
# SVN source: https://www.maiamailguard.com/svn/branches/1.0
30
SVNREVISION=	r1575
32
SVNREVISION=	r1575
31
WRKSRC=		${WRKDIR}/${PORTNAME}-1.0-${SVNREVISION}
32
USE_PERL5_RUN=	5.8.2+
33
USE_PERL5_RUN=	5.8.2+
33
NO_BUILD=	yes
34
NO_BUILD=	yes
34
35
Lines 59-65 Link Here
59
		CRYPT	"Encryption support"	off \
60
		CRYPT	"Encryption support"	off \
60
		IPCOUNTRY	"SpamAssassin IP Country plugin"	on \
61
		IPCOUNTRY	"SpamAssassin IP Country plugin"	on \
61
		DOMAINKEYS	"SpamAssassin DomainKey plugin"	on \
62
		DOMAINKEYS	"SpamAssassin DomainKey plugin"	on \
62
		SPFQUERY	"SpamAssassin SPF Query plugin"	on \
63
		SPF	"SpamAssassin SPF plugin"	on \
64
		DKIM	"SpamAssassin DKIM plugin"	on \
63
		FILE	"Use newer file(1) utility from ports"	on \
65
		FILE	"Use newer file(1) utility from ports"	on \
64
		RAR	"RAR support with archivers/rar"	off \
66
		RAR	"RAR support with archivers/rar"	off \
65
		UNRAR	"RAR support with archivers/unrar"	on \
67
		UNRAR	"RAR support with archivers/unrar"	on \
Lines 197-206 Link Here
197
RUN_DEPENDS+=	${SITE_PERL}/Mail/DomainKeys.pm:${PORTSDIR}/mail/p5-Mail-DomainKeys
199
RUN_DEPENDS+=	${SITE_PERL}/Mail/DomainKeys.pm:${PORTSDIR}/mail/p5-Mail-DomainKeys
198
.endif
200
.endif
199
201
200
.if defined(WITH_SPFQUERY)
202
.if defined(WITH_SPF)
201
RUN_DEPENDS+=	${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
203
RUN_DEPENDS+=	${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
202
.endif
204
.endif
203
205
206
.if defined(WITH_DKIM)
207
RUN_DEPENDS+=	${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM
208
.endif
209
204
.if defined(WITH_FILE)
210
.if defined(WITH_FILE)
205
# security fix, file > 4.21 needed
211
# security fix, file > 4.21 needed
206
RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sysutils/file
212
RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sysutils/file
Lines 277-296 Link Here
277
.endfor
283
.endfor
278
.for i in maiad.conf.dist maiad
284
.for i in maiad.conf.dist maiad
279
	@${REINPLACE_CMD} -e "s|$daemon_user  = \'amavis\';|$daemon_user  = \'${USERS}\';|" \
285
	@${REINPLACE_CMD} -e "s|$daemon_user  = \'amavis\';|$daemon_user  = \'${USERS}\';|" \
280
	    -e "s|$daemon_group = \'amavis\';|$daemon_group = \'${GROUPS}\';|" \
286
		-e "s|$daemon_group = \'amavis\';|$daemon_group = \'${GROUPS}\';|" \
281
	    -e 's|$$log_level = 0;|$$log_level = 1;|' \
287
		-e 's|$$log_level = 0;|$$log_level = 1;|' \
282
	    -e 's|/etc/maiad.conf|${PREFIX}/etc/maiad.conf|' \
288
		-e 's|/etc/maiad.conf|${PREFIX}/etc/maiad.conf|' \
283
	    -e "s|/var/virusmails|${MAIAQUARANTINE}|" ${WRKSRC}/${i}
289
		-e "s|/var/virusmails|${MAIAQUARANTINE}|" ${WRKSRC}/${i}
284
.endfor
290
.endfor
285
.for f in maiad maiad.conf.dist maia.conf.dist scripts/send-quarantine-digests.pl \
291
.for f in maiad maiad.conf.dist maia.conf.dist scripts/send-quarantine-digests.pl \
286
	scripts/process-quarantine.pl scripts/load-sa-rules.pl
292
	scripts/process-quarantine.pl scripts/load-sa-rules.pl
287
		@${REINPLACE_CMD} "s|/var/maiad|${MAIADIR}|" ${WRKSRC}/${f}
293
		@${REINPLACE_CMD} "s|/var/maiad|${MAIADIR}|" ${WRKSRC}/${f}
288
.endfor
294
.endfor
289
.for i in maia.conf.dist scripts/expire-quarantine-cache.pl scripts/stats-snapshot.pl \
295
.for i in maiad maia.conf.dist scripts/expire-quarantine-cache.pl scripts/stats-snapshot.pl \
290
	scripts/maiadbtool.pl scripts/configtest.pl scripts/send-quarantine-reminders.pl \
296
	scripts/maiadbtool.pl scripts/configtest.pl scripts/send-quarantine-reminders.pl \
291
	scripts/send-quarantine-digests.pl scripts/process-quarantine.pl \
297
	scripts/send-quarantine-digests.pl scripts/process-quarantine.pl \
292
	scripts/load-sa-rules.pl
298
	scripts/load-sa-rules.pl
293
		@${REINPLACE_CMD} "s|/etc/maia.conf|${PREFIX}/etc/maia.conf|" ${WRKSRC}/${i}
299
		@${REINPLACE_CMD} "s|/etc/maia/maia.conf|${PREFIX}/etc/maia.conf|" ${WRKSRC}/${i}
294
.endfor
300
.endfor
295
301
296
pre-install:
302
pre-install:
Lines 330-335 Link Here
330
		${CP} -p ${PREFIX}/etc/${maiaconf}.conf.dist \
336
		${CP} -p ${PREFIX}/etc/${maiaconf}.conf.dist \
331
		${PREFIX}/etc/${maiaconf}.conf ; \
337
		${PREFIX}/etc/${maiaconf}.conf ; \
332
	fi
338
	fi
339
	@${CHOWN} ${USERS}:${GROUPS} ${PREFIX}/etc/${maiaconf}.conf \
340
		${PREFIX}/etc/${maiaconf}.conf.dist
333
.endfor
341
.endfor
334
	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
342
	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
335
	@${CHOWN} -R ${USERS}:${GROUPS} ${MAIADIR}/
343
	@${CHOWN} -R ${USERS}:${GROUPS} ${MAIADIR}/
(-)maia/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (maia-1.0.3-r1575.tar.gz) = da82c256752f88f363445a688d8f877f17df1d9395f7f1aeb6db2bb61900dcd9
1
SHA256 (maia-1.0.3-r1575.tar.gz) = 139ea56ad050d8e6cf73f98e92afab6c09be4f05edaaf25cd4326efa4a3cfdbd
2
SIZE (maia-1.0.3-r1575.tar.gz) = 2273711
2
SIZE (maia-1.0.3-r1575.tar.gz) = 2273788
(-)maia/files/pkg-deinstall.in (-2 lines)
Lines 8-18 Link Here
8
MAIAWEB=%%PREFIX%%/www/maia
8
MAIAWEB=%%PREFIX%%/www/maia
9
9
10
if [ "$2" = "POST-DEINSTALL" ]; then
10
if [ "$2" = "POST-DEINSTALL" ]; then
11
12
    if [ -e ${DIR} ]; then
11
    if [ -e ${DIR} ]; then
13
	echo "You should manually remove the \"${DIR}\" directory."
12
	echo "You should manually remove the \"${DIR}\" directory."
14
    fi
13
    fi
15
    
16
    if [ -e ${QUARANTINE} ]; then
14
    if [ -e ${QUARANTINE} ]; then
17
      echo "You should manually remove the \"${QUARANTINE}\" directory."
15
      echo "You should manually remove the \"${QUARANTINE}\" directory."
18
    fi
16
    fi
(-)maia/files/pkg-install.in (-1 lines)
Lines 9-15 Link Here
9
QUARANTINE=%%MAIAQUARANTINE%%
9
QUARANTINE=%%MAIAQUARANTINE%%
10
10
11
if [ "$2" = "PRE-INSTALL" ]; then
11
if [ "$2" = "PRE-INSTALL" ]; then
12
13
    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}
12
    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}
14
    echo "Created \"${DIR}\" directory."
13
    echo "Created \"${DIR}\" directory."
15
    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/db
14
    /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/db
(-)maia/files/pkg-message.in (-8 / +15 lines)
Lines 1-11 Link Here
1
To use Maia-Mailguard, you need to install at least one virus scanner.
2
The following virus scanners are available in the FreeBSD ports
3
collection:
4
1
5
   security/clamav	Clam Antivirus
2
*******************************************************************
6
   security/f-prot	F-Prot Antivirus
3
 To use Maia-Mailguard, you need to install at least one virus scanner.
7
   security/drweb	DrWeb antivirus suite
4
 The following virus scanners are available in the FreeBSD ports
5
 collection:
6
 
7
    security/clamav	Clam Antivirus
8
    security/f-prot	F-Prot Antivirus
9
    security/drweb	DrWeb antivirus suite
8
10
9
Enable Maia-Mailguard in /etc/rc.conf with the following line:
11
 Enable Maia-Mailguard in /etc/rc.conf with the following line:
12
13
    maiad_enable="YES"
14
15
 Configuration templates are available in %%PREFIX%%/etc
16
 as maia.conf.dist and maiad.conf.dist.
17
*******************************************************************
10
18
11
   maiad_enable="YES"
(-)maia/pkg-plist (+1 lines)
Lines 4-9 Link Here
4
@unexec if cmp -s %D/etc/maia.conf.dist %D/etc/maia.conf; then rm -f %D/etc/maia.conf; fi
4
@unexec if cmp -s %D/etc/maia.conf.dist %D/etc/maia.conf; then rm -f %D/etc/maia.conf; fi
5
etc/maia.conf.dist
5
etc/maia.conf.dist
6
@exec if [ ! -f %D/etc/maia.conf ] ; then cp -p %D/%F %B/maia.conf; fi
6
@exec if [ ! -f %D/etc/maia.conf ] ; then cp -p %D/%F %B/maia.conf; fi
7
etc/rc.d/maiad
7
sbin/maiad
8
sbin/maiad
8
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
9
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
9
%%PORTDOCS%%%%DOCSDIR%%/README
10
%%PORTDOCS%%%%DOCSDIR%%/README

Return to bug 160379