View | Details | Raw Unified | Return to bug 102944
Collapse All | Expand All

(-)Makefile (-47 / +130 lines)
Lines 8-14 Link Here
8
8
9
PORTNAME=	amavisd-new
9
PORTNAME=	amavisd-new
10
PORTVERSION=	2.4.2
10
PORTVERSION=	2.4.2
11
PORTREVISION=	2
11
PORTREVISION=	3
12
PORTEPOCH=	1
12
PORTEPOCH=	1
13
CATEGORIES=	security
13
CATEGORIES=	security
14
MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
14
MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
Lines 20-26 Link Here
20
COMMENT=	Performance-enhanced daemonized version of amavis-perl
20
COMMENT=	Performance-enhanced daemonized version of amavis-perl
21
21
22
RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
22
RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \
23
		${SITE_PERL}/MIME/Words.pm:${PORTSDIR}/mail/p5-MIME-Tools \
23
		${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
24
		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
24
		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
25
		${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
25
		${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
26
		${SITE_PERL}/${PERL_ARCH}/Convert/UUlib.pm:${PORTSDIR}/converters/p5-Convert-UUlib \
26
		${SITE_PERL}/${PERL_ARCH}/Convert/UUlib.pm:${PORTSDIR}/converters/p5-Convert-UUlib \
Lines 29-41 Link Here
29
		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
29
		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
30
		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
30
		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
31
		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
31
		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
32
		${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
32
		${SITE_PERL}/IO/Wrap.pm:${PORTSDIR}/devel/p5-IO-stringy \
33
		${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
33
		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
34
		${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB \
34
		${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server
35
		${LOCALBASE}/bin/cabextract:${PORTSDIR}/archivers/cabextract \
36
		${LOCALBASE}/bin/rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
37
35
38
USE_PERL5_RUN=	yes
36
USE_PERL5_RUN=	yes
37
GNU_CONFIGURE=	yes
38
CONFIGURE_ARGS=	--with-user=${AMAVISUSER} --with-runtime-dir=${AMAVISDIR}
39
CONFIGURE_WRKSRC=	${WRKSRC}/helper-progs
40
BUILD_WRKSRC=	${WRKSRC}/helper-progs
39
41
40
AMAVISUSER?=	vscan
42
AMAVISUSER?=	vscan
41
AMAVISGROUP?=	vscan
43
AMAVISGROUP?=	vscan
Lines 44-69 Link Here
44
46
45
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.p.+//}
47
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.p.+//}
46
48
47
OPTIONS=	MYSQL	"MySQL support"		off \
49
OPTIONS=	BDB	"Use BerkeleyDB for nanny/cache/snmp"	on \
48
		PGSQL	"PgSQL support"		off \
50
		SQLITE	"Use SQLite for lookups/logging/quarantine"	off \
49
		LDAP	"LDAP support"		off \
51
		MYSQL	"Use MySQL for lookups/logging/quarantine"		off \
50
		MILTER	"sendmail milter support" on \
52
		PGSQL	"Use PgSQL for lookups/logging/quarantine"		off \
51
		RAR	"rar support"	on \
53
		LDAP	"Use LDAP for lookups"		off \
52
		ARJ	"arj support"	on \
54
		SASL	"Use SASL authentication"	off \
53
		LHA	"lha support"	on \
55
		MILTER	"Sendmail milter support" on \
54
		ARC	"arc support"	on \
56
		NEW_MILTER	"New sendmail milter support (external module)"	off \
55
		ZOO	"zoo support with zoo archiver"	on \
57
		SPAMASSASSIN	"Use mail/p5-Mail-SpamAssassin"	on \
56
		UNZOO	"zoo support with unzoo archiver"	off \
58
		P0F	"Passive operating system fingerprinting"	off \
57
		LZOP	"lzop support"	on \
59
		FILE	"Use newer file(1) utility from ports"	off \
58
		FREEZE	"freeze support"	on
60
		RAR	"RAR support with archivers/rar"	off \
61
		UNRAR	"RAR support with archivers/unrar"	on \
62
		ARJ	"ARJ support with archivers/arj"	on \
63
		UNARJ	"ARJ support with archivers/unarj"	off \
64
		LHA	"LHA support with archivers/lha"	on \
65
		ARC	"ARC support with archivers/arc"	on \
66
		NOMARCH	"ARC support with archivers/nomarch"	off \
67
		CAB	"CAB support with archivers/cabextract"	on \
68
		RPM	"RPM support with archivers/rpm2cpio"	on \
69
		ZOO	"ZOO support with archivers/zoo"	on \
70
		UNZOO	"ZOO support with archivers/unzoo"	off \
71
		LZOP	"LZOP support with archivers/lzop"	on \
72
		FREEZE	"FREEZE support with archivers/freeze"	on \
73
		TNEF	"Add external tnef decoder converters/tnef"	off
59
74
60
SUB_FILES=	pkg-install pkg-deinstall pkg-message
75
SUB_FILES=	pkg-install pkg-deinstall pkg-message
61
76
62
SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
77
SUB_LIST+=	AMAVISUSER=${AMAVISUSER} \
63
		AMAVISGROUP=${AMAVISGROUP} \
78
		AMAVISGROUP=${AMAVISGROUP} \
64
		AMAVISDIR=${AMAVISDIR} \
79
		AMAVISDIR=${AMAVISDIR} \
65
		AMAVISQUARANTINE=${AMAVISQUARANTINE} \
80
		AMAVISQUARANTINE=${AMAVISQUARANTINE}
66
		DOCSDIR=${DOCSDIR}
81
82
PLIST_SUB+=	AMAVIS_NOAMAVIS=${AMAVIS_NOAMAVIS} \
83
		AMAVIS_NOMILTER=${AMAVIS_NOMILTER} \
84
		AMAVIS_NOP0F=${AMAVIS_NOP0F}
67
85
68
.include <bsd.port.pre.mk>
86
.include <bsd.port.pre.mk>
69
87
Lines 79-100 Link Here
79
AMAVIS_NOMILTER="@comment "
97
AMAVIS_NOMILTER="@comment "
80
.endif
98
.endif
81
99
82
PLIST_SUB+=	AMAVIS_NOMILTER=${AMAVIS_NOMILTER} \
100
.if defined(WITH_BDB)
83
		AMAVIS_NOAMAVIS=${AMAVIS_NOAMAVIS} \
101
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB
84
		RC_DIR=${RC_DIR} \
85
		RC_SUFX=${RC_SUFX}
86
87
.if defined(AMAVIS_NOAMAVIS)
88
do-build:
89
	@${ECHO} libmilter not available, not building amavis-milter and amavis
90
.else
91
GNU_CONFIGURE=	yes
92
CONFIGURE_ARGS=	--with-user=${AMAVISUSER} --with-runtime-dir=${AMAVISDIR}
93
CONFIGURE_WRKSRC=	${WRKSRC}/helper-progs
94
BUILD_WRKSRC=	${WRKSRC}/helper-progs
95
.endif
102
.endif
96
103
97
SED_SCRIPT=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
104
.if defined(WITH_SQLITE)
105
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
106
.endif
98
107
99
.if defined(WITH_MYSQL)
108
.if defined(WITH_MYSQL)
100
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
109
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
Lines 108-114 Link Here
108
RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
117
RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
109
.endif
118
.endif
110
119
120
.if defined(WITH_SASL)
121
RUN_DEPENDS+=	${SITE_PERL}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL
122
.endif
123
124
.if defined(WITH_NEW_MILTER)
125
RUN_DEPENDS+=	${LOCALBASE}/sbin/amavisd-milter:${PORTSDIR}/security/amavisd-milter
126
.endif
127
128
.if defined(WITH_SPAMASSASSIN)
129
RUN_DEPENDS+=	${SITE_PERL}/Mail/SpamAssassin.pm:${PORTSDIR}/mail/p5-Mail-SpamAssassin
130
.endif
131
132
.if defined(WITH_P0F)
133
RUN_DEPENDS+=	${LOCALBASE}/bin/p0f:${PORTSDIR}/net-mgmt/p0f
134
USE_RC_SUBR+=	p0fanalyzer.sh
135
.else
136
AMAVIS_NOP0F=	"@comment "
137
.endif
138
139
.if defined(WITH_FILE)
140
RUN_DEPENDS+=	${LOCALBASE}/bin/file:${PORTSDIR}/sysutils/file
141
.endif
142
111
.if defined(WITH_RAR)
143
.if defined(WITH_RAR)
144
RUN_DEPENDS+=	${LOCALBASE}/bin/rar:${PORTSDIR}/archivers/rar
145
.endif
146
147
.if defined(WITH_UNRAR)
112
RUN_DEPENDS+=	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar
148
RUN_DEPENDS+=	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar
113
.endif
149
.endif
114
150
Lines 116-121 Link Here
116
RUN_DEPENDS+=	${LOCALBASE}/bin/arj:${PORTSDIR}/archivers/arj
152
RUN_DEPENDS+=	${LOCALBASE}/bin/arj:${PORTSDIR}/archivers/arj
117
.endif
153
.endif
118
154
155
.if defined(WITH_UNARJ)
156
RUN_DEPENDS+=	${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj
157
.endif
158
119
.if defined(WITH_LHA)
159
.if defined(WITH_LHA)
120
RUN_DEPENDS+=	${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha
160
RUN_DEPENDS+=	${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha
121
.endif
161
.endif
Lines 124-129 Link Here
124
RUN_DEPENDS+=	${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc
164
RUN_DEPENDS+=	${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc
125
.endif
165
.endif
126
166
167
.if defined(WITH_NOMARCH)
168
RUN_DEPENDS+=	${LOCALBASE}/bin/nomarch:${PORTSDIR}/archivers/nomarch
169
.endif
170
171
.if defined(WITH_CAB)
172
RUN_DEPENDS+=	${LOCALBASE}/bin/cabextract:${PORTSDIR}/archivers/cabextract
173
.endif
174
175
.if defined(WITH_RPM)
176
RUN_DEPENDS+=	${LOCALBASE}/bin/rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
177
.endif
178
127
.if defined(WITH_ZOO)
179
.if defined(WITH_ZOO)
128
RUN_DEPENDS+=	${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo
180
RUN_DEPENDS+=	${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo
129
.endif
181
.endif
Lines 140-149 Link Here
140
RUN_DEPENDS+=	${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze
192
RUN_DEPENDS+=	${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze
141
.endif
193
.endif
142
194
195
.if defined(WITH_TNEF)
196
RUN_DEPENDS+=	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
197
.endif
198
143
post-patch:
199
post-patch:
144
.for f in amavisd.conf amavisd.conf-sample amavisd amavisd-agent amavisd-nanny amavisd-release
200
.for f in amavisd.conf amavisd.conf-sample amavisd amavisd-agent amavisd-nanny amavisd-release
145
	@${REINPLACE_CMD} ${SED_SCRIPT} -e "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${f}
201
	@${REINPLACE_CMD} "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${f}
202
.endfor
203
.for i in amavisd.conf amavisd.conf-sample
204
	@${REINPLACE_CMD} -e "s|$daemon_user  = \'vscan\';|$daemon_user  = \'${AMAVISUSER}\';|" \
205
			-e "s|$daemon_group = \'vscan\';|$daemon_group = \'${AMAVISGROUP}\';|" \
206
			-e "s|/var/amavis|${AMAVISDIR}|" \
207
			-e "s|/var/lib/amavis|${AMAVISDIR}|" \
208
			-e 's|$$log_level = 2;|$$log_level = 0;|' \
209
			-e "s|/var/virusmails|${AMAVISQUARANTINE}|" \
210
			${WRKSRC}/${i}
146
.endfor
211
.endfor
212
	@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-agent
213
	@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-nanny
214
	@${REINPLACE_CMD} "s|#define HAVE_MKTEMP|#undef HAVE_MKTEMP|" \
215
			${WRKSRC}/helper-progs/config.h.in
216
	@${REINPLACE_CMD} "s|/etc/amavisd.conf|${PREFIX}/etc/amavisd.conf|" \
217
			${WRKSRC}/amavisd
218
219
.if defined(AMAVIS_NOAMAVIS)
220
do-configure:
221
do-build:
222
	@${ECHO} libmilter not available, not building amavis-milter and amavis
223
.endif
147
224
148
pre-install:
225
pre-install:
149
	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
226
	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
Lines 155-175 Link Here
155
.if !defined(AMAVIS_NOMILTER)
232
.if !defined(AMAVIS_NOMILTER)
156
	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin
233
	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin
157
.endif
234
.endif
158
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin
235
.if defined(WITH_P0F)
159
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd-agent ${PREFIX}/sbin
236
	${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${PREFIX}/sbin
160
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd-nanny ${PREFIX}/sbin
161
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd-release ${PREFIX}/sbin
162
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
163
.if !exists(${PREFIX}/etc/amavisd.conf)
164
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${PREFIX}/etc
165
.endif
237
.endif
238
.for i in amavisd amavisd-agent amavisd-nanny amavisd-release
239
	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/sbin
240
.endfor
241
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
166
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-sample ${PREFIX}/etc/amavisd.conf-sample
242
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-sample ${PREFIX}/etc/amavisd.conf-sample
167
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${PREFIX}/etc/amavisd.conf-default
243
	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${PREFIX}/etc/amavisd.conf-default
244
.if !exists(${PREFIX}/etc/amavisd.conf)
245
#
246
#  This can contain sensitive information, e.g. SQL passwords, so it should be handled
247
#  with care.
248
#
249
	${INSTALL} -o root -g ${AMAVISGROUP} -m 640 ${WRKSRC}/amavisd.conf ${PREFIX}/etc
250
.endif
168
.if !defined(NOPORTDOCS)
251
.if !defined(NOPORTDOCS)
169
	@${MKDIR} ${DOCSDIR}
252
	@${MKDIR} ${DOCSDIR}
170
. for FILE in AAAREADME.first INSTALL LDAP.schema LICENSE RELEASE_NOTES README_FILES/*
253
.for i in AAAREADME.first INSTALL LDAP.schema LICENSE RELEASE_NOTES README_FILES/*
171
	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
254
	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
172
. endfor
255
.endfor
173
.endif
256
.endif
174
257
175
post-install:
258
post-install:
(-)pkg-plist (-2 / +1 lines)
Lines 1-6 Link Here
1
@comment $FreeBSD: ports/security/amavisd-new/pkg-plist,v 1.19 2006/05/12 02:30:43 clsung Exp $
1
@comment $FreeBSD: ports/security/amavisd-new/pkg-plist,v 1.19 2006/05/12 02:30:43 clsung Exp $
2
%%AMAVIS_NOMILTER%%@unexec %%RC_DIR%%/amavis-milter%%RC_SUFX%% stop > /dev/null 2>&1 || true
3
@unexec %%RC_DIR%%/amavisd%%RC_SUFX%% stop > /dev/null 2>&1 || true
4
%%PORTDOCS%%%%DOCSDIR%%/AAAREADME.first
2
%%PORTDOCS%%%%DOCSDIR%%/AAAREADME.first
5
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
3
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
6
%%PORTDOCS%%%%DOCSDIR%%/LDAP.schema
4
%%PORTDOCS%%%%DOCSDIR%%/LDAP.schema
Lines 39-44 Link Here
39
etc/amavisd.conf-sample
37
etc/amavisd.conf-sample
40
%%AMAVIS_NOAMAVIS%%sbin/amavis
38
%%AMAVIS_NOAMAVIS%%sbin/amavis
41
%%AMAVIS_NOMILTER%%sbin/amavis-milter
39
%%AMAVIS_NOMILTER%%sbin/amavis-milter
40
%%AMAVIS_NOP0F%%sbin/p0f-analyzer.pl
42
sbin/amavisd
41
sbin/amavisd
43
sbin/amavisd-agent
42
sbin/amavisd-agent
44
sbin/amavisd-nanny
43
sbin/amavisd-nanny
(-)files/patch-amavisd (-11 / +11 lines)
Lines 1-14 Link Here
1
--- amavisd.orig	Tue Jun 27 13:31:56 2006
1
--- amavisd.old	Fri Aug 18 13:01:43 2006
2
+++ amavisd	Mon Jul 31 00:44:09 2006
2
+++ amavisd	Fri Aug 18 13:01:51 2006
3
@@ -9335,7 +9335,7 @@
4
 Amavis::Conf::build_default_maps();
5
 
6
 # default location of the config file if none specified
7
-push(@config_files, '/etc/amavisd.conf')  if !@config_files;
8
+push(@config_files, '%%PREFIX%%/etc/amavisd.conf')  if !@config_files;
9
 # Read/execute the config file, which may override default settings
10
 Amavis::Conf::read_config(@config_files);
11
 
12
@@ -12049,15 +12049,20 @@
3
@@ -12049,15 +12049,20 @@
13
             my($bounced) = $msginfo->dsn_sent;
4
             my($bounced) = $msginfo->dsn_sent;
14
             for my $r (@{$msginfo->per_recip_data}) {
5
             for my $r (@{$msginfo->per_recip_data}) {
Lines 38-40 Link Here
38
               $self->smtp_resp(0, $resp);
29
               $self->smtp_resp(0, $resp);
39
             }
30
             }
40
           }
31
           }
32
@@ -15055,6 +15060,8 @@
33
     local_tests_only  => $sa_local_tests_only,
34
     home_dir_for_helpers => $helpers_home,
35
     stop_at_threshold => 0,
36
+    LOCAL_STATE_DIR   => '/var/lib',
37
+    PREFIX            => '/usr/local',
38
 #   DEF_RULES_DIR     => '/usr/local/share/spamassassin',
39
 #   LOCAL_RULES_DIR   => '/etc/mail/spamassassin',
40
 #see man Mail::SpamAssassin for other options
(-)files/patch-amavisd-agent (-11 lines)
Removed Link Here
1
--- amavisd-agent.orig	Sun Jun 19 18:26:43 2005
2
+++ amavisd-agent	Sun Jun 19 18:28:04 2005
3
@@ -107,7 +107,7 @@
4
 # main program starts here
5
   $SIG{INT} = sub { die "\n" };  # do the END code block
6
   my($env) = BerkeleyDB::Env->new(
7
-    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
8
+    '-Home'=>'%%AMAVISDIR%%/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
9
   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
10
   my($db) = BerkeleyDB::Hash->new(
11
     '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env );
(-)files/patch-amavisd-nanny (-11 lines)
Removed Link Here
1
--- amavisd-nanny.orig	Tue Aug 24 16:34:51 2004
2
+++ amavisd-nanny	Wed Aug 25 12:42:23 2004
3
@@ -52,7 +52,7 @@
4
 my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this
5
                         # many seconds
6
7
-my($db_home) = '/var/amavis/db';  # DB databases directory
8
+my($db_home) = '%%AMAVISDIR%%/db';  # DB databases directory
9
 my($dbfile)  = 'nanny.db';
10
 my($wakeuptime) = 2;  # seconds
11
(-)files/patch-amavisd.conf (-22 lines)
Removed Link Here
1
--- amavisd.conf.orig	Tue Jul  4 11:13:34 2006
2
+++ amavisd.conf	Tue Jul  4 11:17:15 2006
3
@@ -14,15 +14,15 @@
4
 # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
5
 
6
 $max_servers = 2;            # num of pre-forked children (2..15 is common), -m
7
-$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
8
-$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
9
+$daemon_user  = '%%AMAVISUSER%%';     # (no default;  customary: vscan or amavis), -u
10
+$daemon_group = '%%AMAVISGROUP%%';     # (no default;  customary: vscan or amavis), -g
11
 
12
 $mydomain = 'example.com';   # a convenient default for other settings
13
 
14
-# $MYHOME = '/var/amavis';   # a convenient default for other settings, -H
15
+# $MYHOME = '%%AMAVISDIR%%';   # a convenient default for other settings, -H
16
 $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to exist, -T
17
 $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
18
-$QUARANTINEDIR = '/var/virusmails';  # -Q
19
+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';  # -Q
20
 # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
21
 
22
 # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef, -R
(-)files/patch-amavisd.conf-sample (-40 lines)
Removed Link Here
1
--- amavisd.conf-sample.orig	Tue Jul  4 11:06:53 2006
2
+++ amavisd.conf-sample	Tue Jul  4 11:09:07 2006
3
@@ -63,7 +63,7 @@
4
 # $MYHOME serves as a quick default for some other configuration settings.
5
 # More refined control is available with each individual setting further down.
6
 # $MYHOME is not used directly by the program. No trailing slash!
7
-#$MYHOME = '/var/lib/amavis';   # (default is '/var/amavis'), -H
8
+#$MYHOME = '%%AMAVISDIR%%';   # (default is '/var/amavis'), -H
9
 
10
 # $mydomain serves as a quick default for some other configuration settings.
11
 # More refined control is available with each individual setting further down.
12
@@ -74,8 +74,8 @@
13
 
14
 # Set the user and group to which the daemon will change if started as root
15
 # (otherwise just keeps the UID unchanged, and these settings have no effect):
16
-$daemon_user  = 'vscan';   # (no default;  customary: vscan or amavis), -u
17
-$daemon_group = 'vscan';   # (no default;  customary: vscan or amavis), -g
18
+$daemon_user  = '%%AMAVISUSER%%';   # (no default;  customary: vscan or amavis), -u
19
+$daemon_group = '%%AMAVISGROUP%%';   # (no default;  customary: vscan or amavis), -g
20
 
21
 # Runtime working directory (cwd), and a place where
22
 # temporary directories for unpacking mail are created.
23
@@ -310,7 +310,7 @@
24
 # 3: server, client
25
 # 4: decompose parts
26
 # 5: more debug details
27
-$log_level = 2;		   # (defaults to 0), -d
28
+$log_level = 0;		   # (defaults to 0), -d
29
 
30
 # Customizable template for the most interesting log file entry (e.g. with
31
 # $log_level=0) (take care to properly quote Perl special characters like '\')
32
@@ -684,7 +684,7 @@
33
 #   or a directory (no trailing slash)
34
 #   (the default value is undef, meaning no quarantine)
35
 #
36
-$QUARANTINEDIR = '/var/virusmails';  # -Q
37
+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';  # -Q
38
 
39
 #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
40
 
(-)files/patch-config.h.in (-11 lines)
Removed Link Here
1
--- helper-progs/config.h.in.orig	Mon Mar  6 00:26:08 2006
2
+++ helper-progs/config.h.in		Tue Apr  4 08:21:29 2006
3
@@ -17,7 +17,7 @@
4
 #define HAVE_MKDTEMP
5
 
6
 /* Define if you have the mktemp function, undefine otherwise */
7
-#define HAVE_MKTEMP
8
+#undef HAVE_MKTEMP
9
 
10
 /* Define if we have the snprintf function, undefine otherwise */
11
 #define HAVE_SNPRINTF
(-)files/pkg-message.in (-2 / +10 lines)
Lines 13-23 Link Here
13
13
14
    amavisd_enable="YES"
14
    amavisd_enable="YES"
15
15
16
 If you want to use the amavis sendmail milter interface,
16
 If you have installed and want to use the amavis sendmail milter interface,
17
 you need the following additional line in /etc/rc.conf
17
 you need the following additional line in /etc/rc.conf:
18
18
19
    amavis_milter_enable="YES"
19
    amavis_milter_enable="YES"
20
20
21
 If you have installed and want to use the p0fanalyzer interface,
22
 you need the following additional lines in /etc/rc.conf
23
 (with modifications according to your needs):
24
25
    amavisd_p0fanalyzer_enable="YES"
26
    amavisd_p0fanalyzer_p0f_interface='bge0'
27
    amavisd_p0fanalyzer_p0f_filter='tcp dst port 25'
28
21
 Configuration templates are available in %%PREFIX%%/etc
29
 Configuration templates are available in %%PREFIX%%/etc
22
 as amavisd.conf-dist, amavisd.conf-sample and amavisd.conf-default.
30
 as amavisd.conf-dist, amavisd.conf-sample and amavisd.conf-default.
23
 Documentation is available in %%DOCSDIR%%.
31
 Documentation is available in %%DOCSDIR%%.

Return to bug 102944