diff options
Diffstat (limited to 'mail/exim/files')
| -rw-r--r-- | mail/exim/files/POST-INSTALL-NOTES.exiscan-acl | 10 | ||||
| -rw-r--r-- | mail/exim/files/patch-scripts::exim_install | 4 | ||||
| -rw-r--r-- | mail/exim/files/patch-src::auths::plaintext.c | 11 | ||||
| -rw-r--r-- | mail/exim/files/patch-src::rda.c | 11 | ||||
| -rw-r--r-- | mail/exim/files/patch-src::rewrite.c | 11 | ||||
| -rw-r--r-- | mail/exim/files/patch-src::transports::appendfile.c | 13 |
6 files changed, 12 insertions, 48 deletions
diff --git a/mail/exim/files/POST-INSTALL-NOTES.exiscan-acl b/mail/exim/files/POST-INSTALL-NOTES.exiscan-acl new file mode 100644 index 000000000000..29988db9e86e --- /dev/null +++ b/mail/exim/files/POST-INSTALL-NOTES.exiscan-acl @@ -0,0 +1,10 @@ +This installation of Exim includes Exiscan content scanning support, +from http://duncanthrax.net/exiscan-acl/, which is documented in +${PREFIX}/share/doc/exim/exiscan-acl-spec.txt. The ports tree +includes various content scanners that might be useful, e.g. +mail/p5-Mail-SpamAssassin and security/vscan. + +When Exiscan is actually enabled in the Exim configure file, great +care should be taken to test upgrades, since Exiscan updates tend +to not maintain backward compatibility. + diff --git a/mail/exim/files/patch-scripts::exim_install b/mail/exim/files/patch-scripts::exim_install index 9fdc230687ee..c60ee094efac 100644 --- a/mail/exim/files/patch-scripts::exim_install +++ b/mail/exim/files/patch-scripts::exim_install @@ -15,7 +15,7 @@ @@ -343,7 +342,7 @@ echo sed -e '\\' - echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${SYSTEM_ALIASES_FILE}'\"" '\\' + echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'\"" '\\' - echo " ../src/configure.default > \${CONFIGURE_FILE}" + echo " ../src/configure.default > \${CONFIGURE_FILE}.default" @@ -24,7 +24,7 @@ @@ -352,7 +351,7 @@ if [ "$real" = "" ] ; then sed -e \ - "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${SYSTEM_ALIASES_FILE}'" \ + "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'" \ - ../src/configure.default > ${CONFIGURE_FILE} + ../src/configure.default > ${CONFIGURE_FILE}.default else diff --git a/mail/exim/files/patch-src::auths::plaintext.c b/mail/exim/files/patch-src::auths::plaintext.c deleted file mode 100644 index 4beccd085242..000000000000 --- a/mail/exim/files/patch-src::auths::plaintext.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/auths/plaintext.c.orig Tue Apr 1 14:53:33 2003 -+++ src/auths/plaintext.c Tue Apr 1 14:53:40 2003 -@@ -93,7 +93,7 @@ - if (Ustrcmp(data, "=") == 0) - { - expand_nstring[++expand_nmax] = US""; -- expand_nstring[expand_nmax] = 0; -+ expand_nlength[expand_nmax] = 0; - } - else - { diff --git a/mail/exim/files/patch-src::rda.c b/mail/exim/files/patch-src::rda.c deleted file mode 100644 index 68024128ad7c..000000000000 --- a/mail/exim/files/patch-src::rda.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/rda.c.orig Tue Mar 11 13:20:22 2003 -+++ src/rda.c Tue Apr 22 13:53:10 2003 -@@ -376,7 +376,7 @@ - options, /* specials that are allowed */ - generated, /* where to hang them */ - error, /* for errors */ -- qualify_domain_recipient, /* to qualify \name */ -+ deliver_domain, /* to qualify \name */ - include_directory, /* restrain to directory */ - eblockp); /* for skipped syntax errors */ - } diff --git a/mail/exim/files/patch-src::rewrite.c b/mail/exim/files/patch-src::rewrite.c deleted file mode 100644 index 6a3d31cecb83..000000000000 --- a/mail/exim/files/patch-src::rewrite.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/rewrite.c.orig Tue Mar 11 13:20:22 2003 -+++ src/rewrite.c Tue Apr 15 14:48:37 2003 -@@ -261,7 +261,7 @@ - while (*p2 == ' ') p2++; - pf2 = parse_fix_phrase(p2, Ustrlen(p2), buff2, sizeof(buff2)); - -- start = Ustrlen(buff1) + start + new - p1; -+ start = Ustrlen(pf1) + start + new - p1; - end = start + Ustrlen(newparsed); - new = string_sprintf("%s%.*s%s", pf1, p2 - p1, p1, pf2); - } diff --git a/mail/exim/files/patch-src::transports::appendfile.c b/mail/exim/files/patch-src::transports::appendfile.c deleted file mode 100644 index 9316d277fc6b..000000000000 --- a/mail/exim/files/patch-src::transports::appendfile.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/transports/appendfile.c.orig Tue Mar 11 13:20:23 2003 -+++ src/transports/appendfile.c Tue Apr 15 14:46:18 2003 -@@ -702,7 +702,9 @@ - if (pcre_exec(regex, NULL, CS name, Ustrlen(name), 0, 0, ovector,6) >= 2) - { - int size; -- Ustrncpy(buffer, name + ovector[2], ovector[3] - ovector[2]); -+ int n = ovector[3] - ovector[2]; -+ Ustrncpy(buffer, name + ovector[2], n); -+ buffer[n] = 0; - size = Uatoi(buffer); - sum += size; - DEBUG(D_transport) |