diff options
| -rw-r--r-- | network/exim/contrib/rc.exim.new | 62 | ||||
| -rw-r--r-- | network/exim/exim.Makefile | 128 | ||||
| -rw-r--r-- | network/exim/exim.SlackBuild | 2 | ||||
| -rw-r--r-- | network/exim/exim.info | 6 |
4 files changed, 118 insertions, 80 deletions
diff --git a/network/exim/contrib/rc.exim.new b/network/exim/contrib/rc.exim.new index 16d1ca71d0..3fb62f1bf3 100644 --- a/network/exim/contrib/rc.exim.new +++ b/network/exim/contrib/rc.exim.new @@ -1,62 +1,28 @@ #!/bin/sh +# Start/stop/restart the Exim MTA -# /etc/rc.d/rc.exim - start/stop/restart the exim mail transfer agent. -# -# Thales A. Tsailas <ttsailas@enforcingit.com> -# Thomas Morper <thomas@beingboiled.info> +# Run as SMTP listener daemon, do queue runs every 15 mins. +EXIM_ARGS="-bd -q15m" -PIDFILE=/var/run/exim.pid - -# the TIME option causes Exim to run as a daemon, starting a queue runner -# process at intervals specified by the given time value. (ie 5m, 1h etc). -TIME=15m - -exim_start() { - echo "Starting exim..." - /usr/sbin/exim -bd ${TIME:+-q$TIME} -} - -exim_stop() { - echo "Shutting down exim..." - killall exim - rm -f $PIDFILE -} - -exim_reload() { - echo "Reloading exim configuration..." - if [ -f $PIDFILE ]; then - kill -HUP $(cat $PIDFILE) - fi -} - -exim_status() { - if [ -f /var/run/exim.pid ]; then - echo "exim is running..."; - else - echo "exim is not running..."; - fi -} - -# See how we were called. case "$1" in start) - exim_start + echo "Starting Exim" + /usr/sbin/exim $EXIM_ARGS ;; stop) - exim_stop - ;; - restart) - exim_stop - sleep 2 - exim_start + echo "Stopping Exim" + pkill -f /usr/sbin/exim ;; reload) - exim_reload + echo "Reloading Exim config" + pkill -HUP -f /usr/sbin/exim ;; - status) - exim_status + restart) + $0 stop + sleep 2 + $0 start ;; *) - echo $"Usage: $0 {start|stop|restart|reload|status}" + echo "usage: $0 {start|stop|reload|restart}" ;; esac diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile index 2dccce152c..1da52718f6 100644 --- a/network/exim/exim.Makefile +++ b/network/exim/exim.Makefile @@ -1,4 +1,4 @@ -# $Cambridge: exim/exim-src/src/EDITME,v 1.23 2009/11/20 12:18:19 nm4 Exp $ +# $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ ################################################## # The Exim mail transport agent # @@ -131,8 +131,7 @@ CONFIGURE_FILE=/etc/exim/exim.conf # group that is used for Exim processes when they no longer need to be root. In # particular, this applies when receiving messages and when doing remote # deliveries. (Local deliveries run as various non-root users, typically as the -# owner of a local mailbox.) Specifying these values as root is very strongly -# discouraged. +# owner of a local mailbox.) Specifying these values as root is not supported. EXIM_USER=exim @@ -250,6 +249,19 @@ SUPPORT_MBX=yes #------------------------------------------------------------------------------ +# See below for dynamic lookup modules. +# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/ +# If not using package management but using this anyway, then think about how +# you perform upgrades and revert them. You should consider the benefit of +# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can +# maintain two concurrent sets of modules. + +# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for +# your platform. Eg: +# CFLAGS_DYNAMIC=-shared -rdynamic +# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC + +#------------------------------------------------------------------------------ # These settings determine which file and database lookup methods are included # in the binary. See the manual chapter entitled "File and database lookups" # for discussion. DBM and lsearch (linear search) are included by default. If @@ -257,6 +269,18 @@ SUPPORT_MBX=yes # LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is # for the specialist case of using the DNS as a general database facility (not # common). +# If set to "2" instead of "yes" then the corresponding lookup will be +# built as a module and must be installed into LOOKUP_MODULE_DIR. You need to +# add -export-dynamic -rdynamic to EXTRALIBS. You may also need to add -ldl to +# EXTRALIBS so that dlopen() is available to Exim. You need to define +# LOOKUP_MODULE_DIR above so the exim binary actually loads dynamic lookup +# modules. +# Also, instead of adding all the libraries/includes to LOOKUP_INCLUDE and +# LOOKUP_LIBS, add them to the respective LOOKUP_*_INCLUDE and LOOKUP_*_LIBS +# (where * is the name as given here in this list). That ensures that only +# the dynamic library and not the exim binary will be linked against the +# library. +# NOTE: LDAP cannot be built as a module! LOOKUP_DBM=yes LOOKUP_LSEARCH=yes @@ -352,6 +376,25 @@ WITH_CONTENT_SCAN=yes # WITH_OLD_DEMIME=yes +# If you're using ClamAV and are backporting fixes to an old version, instead +# of staying current (which is the more usual approach) then you may need to +# use an older API which uses a STREAM command, now deprecated, instead of +# zINSTREAM. If you need to set this, please let the Exim developers know, as +# if nobody reports a need for it, we'll remove this option and clean up the +# code. zINSTREAM was introduced with ClamAV 0.95. +# +# WITH_OLD_CLAMAV_STREAM=yes + +#------------------------------------------------------------------------------ +# By default Exim includes code to support DKIM (DomainKeys Identified +# Mail, RFC4871) signing and verification. Verification of signatures is +# turned on by default. See the spec for information on conditionally +# disabling it. To disable the inclusion of the entire feature, set +# DISABLE_DKIM to "yes" + +# DISABLE_DKIM=yes + + #------------------------------------------------------------------------------ # Compiling Exim with experimental features. These are documented in # experimental-spec.txt. "Experimental" means that the way these features are @@ -412,14 +455,13 @@ FIXED_NEVER_USERS=root #------------------------------------------------------------------------------ -# By default, Exim insists that its configuration file be owned either by root -# or by the Exim user. You can specify one additional permitted owner here. +# By default, Exim insists that its configuration file be owned by root. You +# can specify one additional permitted owner here. # CONFIGURE_OWNER= # If the configuration file is group-writeable, Exim insists by default that it -# is owned by root or the Exim user. You can specify one additional permitted -# group owner here. +# is owned by root. You can specify one additional permitted group owner here. # CONFIGURE_GROUP= @@ -441,32 +483,31 @@ FIXED_NEVER_USERS=root #------------------------------------------------------------------------------ # The -C option allows Exim to be run with an alternate runtime configuration -# file. When this is used by root or the Exim user, root privilege is retained -# by the binary (for any other caller, it is dropped). You can restrict the -# location of alternate configurations by defining a prefix below. Any file -# used with -C must then start with this prefix (except that /dev/null is also -# permitted if the caller is root, because that is used in the install script). -# If the prefix specifies a directory that is owned by root, a compromise of -# the Exim account does not permit arbitrary alternate configurations to be -# used. The prefix can be more restrictive than just a directory (the second -# example). +# file. When this is used by root, root privilege is retained by the binary +# (for any other caller including the Exim user, it is dropped). You can +# restrict the location of alternate configurations by defining a prefix below. +# Any file used with -C must then start with this prefix (except that /dev/null +# is also permitted if the caller is root, because that is used in the install +# script). If the prefix specifies a directory that is owned by root, a +# compromise of the Exim account does not permit arbitrary alternate +# configurations to be used. The prefix can be more restrictive than just a +# directory (the second example). # ALT_CONFIG_PREFIX=/some/directory/ # ALT_CONFIG_PREFIX=/some/directory/exim.conf- #------------------------------------------------------------------------------ -# If you uncomment the following line, only root may use the -C or -D options -# without losing root privilege. The -C option specifies an alternate runtime -# configuration file, and the -D option changes macro values in the runtime -# configuration. Uncommenting this line restricts what can be done with these -# options. A call to receive a message (either one-off or via a daemon) cannot -# successfully continue to deliver it, because the re-exec of Exim to regain -# root privilege will fail, owing to the use of -C or -D by the Exim user. -# However, you can still use -C for testing (as root) if you do separate Exim -# calls for receiving a message and subsequently delivering it. +# When a user other than root uses the -C option to override the configuration +# file (including the Exim user when re-executing Exim to regain root +# privileges for local message delivery), this will normally cause Exim to +# drop root privileges. The TRUSTED_CONFIG_LIST option, specifies a file which +# contains a list of trusted configuration filenames, one per line. If the -C +# option is used by the Exim user or by the user specified in the +# CONFIGURE_OWNER setting, to specify a configuration file which is listed in +# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim. -# ALT_CONFIG_ROOT_ONLY=yes +# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs #------------------------------------------------------------------------------ @@ -478,6 +519,31 @@ FIXED_NEVER_USERS=root #------------------------------------------------------------------------------ +# By contrast, you might be maintaining a system which relies upon the ability +# to override values with -D and assumes that these will be passed through to +# the delivery processes. As of Exim 4.73, this is no longer the case by +# default. Going forward, we strongly recommend that you use a shim Exim +# configuration file owned by root stored under TRUSTED_CONFIG_LIST. +# That shim can set macros before .include'ing your main configuration file. +# +# As a strictly transient measure to ease migration to 4.73, the +# WHITELIST_D_MACROS value definies a colon-separated list of macro-names +# which are permitted to be overriden from the command-line which will be +# honoured by the Exim user. So these are macros that can persist to delivery +# time. +# Examples might be -DTLS or -DSPOOL=/some/dir. The values on the +# command-line are filtered to only permit: [A-Za-z0-9_/.-]* +# +# This option is highly likely to be removed in a future release. It exists +# only to make 4.73 as easy as possible to migrate to. If you use it, we +# encourage you to schedule time to rework your configuration to not depend +# upon it. Most people should not need to use this. +# +# By default, no macros are whitelisted for -D usage. + +# WHITELIST_D_MACROS=TLS:SPOOL + +#------------------------------------------------------------------------------ # Exim has support for the AUTH (authentication) extension of the SMTP # protocol, as defined by RFC 2554. If you don't know what SMTP authentication # is, you probably won't want to include this code, so you should leave these @@ -832,6 +898,13 @@ CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. +# +# To use a name other than exim in the tcpwrappers config file, +# e.g. if you're running multiple daemons with different access lists, +# or multiple MTAs with the same access list, define +# TCP_WRAPPERS_DAEMON_NAME accordingly +# +# TCP_WRAPPERS_DAEMON_NAME="exim" #------------------------------------------------------------------------------ @@ -881,7 +954,6 @@ USE_READLINE=yes - ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # ############################################################################### @@ -1150,6 +1222,6 @@ PID_FILE_PATH=/var/run/exim.pid # feature should only be used in very exceptional circumstances. YOU HAVE BEEN # WARNED. -ENABLE_DISABLE_FSYNC=yes +# ENABLE_DISABLE_FSYNC=yes # End of EDITME for Exim 4. diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild index 66bf4dd5bb..f7ac8ddbd8 100644 --- a/network/exim/exim.SlackBuild +++ b/network/exim/exim.SlackBuild @@ -8,7 +8,7 @@ # Thanks to Debian for the manpages. PRGNAM=exim -VERSION=${VERSION:-4.72} +VERSION=${VERSION:-4.74} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/exim/exim.info b/network/exim/exim.info index e57330f4f2..a05587137d 100644 --- a/network/exim/exim.info +++ b/network/exim/exim.info @@ -1,8 +1,8 @@ PRGNAM="exim" -VERSION="4.72" +VERSION="4.74" HOMEPAGE="http://www.exim.org/" -DOWNLOAD="ftp://ftp.exim.org/pub/exim/exim4/exim-4.72.tar.bz2" -MD5SUM="ccc937b533568e5e8340f181a3b3d2ff" +DOWNLOAD="ftp://ftp.exim.org/pub/exim/exim4/exim-4.74.tar.bz2" +MD5SUM="1d9c189940909303d914bbc4247dc861" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Thomas Morper" |