summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/exim/Makefile78
-rw-r--r--mail/exim/distinfo7
-rw-r--r--mail/exim/files/POST-INSTALL-NOTES.exiscan-acl10
-rw-r--r--mail/exim/files/patch-scripts::exim_install4
-rw-r--r--mail/exim/files/patch-src::auths::plaintext.c11
-rw-r--r--mail/exim/files/patch-src::rda.c11
-rw-r--r--mail/exim/files/patch-src::rewrite.c11
-rw-r--r--mail/exim/files/patch-src::transports::appendfile.c13
-rw-r--r--mail/exim/pkg-plist1
9 files changed, 78 insertions, 68 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 994703120877..68d0939162fa 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -7,18 +7,47 @@
PORTNAME= exim
PORTVERSION= ${EXIM_VERSION}
-PORTREVISION= 2
CATEGORIES= mail
-MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
- http://www.exim.org/ftp/exim4/ \
- ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/
-.if !defined(WITHOUT_EXISCAN)
-MASTER_SITES+= http://duncanthrax.net/exiscan/
-.endif
-DISTFILES= exim-${EXIM_VERSION}.tar.bz2 \
- exim-texinfo-${EXIM_DOCVERSION}.tar.bz2
-.if !defined(WITHOUT_EXISCAN)
-DISTFILES+= exiscan-${EXISCAN_VERSION}.tar.bz2
+MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \
+ ftp://gd.tuwien.ac.at/infosys/mail/exim/%SUBDIR%/ \
+ ftp://ftp.easynet.be/exim/%SUBDIR%/ \
+ ftp://mirror.direct.ca/pub/exim/%SUBDIR%/ \
+ ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/%SUBDIR%/ \
+ ftp://sunsite.auc.dk/pub/mail/exim/%SUBDIR%/ \
+ ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.exim.org/%SUBDIR%/ \
+ ftp://ftp.fu-berlin.de/unix/mail/exim/%SUBDIR%/ \
+ ftp://ftp.tin.org/pub/mail/exim/%SUBDIR%/ \
+ ftp://ftp.freenet.de/pub/ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \
+ ftp://ftp.esat.net/pub/networking/mail/mta/exim/%SUBDIR%/ \
+ ftp://nagoya.linux.or.jp/mirror/exim/%SUBDIR%/ \
+ http://exim.psshee.com/ftp/%SUBDIR%/ \
+ ftp://ftp.nl.uu.net/pub/unix/mail/exim/%SUBDIR%/ \
+ ftp://ftp.demon.nl/pub/mirrors/exim/%SUBDIR%/ \
+ ftp://ftp.easynet.nl/mirror/exim/%SUBDIR%/ \
+ ftp://sunsite.uio.no/pub/mail/exim/%SUBDIR%/ \
+ http://sunsite.icm.edu.pl/pub/unix/mail/exim/%SUBDIR%/ \
+ ftp://ftp.smux.net/pub/exim/%SUBDIR%/ \
+ ftp://ftp.is.co.za/networking/mail/mta/exim/%SUBDIR%/ \
+ ftp://sunsite.cnlab-switch.ch/mirror/exim/%SUBDIR%/ \
+ ftp://ftp.exim.org/pub/exim/%SUBDIR%/ \
+ http://www.us.exim.org/ftp/%SUBDIR%/ \
+ http://exim.stanford.edu/ftp/pub/exim/%SUBDIR%/ \
+ ftp://ftp.fsckit.net/pub/exim/%SUBDIR%/ \
+ http://duncanthrax.net/%SUBDIR%/:exiscan,exiscan_acl
+MASTER_SITE_SUBDIR= exim4 exiscan/:exiscan exiscan-acl/:exiscan_acl
+DISTFILES= exim-${EXIM_VERSION}${EXTRACT_SUFX} \
+ exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX}
+.if defined(WITH_EXISCAN_ACL)
+DISTFILES+= exiscan-acl-${EXISCAN_ACL_VERSION}.patch:exiscan_acl
+.elif !defined(WITHOUT_EXISCAN)
+DISTFILES+= exiscan-${EXISCAN_VERSION}${EXTRACT_SUFX}:exiscan
+.endif
+DIST_SUBDIR= exim
+
+EXTRACT_ONLY= exim-${EXIM_VERSION}${EXTRACT_SUFX} \
+ exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX}
+.if !defined(WITH_EXISCAN_ACL) && !defined(WITHOUT_EXISCAN)
+EXTRACT_ONLY+= exiscan-${EXISCAN_VERSION}${EXTRACT_SUFX}
.endif
MAINTAINER= sheldonh@FreeBSD.org
@@ -28,8 +57,9 @@ USE_BZIP2= yes
USE_PERL5= yes
MAN8= exim.8
-EXIM_VERSION= 4.14
-EXIM_DOCVERSION= 4.10
+EXIM_VERSION= 4.20
+EXIM_DOCVERSION= 4.20
+EXISCAN_ACL_VERSION= ${EXIM_VERSION}-02
EXISCAN_VERSION= ${EXIM_VERSION}-26
PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}"
@@ -47,8 +77,10 @@ POSTGRESQL_PORT?= databases/postgresql7
# XFree86 to be installed if it is not present.
#WITH_EXIMON= yes
-# If WITHOUT_EXISCAN is defined, exim will be built without exiscan
-# email content scanner support.
+# If WITH_EXISCAN_ACL is defined, exim will be build with the newer
+# exiscan acl support. Otherwise if WITHOUT_EXISCAN is defined,
+# exim will be built without exiscan email content scanner support.
+#WITH_EXISCAN_ACL= yes
#WITHOUT_EXISCAN= yes
# Define WITH_TCP_WRAPPERS, WITH_MYSQL, and WITH_PGSQL to link against
@@ -121,10 +153,16 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/eximon:${PORTSDIR}/mail/exim-monitor
PORTDOC_FILES= Exim3.upgrade Exim4.upgrade OptionLists.txt README \
dbm.discuss.txt filter.txt pcrepattern.txt pcretest.txt \
spec.txt
-.if !defined(WITHOUT_EXISCAN)
+.if defined(WITH_EXISCAN_ACL)
+PORTDOC_FILES+= exiscan-acl-spec.txt
+PLIST_SUB+= EXISCAN_ACL=""
+PLIST_SUB+= EXISCAN="@comment "
+.elif !defined(WITHOUT_EXISCAN)
PORTDOC_FILES+= exiscan-readme.txt
+PLIST_SUB+= EXISCAN_ACL="@comment "
PLIST_SUB+= EXISCAN=""
.else
+PLIST_SUB+= EXISCAN_ACL="@comment "
PLIST_SUB+= EXISCAN="@comment "
.endif
@@ -288,7 +326,13 @@ SEDLIST+= -e 's,^\# TRANSPORT_LMTP=,TRANSPORT_LMTP=,'
.endif
post-patch:
-.if !defined(WITHOUT_EXISCAN)
+.if defined(WITH_EXISCAN_ACL)
+ cd ${WRKSRC} && ${PATCH} -p1 \
+ < ${DISTDIR}/${DIST_SUBDIR}/exiscan-acl-${EXISCAN_ACL_VERSION}.patch \
+ > ${WRKDIR}/patch-exiscan-acl.log 2>&1
+ @${CAT} ${FILESDIR}/POST-INSTALL-NOTES.exiscan-acl \
+ ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES
+.elif !defined(WITHOUT_EXISCAN)
cd ${WRKSRC} && ${PATCH} -p1 \
< ../exiscan-${EXISCAN_VERSION}/exiscan-${EXISCAN_VERSION}.patch \
> ${WRKDIR}/patch-exiscan.log 2>&1
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 07780cd81c17..72d3ccbdb535 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,3 +1,4 @@
-MD5 (exim-4.14.tar.bz2) = 81d0e304289f84a57144b66030ab9329
-MD5 (exim-texinfo-4.10.tar.bz2) = 2a2a34a2457d249d568a58e985f263c0
-MD5 (exiscan-4.14-26.tar.bz2) = edaabf47ad42dc7b26949fe1390abfff
+MD5 (exim/exim-4.20.tar.bz2) = 90f9e876b60d00c0a5dd53ece7c85338
+MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d
+MD5 (exim/exiscan-acl-4.20-02.patch) = 4d656b5e681a565f7dc42ff6f37c9e7f
+MD5 (exim/exiscan-4.20-26.tar.bz2) = a3ad2a486b52cc32990888a00f8fabca
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)
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 3e1a8864da40..c47585aa996f 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -27,6 +27,7 @@ sbin/exiqsumm
%%PORTDOCS%%share/doc/exim/pcrepattern.txt
%%PORTDOCS%%share/doc/exim/pcretest.txt
%%PORTDOCS%%share/doc/exim/spec.txt
+%%PORTDOCS%%%%EXISCAN_ACL%%share/doc/exim/exiscan-acl-spec.txt
%%PORTDOCS%%%%EXISCAN%%share/doc/exim/exiscan-readme.txt
@unexec install-info --delete %D/info/exim.info %D/info/dir
@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 18:24:11 +0000