1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
--- a/mimedefang-filter.5.in
+++ b/mimedefang-filter.5.in
@@ -20,7 +20,7 @@ directory and the e-mail message is spli
Each part is represented internally as an instance of MIME::Entity.
.PP
-2) If the file \fB@CONFDIR_EVAL@/mimedefang-filter.pl\fR defines a
+2) If the file \fB@sysconfdir@/mail/mimedefang-filter.pl\fR defines a
Perl function called \fBfilter_begin\fR, it is called with a single
argument consisting of a MIME::Entity representing the parsed e-mail
message. Any return value is ignored.
@@ -1738,7 +1738,7 @@ be used:
@CONFDIR_EVAL@/sa-mimedefang.cf
.TP
.B o
-@CONFDIR_EVAL@/spamassassin/sa-mimedefang.cf
+@sysconfdir@/mail/sa-mimedefang.cf
.TP
.B o
@CONFDIR_EVAL@/spamassassin/local.cf
--- a/mimedefang.pl.in
+++ b/mimedefang.pl.in
@@ -174,6 +174,8 @@ $SophieSock = '@SPOOLDIR@/sophie';
$ClamdSock = '@SPOOLDIR@/clamd.sock';
$TrophieSock = '@SPOOLDIR@/trophie';
+require "/etc/mail/mimedefang.pl.conf";
+
#***********************************************************************
# %PROCEDURE: expand_ipv6_address
# %ARGUMENTS:
@@ -5256,7 +5258,7 @@ sub md_version {
sub main {
my($Filter);
my($workdir);
- $Filter = '@CONFDIR_EVAL@/mimedefang-filter';
+ $Filter = '@sysconfdir@/mail/mimedefang-filter';
$DoStatusTags = 0;
@@ -6877,8 +6879,8 @@ sub spam_assassin_init {
if (!defined($config)) {
if (-r '@CONFDIR_EVAL@/sa-mimedefang.cf') {
$config = '@CONFDIR_EVAL@/sa-mimedefang.cf';
- } elsif (-r '@CONFDIR_EVAL@/spamassassin/sa-mimedefang.cf') {
- $config = '@CONFDIR_EVAL@/spamassassin/sa-mimedefang.cf';
+ } elsif (-r '@CONFDIR_EVAL@/mail/sa-mimedefang.cf') {
+ $config = '@CONFDIR_EVAL@/mail/sa-mimedefang.cf';
} elsif (-r '@CONFDIR_EVAL@/spamassassin/local.cf') {
$config = '@CONFDIR_EVAL@/spamassassin/local.cf';
} else {
|
