diff options
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 2 | ||||
| -rw-r--r-- | mail/exim/files/POST-INSTALL-NOTES.clamd | 43 | ||||
| -rw-r--r-- | mail/exim/files/patch-src::expand.c | 22 |
3 files changed, 18 insertions, 49 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 711833a32416..b0ca064e1098 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -7,7 +7,7 @@ PORTNAME= exim PORTVERSION= 4.24 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_EXIM} MASTER_SITE_SUBDIR= exim4 diff --git a/mail/exim/files/POST-INSTALL-NOTES.clamd b/mail/exim/files/POST-INSTALL-NOTES.clamd index 7ea8aad22694..0a6240208c8c 100644 --- a/mail/exim/files/POST-INSTALL-NOTES.clamd +++ b/mail/exim/files/POST-INSTALL-NOTES.clamd @@ -3,10 +3,10 @@ It is important to follow them in sequence. * Install security/clamav from the ports tree. -* Add user clamav to the mail group in /etc/group. +* Confirm that user clamav was added to the mail group in /etc/group. -* Create /var/log/clamav and /var/run/clamav, and change the ownership - of both to clamav:clamav. +* Confirm that /var/log/clamav and /var/run/clamav exist and are owned + by clamav:clamav. * In Exim's configure file, set av_scanner=clamd:/var/run/clamav/clamd @@ -28,47 +28,18 @@ It is important to follow them in sequence. You may wish to make other changes as well. -* Install the shell script included at the end of these instructions as - /usr/local/etc/rc.d/clamd.sh, taking care to make it executable. +* Make sure clamd_enable="YES" has been added to /etc/rc.conf; this is + required by the clamav port's startup script, + %%RC_DIR%%/clamd%%RC_SUFX%% . * Run freshclam. * Add a cron job that runs freshclam --daemon-notify --quiet at least once a day. -* Start clamd with /usr/local/etc/rc.d/clamd.sh start . +* Start clamd with %%RC_DIR%%/clamd%%RC_SUFX%% start . * Start Exim with %%RC_DIR%%/exim%%RC_SUFX%% start . Sheldon Hearn <sheldonh@FreeBSD.org> -#!/bin/sh -# -PREFIX=/usr/local -CLAMAV_BIN=${PREFIX}/sbin - -case $1 in -start) - [ -x ${CLAMAV_BIN}/clamd ] && { - ${CLAMAV_BIN}/clamd - echo -n ' clamd' - } - ;; - -stop) - kill `cat /var/run/clamav/clamd.pid` - if [ $? = 0 ] ; then - echo -n ' clamd' - fi - ;; - -restart) - /usr/local/etc/rc.d/clamd.sh stop && \ - /usr/local/etc/rc.d/clamd.sh start - ;; - -*) - echo "usage: `basename $0` {start|stop|restart}" >&2 - exit 64 - ;; -esac diff --git a/mail/exim/files/patch-src::expand.c b/mail/exim/files/patch-src::expand.c index 0d3cdca90cac..daca81773825 100644 --- a/mail/exim/files/patch-src::expand.c +++ b/mail/exim/files/patch-src::expand.c @@ -1,12 +1,10 @@ ---- src/expand.c.orig Mon Aug 18 14:52:54 2003 -+++ src/expand.c Fri Aug 29 17:51:12 2003 -@@ -1462,6 +1462,9 @@ - if (yield != NULL) - { - int rc; -+ -+ if ( sub[2] == NULL ) sub[3] = NULL; -+ - rc = auth_call_saslauthd(sub[0], sub[1], sub[2], sub[3], - &expand_string_message); - if (rc == ERROR || rc == DEFER) return NULL; +--- /var/tmp/usr/ports/mail/exim/work/exim-4.24/src/expand.c.orig Mon Sep 22 10:29:56 2003 ++++ /var/tmp/usr/ports/mail/exim/work/exim-4.24/src/expand.c Tue Oct 28 15:39:43 2003 +@@ -4114,6 +4114,7 @@ + + if (s == NULL) return -1; + ++errno = 0; + value = strtol(CS s, CSS &endptr, 0); + + if (endptr == s) |