diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/exim-devel/Makefile | 19 | ||||
| -rw-r--r-- | mail/exim-devel/distinfo | 5 | ||||
| -rw-r--r-- | mail/exim-devel/files/Makefile | 180 | ||||
| -rw-r--r-- | mail/exim-devel/files/eximon.conf | 75 | ||||
| -rw-r--r-- | mail/exim-devel/files/patch-aa | 67 | ||||
| -rw-r--r-- | mail/exim-devel/pkg-descr | 5 | ||||
| -rw-r--r-- | mail/exim-devel/pkg-plist | 10 | ||||
| -rw-r--r-- | mail/exim-old/Makefile | 19 | ||||
| -rw-r--r-- | mail/exim-old/distinfo | 5 | ||||
| -rw-r--r-- | mail/exim-old/files/Makefile | 180 | ||||
| -rw-r--r-- | mail/exim-old/files/eximon.conf | 75 | ||||
| -rw-r--r-- | mail/exim-old/files/patch-aa | 67 | ||||
| -rw-r--r-- | mail/exim-old/pkg-descr | 5 | ||||
| -rw-r--r-- | mail/exim-old/pkg-plist | 10 | ||||
| -rw-r--r-- | mail/exim/Makefile | 19 | ||||
| -rw-r--r-- | mail/exim/distinfo | 5 | ||||
| -rw-r--r-- | mail/exim/files/Makefile | 180 | ||||
| -rw-r--r-- | mail/exim/files/eximon.conf | 75 | ||||
| -rw-r--r-- | mail/exim/files/patch-aa | 67 | ||||
| -rw-r--r-- | mail/exim/pkg-descr | 5 | ||||
| -rw-r--r-- | mail/exim/pkg-plist | 10 |
21 files changed, 783 insertions, 300 deletions
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile index dd9892c7c6fb..e925efcdb748 100644 --- a/mail/exim-devel/Makefile +++ b/mail/exim-devel/Makefile @@ -1,31 +1,22 @@ # New ports collection makefile for: exim -# Version required: 0.53 +# Version required: 0.57 # Date created: 23 June 1996 # Whom: markm # -# $Id: Makefile,v 1.1.1.1 1996/07/06 11:13:57 markm Exp $ +# $Id: Makefile,v 1.2 1996/07/09 21:24:41 asami Exp $ # -DISTNAME= exim-0.53 +DISTNAME= exim-0.57 CATEGORIES+= mail MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ -DISTFILES= exim-0.53.tar.gz exim-texinfo-0.52.gz -EXTRACT_ONLY= exim-0.53.tar.gz - -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= exim-0.53.patch -PATCH_DIST_STRIP= -p2 +DISTFILES= exim-0.57.tar.gz exim-texinfo-0.57.tar.gz MAINTAINER= markm@FreeBSD.ORG -post-extract: - @cp ${DISTDIR}/exim-texinfo-0.52.gz ${WRKSRC}/doc - @gunzip ${WRKSRC}/doc/exim-texinfo-0.52 - do-configure: mkdir ${WRKSRC}/Local cp ${FILESDIR}/Makefile ${WRKSRC}/Local cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local - -(cd ${WRKSRC}; make) + (cd ${WRKSRC}/doc ; ln -s ../../exim-texinfo-0.57/doc/* ) .include <bsd.port.mk> diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo index 9cc240b4fb8b..7ced0ff5400f 100644 --- a/mail/exim-devel/distinfo +++ b/mail/exim-devel/distinfo @@ -1,3 +1,2 @@ -MD5 (exim-0.53.tar.gz) = 7da8888862849fed6610dc6376f09557 -MD5 (exim-texinfo-0.52.gz) = 13d8717da854dba08365074c931adf25 -MD5 (exim-0.53.patch) = 7bac54dd31484305a9e0c23e017059b8 +MD5 (exim-0.57.tar.gz) = 1bb12bad99feda47379099bc375a6f5c +MD5 (exim-texinfo-0.57.tar.gz) = f833110a865267c0a0c843ebf8d6bb71 diff --git a/mail/exim-devel/files/Makefile b/mail/exim-devel/files/Makefile index f0432c722bf5..55796487c8db 100644 --- a/mail/exim-devel/files/Makefile +++ b/mail/exim-devel/files/Makefile @@ -2,44 +2,85 @@ # The Exim mail transport agent # ################################################## -# This is the template for Exim's main build-time configuration file. It +# This is the template for Exim's main build-time configuration file. It # contains settings that are independent of any operating system. It should # be edited and then saved to a file called Local/Makefile before first running # the make command. # Things that depend on the operating system have default settings in files # called OS/Makefile-<osname>. These can be overridden by creating files -# called Local/Makefile-<osname>, though it is hoped that this will rarely -# be necessary. +# called Local/Makefile-<osname>. In particular, the location of the X11 +# libraries is something that is quite variable between different versions +# of the same operation system (and indeed there are different versions of +# X11 as well, of course). The three settings concerned here are X11, XINCLUDE, +# and XLFLAGS (linking flags). There are defaults in OS/Makefile-Default which +# are overridden for some operating systems in the OS/Makefile-<osname> file. +# If these are not right for you, put appropriate settings into a file called +# Local/Makefile-<osname>. [In all cases "<osname>" stands for the name of +# your operating system - look at the names in the OS directory to see which +# names are recognized.] +############################################################################### # The binary directory: This variable defines where the exim binary will be # installed by "make install" or "exim_install". It is also used internally # by exim when it needs to re-invoke itself, either to send an error message, # or to recover root privilege. Exim's utility binaries and scripts are also -# installed in this directory. There is no default for this variable built into +# installed in this directory. There is no default for this variable built into # the source files; it must be set in one of the local configuration files. BIN_DIRECTORY=/usr/local/bin -# The info directory: This variable defines where the exim info files will be -# installed by "make install" or "exim_install". +# The info directory: This variable defines where the exim info file will be +# installed by "make install" or "exim_intall". INFO_DIRECTORY=/usr/local/info +# The compress command is used by the exicyclog script to compress old log +# files. Both the name of the command and the suffix that it adds to files +# need to be defined here. See also the EXICYCLOG_MAX configuration. + +COMPRESS_COMMAND=/usr/bin/gzip +COMPRESS_SUFFIX=gz + + # The runtime configuration file: This variable defines where Exim's runtime # configuration file is. There is no default built into the source files, so -# there must be a setting in one of the local configuration files. The -# location of all other runtime files and directories can be changed in the +# there must be a setting in one of the local configuration files. The +# location of all other runtime files and directories can be changed in the # runtime configuration file. -CONFIGURE_FILE=/usr/local/etc/exim.conf +CONFIGURE_FILE=/usr/local/etc/exim/configure + + +# In some installations there may be multiple machines sharing file systems, +# where a different configuration file is required for Exim on the different +# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look +# for a configuration file whose name is that defined by CONFIGURE_FILE, +# with the node name obtained by uname() tacked on the end, separated by a +# period (for example, /usr/exim/configure.host.in.some.domain. If this file +# does not exist, then the bare configuration file name is tried. + +# CONFIGURE_FILE_USE_NODE=yes + + +# In some esoteric configurations two different versions of Exim are run, +# with different setuid values, and different configuration files are required +# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then +# Exim will first look for a configuration file whose name is that defined +# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by +# a period (for eximple, /usr/exim/configure.0). If this file does not exist, +# then the bare configuration file name is tried. In the case when both +# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files +# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>. + +# CONFIGURE_FILE_USE_EUID=yes # The size of the delivery buffer: This specifies the size of buffer which is -# used when copying a message from the spool to a destination. The default +# used when copying a message from the spool to a destination. The default # value built into the source is 8192. # DELIVER_BUFFER_SIZE=8192 @@ -50,7 +91,7 @@ CONFIGURE_FILE=/usr/local/etc/exim.conf # are wanted must be defined here by setting the appropriate variables to the # value "yes". The actions of each director are described in a separate chapter # in the manual. Including a director in the binary does not cause it to -# be used automatically. It has also to be specified in the runtime +# be used automatically. It has also to be specified in the runtime # configuration file. DIRECTOR_ALIASFILE=yes @@ -61,7 +102,7 @@ DIRECTOR_SMARTUSER=yes # The mode of the database directory: Exim creates a directory called "db" # in its spool directory, to hold its databases of hints. This variable -# determines the mode of the created directory. The default value in the +# determines the mode of the created directory. The default value in the # source is 0750. # DB_DIRECTORY_MODE=0750 @@ -81,18 +122,24 @@ DIRECTOR_SMARTUSER=yes # DB_MODE=0640 +# Cycling log files: this variable specifies the maximum number of old +# log files that are kept by the exicyclog log-cycling script. + +EXICYCLOG_MAX=10 + + # Running Exim not as root: A uid and gid for Exim can be specified here. These # are compiled into the binary, but can be changed by settings in the runtime -# configuration file. The default in the code is -1, which means "unset" - -# i.e. run as root unless specified otherwise at run time. Specifying 0 at +# configuration file. The default in the code is -1, which means "unset" - +# i.e. run as root unless specified otherwise at run time. Specifying 0 at # run time has the effect of unsetting any configured values. # The settings here must be numeric; the run time file allows names to # be used. When this uid and gid are set, the Exim binary still has to be # setuid root if local deliveries are to be performed or a listener on port -# 25 is to be run, but it gives up its privilege when possible. There is a -# trade-off between security and efficiency, controlled by the runtime -# "security" setting, which controls how privilege is released (setuid vs +# 25 is to be run, but it gives up its privilege when possible. There is a +# trade-off between security and efficiency, controlled by the runtime +# "security" setting, which controls how privilege is released (setuid vs # seteuid). The default value of -1 here means "unset". # EXIM_GID=-1 @@ -103,13 +150,21 @@ DIRECTOR_SMARTUSER=yes # a program that requires an X11 display, then EXIM_MONITOR should be # set to the value "eximon.bin". Comment out this setting to disable # compilation of the binary file that is run by the eximon script. The -# locations of various X11 directories for libraries and include files +# locations of various X11 directories for libraries and include files # are defaulted in the OS/Makefile-Default file, and can be overridden # in local OS-specific make files. EXIM_MONITOR=eximon.bin +# The maximum length of header line that Exim is prepared to process. There +# is a limit in order to catch rogue mailers out there that might connect to +# the SMTP port, start off a header line, and then just pump junk for ever +# at it. The default is 8192. + +# HEADER_MAXLENGTH=8192 + + # The mode of the input directory: The input directory is where messages are # kept while awaiting delivery. Exim creates it if necessary, using a mode # which can be defined here (default 0750). @@ -117,14 +172,37 @@ EXIM_MONITOR=eximon.bin # INPUT_DIRECTORY_MODE=0750 -# Exim log directory and files: Exim creates a directory called "log" inside -# its spool directory. The mode defaults to 0750, but can be changed here. -# The log files themselves are created with a default mode of 0640, but that -# can also be changed here. +# Exim log directory and files: Exim creates several log files inside a +# single log directory. You can define the directory and the form of the +# log file name here, by setting LOG_FILE_PATH to a path name containing one +# occurrence of %s. This will be replaced by one of the strings "main", +# "panic", "process" or "reject" to form the final file name. For example, +# some installations may want something like this: + +LOG_FILE_PATH=/var/log/exim_%slog + +# which results in files with names /var/log/exim_mainlog, etc. The directory +# in which the log files are placed must exist; Exim does not try to create +# it for itself. It is also your responsibility to ensure that Exim is capable +# of writing files using this path name. If you have defined EXIM_UID and +# EXIM_GID above, then that uid and gid must be able to create files in the +# directory you have specified. + + +# If you do not set LOG_FILE_PATH, then Exim creates a directory called +# "log" inside its spool directory (see SPOOL_DIRECTORY below) and uses that +# with filenames "mainlog", "paniclog", etc. Its mode defaults to 0750 but +# that can be changed here. # LOG_DIRECTORY_MODE=0750 + +# This value is used only when Exim creates the directory for itself. + +# The log files themselves are created as required, with a mode that defaults +# to 0640, but which can be changed here. + # LOG_MODE=0640 - + # Per-message logs: While a message is in the process of being delivered, # comments on its progress are written to a message log, for the benefit of @@ -133,40 +211,71 @@ EXIM_MONITOR=eximon.bin # The message log directory is also used for storing files that are used by # transports for returning data to a message's sender (see the "return_output" # option for transports). - + # MSGLOG_DIRECTORY_MODE=0750 +# Identifying the daemon: When an Exim daemon starts up, it writes its pid to +# a file so that it can easily be identified. The path of the file can be +# specified here. It must contain precisely one occurrence of "%s". When +# a daemon is run on the default SMTP port, this is replaced with the null +# string, but when it is run with some explicit port specified, "%s" is +# replaced with the port number preceded by a dot. Some installations may +# want something like this + +PID_FILE_PATH=/var/run/exim%s.pid + +# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory +# (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard +# daemon, or "exim-daemon.<port>.pid" for a daemon listening on a non-standard +# port. If you run a daemon that does not have both the -bd and -q options, +# then whichever of the two options it does have is added to the file name, +# whether obtained from PID_FILE_PATH or by default. + +# If you set PID_FILE_PATH, then it is your responsibility to ensure that +# Exim is capable of writing to the relevant files. If you have defined +# EXIM_UID and EXIM_GID above, then that uid/gid combination must be able to +# create and write to the files. If the attempt to open the file fails, Exim +# just refrains from trying to write the data. + + # Included routers: These variables determine which individual router drivers # are included in the Exim binary. There are no defaults; those that are # wanted must be defined here by setting the appropriate variables to the value # "yes". The actions of each router are described in a separate chapter # in the manual. Including a router in the binary does not cause it to -# be used automatically. It has also to be specified in the runtime -# configuration file. +# be used automatically. It has also to be specified in the runtime +# configuration file. Those routers that are *not* wanted must not be defined +# here at all - comment them out. ROUTER_DOMAINLIST=yes +ROUTER_IPLITERAL=yes ROUTER_LOOKUPHOST=yes ROUTER_QUERYPROGRAM=yes +# This one is very special-purpose, so is not included by default. + +# ROUTER_IPLOOKUP=yes + # The spool directory: This directory is where all the data for messages in # transit is kept. There is no default in the source, so its location must be # defined in a local configuration file. Exim creates it if it does not exist, -# using the mode required for the sub-directory that it is trying to create at -# the time. If a non-root uid and gid have been defined for Exim (either in -# this configuration file, or by the runtime configuration options), then this +# using the mode required for the sub-directory that it is trying to create at +# the time. If a non-root uid and gid have been defined for Exim (either in +# this configuration file, or by the runtime configuration options), then this # directory and all sub-directories and their files will be created with their # owners and groups set to Exim's uid and gid. # Many installations will want something like this -SPOOL_DIRECTORY=/var/spool/exim +# SPOOL_DIRECTORY=/var/spool/exim # Others may prefer to keep all Exim things under one directory -# SPOOL_DIRECTORY=/usr/exim/spool + +SPOOL_DIRECTORY=/var/spool/exim -# If Exim creates the spool directory, it is given this mode, defaulting in the +# If Exim creates the spool directory, it is given this mode, defaulting in the # source to 0750. # SPOOL_DIRECTORY_MODE=0750 @@ -174,7 +283,7 @@ SPOOL_DIRECTORY=/var/spool/exim # The mode of files on the input spool which hold the contents of message can # be changed here. The default is 0600. If you have defined a uid and gid for -# Exim and want information from the spool to be available to anyone who is a +# Exim and want information from the spool to be available to anyone who is a # member of the Exim group, change the value to 0640. This is particularly # relevant if you are going to run the Exim monitor. @@ -183,7 +292,7 @@ SPOOL_DIRECTORY=/var/spool/exim # If STDERR_FILE is defined then the -df command line option causes Exim to # redirect stderr to the named file. This is useful for catching debugging -# output when starting Exim via inetd. +# output when starting Exim via inetd. # STDERR_FILE= @@ -193,10 +302,11 @@ SPOOL_DIRECTORY=/var/spool/exim # are wanted must be defined here by setting the appropriate variables to the # value "yes". The actions of each transport are described in a separate chapter # in the manual. Including a transport in the binary does not cause it to -# be used automatically. It has also to be specified in the runtime +# be used automatically. It has also to be specified in the runtime # configuration file. TRANSPORT_APPENDFILE=yes +TRANSPORT_AUTOREPLY=yes TRANSPORT_PIPE=yes TRANSPORT_SMTP=yes diff --git a/mail/exim-devel/files/eximon.conf b/mail/exim-devel/files/eximon.conf index 350c7524a36a..236bfbb2b853 100644 --- a/mail/exim-devel/files/eximon.conf +++ b/mail/exim-devel/files/eximon.conf @@ -2,13 +2,17 @@ # The Exim Monitor # ################################################## -# This is the template for the Exim monitor's main build-time configuration -# file. It contains settings that are independent of any operating system. It -# should be edited and then saved to a file called Local/eximon.conf before +# This is the template for the Exim monitor's main build-time configuration +# file. It contains settings that are independent of any operating system. It +# should be edited and then saved to a file called Local/eximon.conf before # running the make command to build the monitor, if any settings are required. -# Local/eximon.conf can be empty if no changes are needed. The examples given +# Local/eximon.conf can be empty if no changes are needed. The examples given # here (commented out) are the default settings. +# Any settings made in the configuration file can be overridden at run time +# by setting up an environment variable with the same name as any of these +# options, but preceded by EXIMON_, for example, EXIMON_WINDOW_TITLE. + ################################################################## # Set these variables as appropriate for your system # @@ -16,15 +20,16 @@ # The qualifying name for your domain. The only use made of this is for # testing that certain addresses are the same when displaying the -# log tail, and for shortening sender addresses in the queue display. +# log tail, and for shortening sender addresses in the queue display. # QUALIFY_DOMAIN= -# The initial depth for the main display window, in pixels. The minimum -# is 160, which is enough to hold the stripcharts but not the other -# display sub-windows. +# The default minimum width and height for the whole window are 103 and +# 162 pixels respectively. This is enough to hold the left-most stripchart +# and the quit button. The values can be changed here. -# START_DEPTH=700 +# MIN_HEIGHT=162 +# MIN_WIDTH=103 # The title for eximon's main display window. It is possible to have # host name of the machine you are running on substituted into the @@ -34,7 +39,7 @@ # stripped from its right-hand end before being substituted. Any other # shell or environment variables may also be included. -# If you use any substitutions, remember to ensure that the $ and {} +# If you use any substitutions, remember to ensure that the $ and {} # characters are escaped from the shell, e.g. by using single quotes. # WINDOW_TITLE='${hostname} eximon' @@ -59,7 +64,7 @@ # The font which is used in the log tail display. This is defined in # the normal X manner. It must be a "character cell" font, because this -# is required by the text widget. +# is required by the text widget. # LOG_FONT=-misc-fixed-medium-r-normal-*-14-140-*-*-*-*-iso8859-1 @@ -81,22 +86,48 @@ # QUEUE_MAX_ADDRESSES=10 # The display of the contents of the queue is updated every QUEUE_INTERVAL -# seconds by default (there is a button to request update). +# seconds by default (there is a button to request update). # QUEUE_INTERVAL=300 +# The keystroke/mouse-operation that is used to pop up the menu in the +# queue window is configurable. The default is Shift with the lefthand +# mouse button. The name of an alternative can be specified in the standard +# X way of naming these things. With the default configuration for the monitor, +# individuals can override this by setting the EXIMON_MENU_EVENT environment +# variable. + +# MENU_EVENT=Shift<Btn1Down> + +# When the menu is used to perform an operation on a message, the output +# from the exim command that is generated is displayed in a separate window +# by default. Set this option to "no" if you don't want to see the output - +# the result of the operation is normally visible in the log window in any +# case. This does not apply to the output generated from attempting to +# deliver a message. That is always shown. + +# ACTION_OUTPUT=yes + +# When some action is taken on a message, such as freezing it, or changing +# its recipients, the queue display is normally automatically updated. On +# systems that have very large queues, this can take some time and be dis- +# tracting. If this option is set to "no", the queue display is no longer +# automatically updated after an action is applied to a message. + +# ACTION_QUEUE_UPDATE=yes + # The stripcharts are updated every STRIPCHART_INTERVAL seconds. # STRIPCHART_INTERVAL=60 # The following variable contains a specification of which stripcharts -# you want eximon to display based on log entries. The string consists of -# pairs of strings, delimited by slash characters. The first string in each -# pair is a regular expression that matches some distinguishing feature in a +# you want eximon to display based on log entries. The string consists of +# pairs of strings, delimited by slash characters. The first string in each +# pair is a regular expression that matches some distinguishing feature in a # exim log entry. # Entries that match the expression will be counted and displayed in a -# stripchart whose title is given by the second string. The string may +# stripchart whose title is given by the second string. The string may # be continued over several input lines, provided that it is split # after a slash, and an additional slash (optionally preceded by white # space) is included at the start of the continuation line. @@ -108,18 +139,18 @@ # more pieces, concatenated. It matches a match for the first, followed by # a match for the second, etc. A piece is an atom possibly followed by # `*', `+', or `?'. -# +# # An atom followed by `*' matches a sequence of 0 or more matches of the atom. # An atom followed by `+' matches a sequence of 1 or more matches of the atom. # An atom followed by `?' matches a match of the atom, or the null string. -# +# # An atom is a regular expression in parentheses (matching a match for the # regular expression), a range (see below), `.' (matching any single # character), `^' (matching the null string at the beginning of the input # string), `$' (matching the null string at the end of the input string), # a `\' followed by a single character (matching that character), or a # single character with no other significance (matching that character). -# +# # A range is a sequence of characters enclosed in `[]'. It normally # matches any single character from the sequence. If the sequence begins # with `^', it matches any single character not from the rest of the @@ -129,15 +160,15 @@ # sequence, make it the first character (following a possible `^'). To # include a literal `-', make it the first or last character. -# A stripchart showing the count of messages in the queue is always +# A stripchart showing the count of messages in the queue is always # displayed on the left of eximon's window. Stripcharts configured # by this parameter are displayed to its right, in the order defined # here. # LOG_STRIPCHARTS='/ <= /in/ # / => /out/ -# /D=/local/ -# /T=smtp/smtp/' +# / => .+ D=/local/ +# / => .+ T=smtp/smtp/' # The following variable may be set to the name of a disc partition. If # it is, a stripchart showing the percentage fullness of the partition diff --git a/mail/exim-devel/files/patch-aa b/mail/exim-devel/files/patch-aa index 1f37cb44967e..10178af22133 100644 --- a/mail/exim-devel/files/patch-aa +++ b/mail/exim-devel/files/patch-aa @@ -1,9 +1,38 @@ -diff -udr ../exim-0.52.ORG/scripts/exim_install ./scripts/exim_install ---- ../exim-0.52.ORG/scripts/exim_install Mon Jun 10 12:04:44 1996 -+++ ./scripts/exim_install Sun Jun 23 10:42:40 1996 -@@ -63,6 +63,20 @@ +--- scripts/exim_install.ORG Tue Oct 29 17:46:05 1996 ++++ scripts/exim_install Thu Oct 31 20:53:16 1996 +@@ -8,6 +8,8 @@ + # This script also installs a default configuration file in CONFIGURE_FILE + # if there is no configuration file there. + ++# This script also installs a .info file in INFO_DIRECTORY if required. ++ + # The script can be made to output what it would do, without actually doing + # anything, by giving it the option "-n" (cf make). Arguments are the names + # of things to install. No arguments installs everything. +@@ -65,10 +67,12 @@ + fi + + BIN_DIRECTORY=`grep -h "^ *BIN_DIRECTORY" $files | tail -1 | cut -c15-99` ++INFO_DIRECTORY=`grep -h "^ *INFO_DIRECTORY" $files | tail -1 | cut -c16-99` + CONFIGURE_FILE=`grep -h "^ *CONFIGURE_FILE" $files | tail -1 | cut -c16-99` + + # Allow INST_xx to over-ride xx + case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac ++case "$INST_INFO_DIRECTORY" in ?*) INFO_DIRECTORY="$INST_INFO_DIRECTORY";; esac + case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac + case "$INST_CP" in '') CP=cp;; *) CP="$INST_CP";; esac + case "$INST_MV" in '') MV=mv;; *) MV="$INST_MV";; esac +@@ -76,6 +80,7 @@ + + # Allow the user to over-ride xx + case "$dest" in ?*) BIN_DIRECTORY="$dest";; esac ++case "$info" in ?*) INFO_DIRECTORY="$info";; esac + case "$conf" in ?*) CONFIGURE_FILE="$conf";; esac + case "$cp" in ?*) CP="$cp";; esac + case "$mv" in ?*) MV="$mv";; esac +@@ -101,6 +106,20 @@ fi - fi + fi +# If info directory doesn't exist, try to create it + @@ -22,22 +51,28 @@ diff -udr ../exim-0.52.ORG/scripts/exim_install ./scripts/exim_install # If no arguments, install everything if [ $# -gt 0 ]; then -@@ -127,6 +141,18 @@ - echo $com ${name} is not newer than ${BIN_DIRECTORY}/${name} - fi +@@ -166,12 +185,24 @@ + fi done -+ + +echo $com "" +echo $com Installation directory is ${INFO_DIRECTORY} +echo $com "" + -+if [ -f ../doc/exim-texinfo-0.52 ]; then -+ makeinfo --output ../doc/exim.info ../doc/exim-texinfo-0.52 -+ for info in ../doc/exim.info*; do -+ echo ${CP} ${info} ${INFO_DIRECTORY} -+ ${real} ${CP} ${info} ${INFO_DIRECTORY} ; gzip -9n ${INFO_DIRECTORY}/${info} -+ done ++if [ -f ../doc/spec.texinfo ]; then ++ makeinfo --no-split --output exim.info ../doc/spec.texinfo ++ echo ${CP} exim.info ${INFO_DIRECTORY} ++ ${real} ${CP} exim.info ${INFO_DIRECTORY} +fi - ++ # If there is no configuration file, install the default, # building the lib directory if necessary. + + echo $com "" + + if [ ! -f ${CONFIGURE_FILE} ]; then ++ echo mkdir -p `dirname ${CONFIGURE_FILE}` ++ ${real} mkdir -p `dirname ${CONFIGURE_FILE}` + echo $com Installing default configuration in ${CONFIGURE_FILE} + echo $com because there is no existing configuration file. + echo ${CP} ../src/configure.default ${CONFIGURE_FILE} diff --git a/mail/exim-devel/pkg-descr b/mail/exim-devel/pkg-descr index ffc90bf0c43f..591d2c48a225 100644 --- a/mail/exim-devel/pkg-descr +++ b/mail/exim-devel/pkg-descr @@ -1,7 +1,7 @@ Exim is a mail transfer agent for Unix systems connected to the Internet. . Exim is intended for use as an Internet mailer, and therefore handles - addresses in RFC 822 domain format only. + addresses in RFC 822 domain format only. (No bangpaths!) . The only external transport currently implemented is an SMTP transport over a TCP/IP network (using sockets). A pipe transport is available, @@ -11,5 +11,8 @@ Exim is a mail transfer agent for Unix systems connected to the Internet. be configured to be "fussy" about certain hosts or domains, and can easily serve multiple domains. + . Exim is an excellent mailer for an ISP, as its control and flexibility + are very good. + . Its requeuing and retry algorithms are very powerful. diff --git a/mail/exim-devel/pkg-plist b/mail/exim-devel/pkg-plist index 636fe3ce67f7..e8892bc5ec9a 100644 --- a/mail/exim-devel/pkg-plist +++ b/mail/exim-devel/pkg-plist @@ -10,13 +10,5 @@ bin/exim_dbmbuild bin/exicyclog bin/exigrep bin/eximstats -etc/exim.conf +etc/exim/configure info/exim.info -info/exim.info-1 -info/exim.info-2 -info/exim.info-3 -info/exim.info-4 -info/exim.info-5 -info/exim.info-6 -info/exim.info-7 -info/exim.info-8 diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile index dd9892c7c6fb..e925efcdb748 100644 --- a/mail/exim-old/Makefile +++ b/mail/exim-old/Makefile @@ -1,31 +1,22 @@ # New ports collection makefile for: exim -# Version required: 0.53 +# Version required: 0.57 # Date created: 23 June 1996 # Whom: markm # -# $Id: Makefile,v 1.1.1.1 1996/07/06 11:13:57 markm Exp $ +# $Id: Makefile,v 1.2 1996/07/09 21:24:41 asami Exp $ # -DISTNAME= exim-0.53 +DISTNAME= exim-0.57 CATEGORIES+= mail MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ -DISTFILES= exim-0.53.tar.gz exim-texinfo-0.52.gz -EXTRACT_ONLY= exim-0.53.tar.gz - -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= exim-0.53.patch -PATCH_DIST_STRIP= -p2 +DISTFILES= exim-0.57.tar.gz exim-texinfo-0.57.tar.gz MAINTAINER= markm@FreeBSD.ORG -post-extract: - @cp ${DISTDIR}/exim-texinfo-0.52.gz ${WRKSRC}/doc - @gunzip ${WRKSRC}/doc/exim-texinfo-0.52 - do-configure: mkdir ${WRKSRC}/Local cp ${FILESDIR}/Makefile ${WRKSRC}/Local cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local - -(cd ${WRKSRC}; make) + (cd ${WRKSRC}/doc ; ln -s ../../exim-texinfo-0.57/doc/* ) .include <bsd.port.mk> diff --git a/mail/exim-old/distinfo b/mail/exim-old/distinfo index 9cc240b4fb8b..7ced0ff5400f 100644 --- a/mail/exim-old/distinfo +++ b/mail/exim-old/distinfo @@ -1,3 +1,2 @@ -MD5 (exim-0.53.tar.gz) = 7da8888862849fed6610dc6376f09557 -MD5 (exim-texinfo-0.52.gz) = 13d8717da854dba08365074c931adf25 -MD5 (exim-0.53.patch) = 7bac54dd31484305a9e0c23e017059b8 +MD5 (exim-0.57.tar.gz) = 1bb12bad99feda47379099bc375a6f5c +MD5 (exim-texinfo-0.57.tar.gz) = f833110a865267c0a0c843ebf8d6bb71 diff --git a/mail/exim-old/files/Makefile b/mail/exim-old/files/Makefile index f0432c722bf5..55796487c8db 100644 --- a/mail/exim-old/files/Makefile +++ b/mail/exim-old/files/Makefile @@ -2,44 +2,85 @@ # The Exim mail transport agent # ################################################## -# This is the template for Exim's main build-time configuration file. It +# This is the template for Exim's main build-time configuration file. It # contains settings that are independent of any operating system. It should # be edited and then saved to a file called Local/Makefile before first running # the make command. # Things that depend on the operating system have default settings in files # called OS/Makefile-<osname>. These can be overridden by creating files -# called Local/Makefile-<osname>, though it is hoped that this will rarely -# be necessary. +# called Local/Makefile-<osname>. In particular, the location of the X11 +# libraries is something that is quite variable between different versions +# of the same operation system (and indeed there are different versions of +# X11 as well, of course). The three settings concerned here are X11, XINCLUDE, +# and XLFLAGS (linking flags). There are defaults in OS/Makefile-Default which +# are overridden for some operating systems in the OS/Makefile-<osname> file. +# If these are not right for you, put appropriate settings into a file called +# Local/Makefile-<osname>. [In all cases "<osname>" stands for the name of +# your operating system - look at the names in the OS directory to see which +# names are recognized.] +############################################################################### # The binary directory: This variable defines where the exim binary will be # installed by "make install" or "exim_install". It is also used internally # by exim when it needs to re-invoke itself, either to send an error message, # or to recover root privilege. Exim's utility binaries and scripts are also -# installed in this directory. There is no default for this variable built into +# installed in this directory. There is no default for this variable built into # the source files; it must be set in one of the local configuration files. BIN_DIRECTORY=/usr/local/bin -# The info directory: This variable defines where the exim info files will be -# installed by "make install" or "exim_install". +# The info directory: This variable defines where the exim info file will be +# installed by "make install" or "exim_intall". INFO_DIRECTORY=/usr/local/info +# The compress command is used by the exicyclog script to compress old log +# files. Both the name of the command and the suffix that it adds to files +# need to be defined here. See also the EXICYCLOG_MAX configuration. + +COMPRESS_COMMAND=/usr/bin/gzip +COMPRESS_SUFFIX=gz + + # The runtime configuration file: This variable defines where Exim's runtime # configuration file is. There is no default built into the source files, so -# there must be a setting in one of the local configuration files. The -# location of all other runtime files and directories can be changed in the +# there must be a setting in one of the local configuration files. The +# location of all other runtime files and directories can be changed in the # runtime configuration file. -CONFIGURE_FILE=/usr/local/etc/exim.conf +CONFIGURE_FILE=/usr/local/etc/exim/configure + + +# In some installations there may be multiple machines sharing file systems, +# where a different configuration file is required for Exim on the different +# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look +# for a configuration file whose name is that defined by CONFIGURE_FILE, +# with the node name obtained by uname() tacked on the end, separated by a +# period (for example, /usr/exim/configure.host.in.some.domain. If this file +# does not exist, then the bare configuration file name is tried. + +# CONFIGURE_FILE_USE_NODE=yes + + +# In some esoteric configurations two different versions of Exim are run, +# with different setuid values, and different configuration files are required +# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then +# Exim will first look for a configuration file whose name is that defined +# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by +# a period (for eximple, /usr/exim/configure.0). If this file does not exist, +# then the bare configuration file name is tried. In the case when both +# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files +# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>. + +# CONFIGURE_FILE_USE_EUID=yes # The size of the delivery buffer: This specifies the size of buffer which is -# used when copying a message from the spool to a destination. The default +# used when copying a message from the spool to a destination. The default # value built into the source is 8192. # DELIVER_BUFFER_SIZE=8192 @@ -50,7 +91,7 @@ CONFIGURE_FILE=/usr/local/etc/exim.conf # are wanted must be defined here by setting the appropriate variables to the # value "yes". The actions of each director are described in a separate chapter # in the manual. Including a director in the binary does not cause it to -# be used automatically. It has also to be specified in the runtime +# be used automatically. It has also to be specified in the runtime # configuration file. DIRECTOR_ALIASFILE=yes @@ -61,7 +102,7 @@ DIRECTOR_SMARTUSER=yes # The mode of the database directory: Exim creates a directory called "db" # in its spool directory, to hold its databases of hints. This variable -# determines the mode of the created directory. The default value in the +# determines the mode of the created directory. The default value in the # source is 0750. # DB_DIRECTORY_MODE=0750 @@ -81,18 +122,24 @@ DIRECTOR_SMARTUSER=yes # DB_MODE=0640 +# Cycling log files: this variable specifies the maximum number of old +# log files that are kept by the exicyclog log-cycling script. + +EXICYCLOG_MAX=10 + + # Running Exim not as root: A uid and gid for Exim can be specified here. These # are compiled into the binary, but can be changed by settings in the runtime -# configuration file. The default in the code is -1, which means "unset" - -# i.e. run as root unless specified otherwise at run time. Specifying 0 at +# configuration file. The default in the code is -1, which means "unset" - +# i.e. run as root unless specified otherwise at run time. Specifying 0 at # run time has the effect of unsetting any configured values. # The settings here must be numeric; the run time file allows names to # be used. When this uid and gid are set, the Exim binary still has to be # setuid root if local deliveries are to be performed or a listener on port -# 25 is to be run, but it gives up its privilege when possible. There is a -# trade-off between security and efficiency, controlled by the runtime -# "security" setting, which controls how privilege is released (setuid vs +# 25 is to be run, but it gives up its privilege when possible. There is a +# trade-off between security and efficiency, controlled by the runtime +# "security" setting, which controls how privilege is released (setuid vs # seteuid). The default value of -1 here means "unset". # EXIM_GID=-1 @@ -103,13 +150,21 @@ DIRECTOR_SMARTUSER=yes # a program that requires an X11 display, then EXIM_MONITOR should be # set to the value "eximon.bin". Comment out this setting to disable # compilation of the binary file that is run by the eximon script. The -# locations of various X11 directories for libraries and include files +# locations of various X11 directories for libraries and include files # are defaulted in the OS/Makefile-Default file, and can be overridden # in local OS-specific make files. EXIM_MONITOR=eximon.bin +# The maximum length of header line that Exim is prepared to process. There +# is a limit in order to catch rogue mailers out there that might connect to +# the SMTP port, start off a header line, and then just pump junk for ever +# at it. The default is 8192. + +# HEADER_MAXLENGTH=8192 + + # The mode of the input directory: The input directory is where messages are # kept while awaiting delivery. Exim creates it if necessary, using a mode # which can be defined here (default 0750). @@ -117,14 +172,37 @@ EXIM_MONITOR=eximon.bin # INPUT_DIRECTORY_MODE=0750 -# Exim log directory and files: Exim creates a directory called "log" inside -# its spool directory. The mode defaults to 0750, but can be changed here. -# The log files themselves are created with a default mode of 0640, but that -# can also be changed here. +# Exim log directory and files: Exim creates several log files inside a +# single log directory. You can define the directory and the form of the +# log file name here, by setting LOG_FILE_PATH to a path name containing one +# occurrence of %s. This will be replaced by one of the strings "main", +# "panic", "process" or "reject" to form the final file name. For example, +# some installations may want something like this: + +LOG_FILE_PATH=/var/log/exim_%slog + +# which results in files with names /var/log/exim_mainlog, etc. The directory +# in which the log files are placed must exist; Exim does not try to create +# it for itself. It is also your responsibility to ensure that Exim is capable +# of writing files using this path name. If you have defined EXIM_UID and +# EXIM_GID above, then that uid and gid must be able to create files in the +# directory you have specified. + + +# If you do not set LOG_FILE_PATH, then Exim creates a directory called +# "log" inside its spool directory (see SPOOL_DIRECTORY below) and uses that +# with filenames "mainlog", "paniclog", etc. Its mode defaults to 0750 but +# that can be changed here. # LOG_DIRECTORY_MODE=0750 + +# This value is used only when Exim creates the directory for itself. + +# The log files themselves are created as required, with a mode that defaults +# to 0640, but which can be changed here. + # LOG_MODE=0640 - + # Per-message logs: While a message is in the process of being delivered, # comments on its progress are written to a message log, for the benefit of @@ -133,40 +211,71 @@ EXIM_MONITOR=eximon.bin # The message log directory is also used for storing files that are used by # transports for returning data to a message's sender (see the "return_output" # option for transports). - + # MSGLOG_DIRECTORY_MODE=0750 +# Identifying the daemon: When an Exim daemon starts up, it writes its pid to +# a file so that it can easily be identified. The path of the file can be +# specified here. It must contain precisely one occurrence of "%s". When +# a daemon is run on the default SMTP port, this is replaced with the null +# string, but when it is run with some explicit port specified, "%s" is +# replaced with the port number preceded by a dot. Some installations may +# want something like this + +PID_FILE_PATH=/var/run/exim%s.pid + +# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory +# (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard +# daemon, or "exim-daemon.<port>.pid" for a daemon listening on a non-standard +# port. If you run a daemon that does not have both the -bd and -q options, +# then whichever of the two options it does have is added to the file name, +# whether obtained from PID_FILE_PATH or by default. + +# If you set PID_FILE_PATH, then it is your responsibility to ensure that +# Exim is capable of writing to the relevant files. If you have defined +# EXIM_UID and EXIM_GID above, then that uid/gid combination must be able to +# create and write to the files. If the attempt to open the file fails, Exim +# just refrains from trying to write the data. + + # Included routers: These variables determine which individual router drivers # are included in the Exim binary. There are no defaults; those that are # wanted must be defined here by setting the appropriate variables to the value # "yes". The actions of each router are described in a separate chapter # in the manual. Including a router in the binary does not cause it to -# be used automatically. It has also to be specified in the runtime -# configuration file. +# be used automatically. It has also to be specified in the runtime +# configuration file. Those routers that are *not* wanted must not be defined +# here at all - comment them out. ROUTER_DOMAINLIST=yes +ROUTER_IPLITERAL=yes ROUTER_LOOKUPHOST=yes ROUTER_QUERYPROGRAM=yes +# This one is very special-purpose, so is not included by default. + +# ROUTER_IPLOOKUP=yes + # The spool directory: This directory is where all the data for messages in # transit is kept. There is no default in the source, so its location must be # defined in a local configuration file. Exim creates it if it does not exist, -# using the mode required for the sub-directory that it is trying to create at -# the time. If a non-root uid and gid have been defined for Exim (either in -# this configuration file, or by the runtime configuration options), then this +# using the mode required for the sub-directory that it is trying to create at +# the time. If a non-root uid and gid have been defined for Exim (either in +# this configuration file, or by the runtime configuration options), then this # directory and all sub-directories and their files will be created with their # owners and groups set to Exim's uid and gid. # Many installations will want something like this -SPOOL_DIRECTORY=/var/spool/exim +# SPOOL_DIRECTORY=/var/spool/exim # Others may prefer to keep all Exim things under one directory -# SPOOL_DIRECTORY=/usr/exim/spool + +SPOOL_DIRECTORY=/var/spool/exim -# If Exim creates the spool directory, it is given this mode, defaulting in the +# If Exim creates the spool directory, it is given this mode, defaulting in the # source to 0750. # SPOOL_DIRECTORY_MODE=0750 @@ -174,7 +283,7 @@ SPOOL_DIRECTORY=/var/spool/exim # The mode of files on the input spool which hold the contents of message can # be changed here. The default is 0600. If you have defined a uid and gid for -# Exim and want information from the spool to be available to anyone who is a +# Exim and want information from the spool to be available to anyone who is a # member of the Exim group, change the value to 0640. This is particularly # relevant if you are going to run the Exim monitor. @@ -183,7 +292,7 @@ SPOOL_DIRECTORY=/var/spool/exim # If STDERR_FILE is defined then the -df command line option causes Exim to # redirect stderr to the named file. This is useful for catching debugging -# output when starting Exim via inetd. +# output when starting Exim via inetd. # STDERR_FILE= @@ -193,10 +302,11 @@ SPOOL_DIRECTORY=/var/spool/exim # are wanted must be defined here by setting the appropriate variables to the # value "yes". The actions of each transport are described in a separate chapter # in the manual. Including a transport in the binary does not cause it to -# be used automatically. It has also to be specified in the runtime +# be used automatically. It has also to be specified in the runtime # configuration file. TRANSPORT_APPENDFILE=yes +TRANSPORT_AUTOREPLY=yes TRANSPORT_PIPE=yes TRANSPORT_SMTP=yes diff --git a/mail/exim-old/files/eximon.conf b/mail/exim-old/files/eximon.conf index 350c7524a36a..236bfbb2b853 100644 --- a/mail/exim-old/files/eximon.conf +++ b/mail/exim-old/files/eximon.conf @@ -2,13 +2,17 @@ # The Exim Monitor # ################################################## -# This is the template for the Exim monitor's main build-time configuration -# file. It contains settings that are independent of any operating system. It -# should be edited and then saved to a file called Local/eximon.conf before +# This is the template for the Exim monitor's main build-time configuration +# file. It contains settings that are independent of any operating system. It +# should be edited and then saved to a file called Local/eximon.conf before # running the make command to build the monitor, if any settings are required. -# Local/eximon.conf can be empty if no changes are needed. The examples given +# Local/eximon.conf can be empty if no changes are needed. The examples given # here (commented out) are the default settings. +# Any settings made in the configuration file can be overridden at run time +# by setting up an environment variable with the same name as any of these +# options, but preceded by EXIMON_, for example, EXIMON_WINDOW_TITLE. + ################################################################## # Set these variables as appropriate for your system # @@ -16,15 +20,16 @@ # The qualifying name for your domain. The only use made of this is for # testing that certain addresses are the same when displaying the -# log tail, and for shortening sender addresses in the queue display. +# log tail, and for shortening sender addresses in the queue display. # QUALIFY_DOMAIN= -# The initial depth for the main display window, in pixels. The minimum -# is 160, which is enough to hold the stripcharts but not the other -# display sub-windows. +# The default minimum width and height for the whole window are 103 and +# 162 pixels respectively. This is enough to hold the left-most stripchart +# and the quit button. The values can be changed here. -# START_DEPTH=700 +# MIN_HEIGHT=162 +# MIN_WIDTH=103 # The title for eximon's main display window. It is possible to have # host name of the machine you are running on substituted into the @@ -34,7 +39,7 @@ # stripped from its right-hand end before being substituted. Any other # shell or environment variables may also be included. -# If you use any substitutions, remember to ensure that the $ and {} +# If you use any substitutions, remember to ensure that the $ and {} # characters are escaped from the shell, e.g. by using single quotes. # WINDOW_TITLE='${hostname} eximon' @@ -59,7 +64,7 @@ # The font which is used in the log tail display. This is defined in # the normal X manner. It must be a "character cell" font, because this -# is required by the text widget. +# is required by the text widget. # LOG_FONT=-misc-fixed-medium-r-normal-*-14-140-*-*-*-*-iso8859-1 @@ -81,22 +86,48 @@ # QUEUE_MAX_ADDRESSES=10 # The display of the contents of the queue is updated every QUEUE_INTERVAL -# seconds by default (there is a button to request update). +# seconds by default (there is a button to request update). # QUEUE_INTERVAL=300 +# The keystroke/mouse-operation that is used to pop up the menu in the +# queue window is configurable. The default is Shift with the lefthand +# mouse button. The name of an alternative can be specified in the standard +# X way of naming these things. With the default configuration for the monitor, +# individuals can override this by setting the EXIMON_MENU_EVENT environment +# variable. + +# MENU_EVENT=Shift<Btn1Down> + +# When the menu is used to perform an operation on a message, the output +# from the exim command that is generated is displayed in a separate window +# by default. Set this option to "no" if you don't want to see the output - +# the result of the operation is normally visible in the log window in any +# case. This does not apply to the output generated from attempting to +# deliver a message. That is always shown. + +# ACTION_OUTPUT=yes + +# When some action is taken on a message, such as freezing it, or changing +# its recipients, the queue display is normally automatically updated. On +# systems that have very large queues, this can take some time and be dis- +# tracting. If this option is set to "no", the queue display is no longer +# automatically updated after an action is applied to a message. + +# ACTION_QUEUE_UPDATE=yes + # The stripcharts are updated every STRIPCHART_INTERVAL seconds. # STRIPCHART_INTERVAL=60 # The following variable contains a specification of which stripcharts -# you want eximon to display based on log entries. The string consists of -# pairs of strings, delimited by slash characters. The first string in each -# pair is a regular expression that matches some distinguishing feature in a +# you want eximon to display based on log entries. The string consists of +# pairs of strings, delimited by slash characters. The first string in each +# pair is a regular expression that matches some distinguishing feature in a # exim log entry. # Entries that match the expression will be counted and displayed in a -# stripchart whose title is given by the second string. The string may +# stripchart whose title is given by the second string. The string may # be continued over several input lines, provided that it is split # after a slash, and an additional slash (optionally preceded by white # space) is included at the start of the continuation line. @@ -108,18 +139,18 @@ # more pieces, concatenated. It matches a match for the first, followed by # a match for the second, etc. A piece is an atom possibly followed by # `*', `+', or `?'. -# +# # An atom followed by `*' matches a sequence of 0 or more matches of the atom. # An atom followed by `+' matches a sequence of 1 or more matches of the atom. # An atom followed by `?' matches a match of the atom, or the null string. -# +# # An atom is a regular expression in parentheses (matching a match for the # regular expression), a range (see below), `.' (matching any single # character), `^' (matching the null string at the beginning of the input # string), `$' (matching the null string at the end of the input string), # a `\' followed by a single character (matching that character), or a # single character with no other significance (matching that character). -# +# # A range is a sequence of characters enclosed in `[]'. It normally # matches any single character from the sequence. If the sequence begins # with `^', it matches any single character not from the rest of the @@ -129,15 +160,15 @@ # sequence, make it the first character (following a possible `^'). To # include a literal `-', make it the first or last character. -# A stripchart showing the count of messages in the queue is always +# A stripchart showing the count of messages in the queue is always # displayed on the left of eximon's window. Stripcharts configured # by this parameter are displayed to its right, in the order defined # here. # LOG_STRIPCHARTS='/ <= /in/ # / => /out/ -# /D=/local/ -# /T=smtp/smtp/' +# / => .+ D=/local/ +# / => .+ T=smtp/smtp/' # The following variable may be set to the name of a disc partition. If # it is, a stripchart showing the percentage fullness of the partition diff --git a/mail/exim-old/files/patch-aa b/mail/exim-old/files/patch-aa index 1f37cb44967e..10178af22133 100644 --- a/mail/exim-old/files/patch-aa +++ b/mail/exim-old/files/patch-aa @@ -1,9 +1,38 @@ -diff -udr ../exim-0.52.ORG/scripts/exim_install ./scripts/exim_install ---- ../exim-0.52.ORG/scripts/exim_install Mon Jun 10 12:04:44 1996 -+++ ./scripts/exim_install Sun Jun 23 10:42:40 1996 -@@ -63,6 +63,20 @@ +--- scripts/exim_install.ORG Tue Oct 29 17:46:05 1996 ++++ scripts/exim_install Thu Oct 31 20:53:16 1996 +@@ -8,6 +8,8 @@ + # This script also installs a default configuration file in CONFIGURE_FILE + # if there is no configuration file there. + ++# This script also installs a .info file in INFO_DIRECTORY if required. ++ + # The script can be made to output what it would do, without actually doing + # anything, by giving it the option "-n" (cf make). Arguments are the names + # of things to install. No arguments installs everything. +@@ -65,10 +67,12 @@ + fi + + BIN_DIRECTORY=`grep -h "^ *BIN_DIRECTORY" $files | tail -1 | cut -c15-99` ++INFO_DIRECTORY=`grep -h "^ *INFO_DIRECTORY" $files | tail -1 | cut -c16-99` + CONFIGURE_FILE=`grep -h "^ *CONFIGURE_FILE" $files | tail -1 | cut -c16-99` + + # Allow INST_xx to over-ride xx + case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac ++case "$INST_INFO_DIRECTORY" in ?*) INFO_DIRECTORY="$INST_INFO_DIRECTORY";; esac + case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac + case "$INST_CP" in '') CP=cp;; *) CP="$INST_CP";; esac + case "$INST_MV" in '') MV=mv;; *) MV="$INST_MV";; esac +@@ -76,6 +80,7 @@ + + # Allow the user to over-ride xx + case "$dest" in ?*) BIN_DIRECTORY="$dest";; esac ++case "$info" in ?*) INFO_DIRECTORY="$info";; esac + case "$conf" in ?*) CONFIGURE_FILE="$conf";; esac + case "$cp" in ?*) CP="$cp";; esac + case "$mv" in ?*) MV="$mv";; esac +@@ -101,6 +106,20 @@ fi - fi + fi +# If info directory doesn't exist, try to create it + @@ -22,22 +51,28 @@ diff -udr ../exim-0.52.ORG/scripts/exim_install ./scripts/exim_install # If no arguments, install everything if [ $# -gt 0 ]; then -@@ -127,6 +141,18 @@ - echo $com ${name} is not newer than ${BIN_DIRECTORY}/${name} - fi +@@ -166,12 +185,24 @@ + fi done -+ + +echo $com "" +echo $com Installation directory is ${INFO_DIRECTORY} +echo $com "" + -+if [ -f ../doc/exim-texinfo-0.52 ]; then -+ makeinfo --output ../doc/exim.info ../doc/exim-texinfo-0.52 -+ for info in ../doc/exim.info*; do -+ echo ${CP} ${info} ${INFO_DIRECTORY} -+ ${real} ${CP} ${info} ${INFO_DIRECTORY} ; gzip -9n ${INFO_DIRECTORY}/${info} -+ done ++if [ -f ../doc/spec.texinfo ]; then ++ makeinfo --no-split --output exim.info ../doc/spec.texinfo ++ echo ${CP} exim.info ${INFO_DIRECTORY} ++ ${real} ${CP} exim.info ${INFO_DIRECTORY} +fi - ++ # If there is no configuration file, install the default, # building the lib directory if necessary. + + echo $com "" + + if [ ! -f ${CONFIGURE_FILE} ]; then ++ echo mkdir -p `dirname ${CONFIGURE_FILE}` ++ ${real} mkdir -p `dirname ${CONFIGURE_FILE}` + echo $com Installing default configuration in ${CONFIGURE_FILE} + echo $com because there is no existing configuration file. + echo ${CP} ../src/configure.default ${CONFIGURE_FILE} diff --git a/mail/exim-old/pkg-descr b/mail/exim-old/pkg-descr index ffc90bf0c43f..591d2c48a225 100644 --- a/mail/exim-old/pkg-descr +++ b/mail/exim-old/pkg-descr @@ -1,7 +1,7 @@ Exim is a mail transfer agent for Unix systems connected to the Internet. . Exim is intended for use as an Internet mailer, and therefore handles - addresses in RFC 822 domain format only. + addresses in RFC 822 domain format only. (No bangpaths!) . The only external transport currently implemented is an SMTP transport over a TCP/IP network (using sockets). A pipe transport is available, @@ -11,5 +11,8 @@ Exim is a mail transfer agent for Unix systems connected to the Internet. be configured to be "fussy" about certain hosts or domains, and can easily serve multiple domains. + . Exim is an excellent mailer for an ISP, as its control and flexibility + are very good. + . Its requeuing and retry algorithms are very powerful. diff --git a/mail/exim-old/pkg-plist b/mail/exim-old/pkg-plist index 636fe3ce67f7..e8892bc5ec9a 100644 --- a/mail/exim-old/pkg-plist +++ b/mail/exim-old/pkg-plist @@ -10,13 +10,5 @@ bin/exim_dbmbuild bin/exicyclog bin/exigrep bin/eximstats -etc/exim.conf +etc/exim/configure info/exim.info -info/exim.info-1 -info/exim.info-2 -info/exim.info-3 -info/exim.info-4 -info/exim.info-5 -info/exim.info-6 -info/exim.info-7 -info/exim.info-8 diff --git a/mail/exim/Makefile b/mail/exim/Makefile index dd9892c7c6fb..e925efcdb748 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,31 +1,22 @@ # New ports collection makefile for: exim -# Version required: 0.53 +# Version required: 0.57 # Date created: 23 June 1996 # Whom: markm # -# $Id: Makefile,v 1.1.1.1 1996/07/06 11:13:57 markm Exp $ +# $Id: Makefile,v 1.2 1996/07/09 21:24:41 asami Exp $ # -DISTNAME= exim-0.53 +DISTNAME= exim-0.57 CATEGORIES+= mail MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ -DISTFILES= exim-0.53.tar.gz exim-texinfo-0.52.gz -EXTRACT_ONLY= exim-0.53.tar.gz - -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= exim-0.53.patch -PATCH_DIST_STRIP= -p2 +DISTFILES= exim-0.57.tar.gz exim-texinfo-0.57.tar.gz MAINTAINER= markm@FreeBSD.ORG -post-extract: - @cp ${DISTDIR}/exim-texinfo-0.52.gz ${WRKSRC}/doc - @gunzip ${WRKSRC}/doc/exim-texinfo-0.52 - do-configure: mkdir ${WRKSRC}/Local cp ${FILESDIR}/Makefile ${WRKSRC}/Local cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local - -(cd ${WRKSRC}; make) + (cd ${WRKSRC}/doc ; ln -s ../../exim-texinfo-0.57/doc/* ) .include <bsd.port.mk> diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 9cc240b4fb8b..7ced0ff5400f 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,3 +1,2 @@ -MD5 (exim-0.53.tar.gz) = 7da8888862849fed6610dc6376f09557 -MD5 (exim-texinfo-0.52.gz) = 13d8717da854dba08365074c931adf25 -MD5 (exim-0.53.patch) = 7bac54dd31484305a9e0c23e017059b8 +MD5 (exim-0.57.tar.gz) = 1bb12bad99feda47379099bc375a6f5c +MD5 (exim-texinfo-0.57.tar.gz) = f833110a865267c0a0c843ebf8d6bb71 diff --git a/mail/exim/files/Makefile b/mail/exim/files/Makefile index f0432c722bf5..55796487c8db 100644 --- a/mail/exim/files/Makefile +++ b/mail/exim/files/Makefile @@ -2,44 +2,85 @@ # The Exim mail transport agent # ################################################## -# This is the template for Exim's main build-time configuration file. It +# This is the template for Exim's main build-time configuration file. It # contains settings that are independent of any operating system. It should # be edited and then saved to a file called Local/Makefile before first running # the make command. # Things that depend on the operating system have default settings in files # called OS/Makefile-<osname>. These can be overridden by creating files -# called Local/Makefile-<osname>, though it is hoped that this will rarely -# be necessary. +# called Local/Makefile-<osname>. In particular, the location of the X11 +# libraries is something that is quite variable between different versions +# of the same operation system (and indeed there are different versions of +# X11 as well, of course). The three settings concerned here are X11, XINCLUDE, +# and XLFLAGS (linking flags). There are defaults in OS/Makefile-Default which +# are overridden for some operating systems in the OS/Makefile-<osname> file. +# If these are not right for you, put appropriate settings into a file called +# Local/Makefile-<osname>. [In all cases "<osname>" stands for the name of +# your operating system - look at the names in the OS directory to see which +# names are recognized.] +############################################################################### # The binary directory: This variable defines where the exim binary will be # installed by "make install" or "exim_install". It is also used internally # by exim when it needs to re-invoke itself, either to send an error message, # or to recover root privilege. Exim's utility binaries and scripts are also -# installed in this directory. There is no default for this variable built into +# installed in this directory. There is no default for this variable built into # the source files; it must be set in one of the local configuration files. BIN_DIRECTORY=/usr/local/bin -# The info directory: This variable defines where the exim info files will be -# installed by "make install" or "exim_install". +# The info directory: This variable defines where the exim info file will be +# installed by "make install" or "exim_intall". INFO_DIRECTORY=/usr/local/info +# The compress command is used by the exicyclog script to compress old log +# files. Both the name of the command and the suffix that it adds to files +# need to be defined here. See also the EXICYCLOG_MAX configuration. + +COMPRESS_COMMAND=/usr/bin/gzip +COMPRESS_SUFFIX=gz + + # The runtime configuration file: This variable defines where Exim's runtime # configuration file is. There is no default built into the source files, so -# there must be a setting in one of the local configuration files. The -# location of all other runtime files and directories can be changed in the +# there must be a setting in one of the local configuration files. The +# location of all other runtime files and directories can be changed in the # runtime configuration file. -CONFIGURE_FILE=/usr/local/etc/exim.conf +CONFIGURE_FILE=/usr/local/etc/exim/configure + + +# In some installations there may be multiple machines sharing file systems, +# where a different configuration file is required for Exim on the different +# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look +# for a configuration file whose name is that defined by CONFIGURE_FILE, +# with the node name obtained by uname() tacked on the end, separated by a +# period (for example, /usr/exim/configure.host.in.some.domain. If this file +# does not exist, then the bare configuration file name is tried. + +# CONFIGURE_FILE_USE_NODE=yes + + +# In some esoteric configurations two different versions of Exim are run, +# with different setuid values, and different configuration files are required +# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then +# Exim will first look for a configuration file whose name is that defined +# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by +# a period (for eximple, /usr/exim/configure.0). If this file does not exist, +# then the bare configuration file name is tried. In the case when both +# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files +# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>. + +# CONFIGURE_FILE_USE_EUID=yes # The size of the delivery buffer: This specifies the size of buffer which is -# used when copying a message from the spool to a destination. The default +# used when copying a message from the spool to a destination. The default # value built into the source is 8192. # DELIVER_BUFFER_SIZE=8192 @@ -50,7 +91,7 @@ CONFIGURE_FILE=/usr/local/etc/exim.conf # are wanted must be defined here by setting the appropriate variables to the # value "yes". The actions of each director are described in a separate chapter # in the manual. Including a director in the binary does not cause it to -# be used automatically. It has also to be specified in the runtime +# be used automatically. It has also to be specified in the runtime # configuration file. DIRECTOR_ALIASFILE=yes @@ -61,7 +102,7 @@ DIRECTOR_SMARTUSER=yes # The mode of the database directory: Exim creates a directory called "db" # in its spool directory, to hold its databases of hints. This variable -# determines the mode of the created directory. The default value in the +# determines the mode of the created directory. The default value in the # source is 0750. # DB_DIRECTORY_MODE=0750 @@ -81,18 +122,24 @@ DIRECTOR_SMARTUSER=yes # DB_MODE=0640 +# Cycling log files: this variable specifies the maximum number of old +# log files that are kept by the exicyclog log-cycling script. + +EXICYCLOG_MAX=10 + + # Running Exim not as root: A uid and gid for Exim can be specified here. These # are compiled into the binary, but can be changed by settings in the runtime -# configuration file. The default in the code is -1, which means "unset" - -# i.e. run as root unless specified otherwise at run time. Specifying 0 at +# configuration file. The default in the code is -1, which means "unset" - +# i.e. run as root unless specified otherwise at run time. Specifying 0 at # run time has the effect of unsetting any configured values. # The settings here must be numeric; the run time file allows names to # be used. When this uid and gid are set, the Exim binary still has to be # setuid root if local deliveries are to be performed or a listener on port -# 25 is to be run, but it gives up its privilege when possible. There is a -# trade-off between security and efficiency, controlled by the runtime -# "security" setting, which controls how privilege is released (setuid vs +# 25 is to be run, but it gives up its privilege when possible. There is a +# trade-off between security and efficiency, controlled by the runtime +# "security" setting, which controls how privilege is released (setuid vs # seteuid). The default value of -1 here means "unset". # EXIM_GID=-1 @@ -103,13 +150,21 @@ DIRECTOR_SMARTUSER=yes # a program that requires an X11 display, then EXIM_MONITOR should be # set to the value "eximon.bin". Comment out this setting to disable # compilation of the binary file that is run by the eximon script. The -# locations of various X11 directories for libraries and include files +# locations of various X11 directories for libraries and include files # are defaulted in the OS/Makefile-Default file, and can be overridden # in local OS-specific make files. EXIM_MONITOR=eximon.bin +# The maximum length of header line that Exim is prepared to process. There +# is a limit in order to catch rogue mailers out there that might connect to +# the SMTP port, start off a header line, and then just pump junk for ever +# at it. The default is 8192. + +# HEADER_MAXLENGTH=8192 + + # The mode of the input directory: The input directory is where messages are # kept while awaiting delivery. Exim creates it if necessary, using a mode # which can be defined here (default 0750). @@ -117,14 +172,37 @@ EXIM_MONITOR=eximon.bin # INPUT_DIRECTORY_MODE=0750 -# Exim log directory and files: Exim creates a directory called "log" inside -# its spool directory. The mode defaults to 0750, but can be changed here. -# The log files themselves are created with a default mode of 0640, but that -# can also be changed here. +# Exim log directory and files: Exim creates several log files inside a +# single log directory. You can define the directory and the form of the +# log file name here, by setting LOG_FILE_PATH to a path name containing one +# occurrence of %s. This will be replaced by one of the strings "main", +# "panic", "process" or "reject" to form the final file name. For example, +# some installations may want something like this: + +LOG_FILE_PATH=/var/log/exim_%slog + +# which results in files with names /var/log/exim_mainlog, etc. The directory +# in which the log files are placed must exist; Exim does not try to create +# it for itself. It is also your responsibility to ensure that Exim is capable +# of writing files using this path name. If you have defined EXIM_UID and +# EXIM_GID above, then that uid and gid must be able to create files in the +# directory you have specified. + + +# If you do not set LOG_FILE_PATH, then Exim creates a directory called +# "log" inside its spool directory (see SPOOL_DIRECTORY below) and uses that +# with filenames "mainlog", "paniclog", etc. Its mode defaults to 0750 but +# that can be changed here. # LOG_DIRECTORY_MODE=0750 + +# This value is used only when Exim creates the directory for itself. + +# The log files themselves are created as required, with a mode that defaults +# to 0640, but which can be changed here. + # LOG_MODE=0640 - + # Per-message logs: While a message is in the process of being delivered, # comments on its progress are written to a message log, for the benefit of @@ -133,40 +211,71 @@ EXIM_MONITOR=eximon.bin # The message log directory is also used for storing files that are used by # transports for returning data to a message's sender (see the "return_output" # option for transports). - + # MSGLOG_DIRECTORY_MODE=0750 +# Identifying the daemon: When an Exim daemon starts up, it writes its pid to +# a file so that it can easily be identified. The path of the file can be +# specified here. It must contain precisely one occurrence of "%s". When +# a daemon is run on the default SMTP port, this is replaced with the null +# string, but when it is run with some explicit port specified, "%s" is +# replaced with the port number preceded by a dot. Some installations may +# want something like this + +PID_FILE_PATH=/var/run/exim%s.pid + +# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory +# (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard +# daemon, or "exim-daemon.<port>.pid" for a daemon listening on a non-standard +# port. If you run a daemon that does not have both the -bd and -q options, +# then whichever of the two options it does have is added to the file name, +# whether obtained from PID_FILE_PATH or by default. + +# If you set PID_FILE_PATH, then it is your responsibility to ensure that +# Exim is capable of writing to the relevant files. If you have defined +# EXIM_UID and EXIM_GID above, then that uid/gid combination must be able to +# create and write to the files. If the attempt to open the file fails, Exim +# just refrains from trying to write the data. + + # Included routers: These variables determine which individual router drivers # are included in the Exim binary. There are no defaults; those that are # wanted must be defined here by setting the appropriate variables to the value # "yes". The actions of each router are described in a separate chapter # in the manual. Including a router in the binary does not cause it to -# be used automatically. It has also to be specified in the runtime -# configuration file. +# be used automatically. It has also to be specified in the runtime +# configuration file. Those routers that are *not* wanted must not be defined +# here at all - comment them out. ROUTER_DOMAINLIST=yes +ROUTER_IPLITERAL=yes ROUTER_LOOKUPHOST=yes ROUTER_QUERYPROGRAM=yes +# This one is very special-purpose, so is not included by default. + +# ROUTER_IPLOOKUP=yes + # The spool directory: This directory is where all the data for messages in # transit is kept. There is no default in the source, so its location must be # defined in a local configuration file. Exim creates it if it does not exist, -# using the mode required for the sub-directory that it is trying to create at -# the time. If a non-root uid and gid have been defined for Exim (either in -# this configuration file, or by the runtime configuration options), then this +# using the mode required for the sub-directory that it is trying to create at +# the time. If a non-root uid and gid have been defined for Exim (either in +# this configuration file, or by the runtime configuration options), then this # directory and all sub-directories and their files will be created with their # owners and groups set to Exim's uid and gid. # Many installations will want something like this -SPOOL_DIRECTORY=/var/spool/exim +# SPOOL_DIRECTORY=/var/spool/exim # Others may prefer to keep all Exim things under one directory -# SPOOL_DIRECTORY=/usr/exim/spool + +SPOOL_DIRECTORY=/var/spool/exim -# If Exim creates the spool directory, it is given this mode, defaulting in the +# If Exim creates the spool directory, it is given this mode, defaulting in the # source to 0750. # SPOOL_DIRECTORY_MODE=0750 @@ -174,7 +283,7 @@ SPOOL_DIRECTORY=/var/spool/exim # The mode of files on the input spool which hold the contents of message can # be changed here. The default is 0600. If you have defined a uid and gid for -# Exim and want information from the spool to be available to anyone who is a +# Exim and want information from the spool to be available to anyone who is a # member of the Exim group, change the value to 0640. This is particularly # relevant if you are going to run the Exim monitor. @@ -183,7 +292,7 @@ SPOOL_DIRECTORY=/var/spool/exim # If STDERR_FILE is defined then the -df command line option causes Exim to # redirect stderr to the named file. This is useful for catching debugging -# output when starting Exim via inetd. +# output when starting Exim via inetd. # STDERR_FILE= @@ -193,10 +302,11 @@ SPOOL_DIRECTORY=/var/spool/exim # are wanted must be defined here by setting the appropriate variables to the # value "yes". The actions of each transport are described in a separate chapter # in the manual. Including a transport in the binary does not cause it to -# be used automatically. It has also to be specified in the runtime +# be used automatically. It has also to be specified in the runtime # configuration file. TRANSPORT_APPENDFILE=yes +TRANSPORT_AUTOREPLY=yes TRANSPORT_PIPE=yes TRANSPORT_SMTP=yes diff --git a/mail/exim/files/eximon.conf b/mail/exim/files/eximon.conf index 350c7524a36a..236bfbb2b853 100644 --- a/mail/exim/files/eximon.conf +++ b/mail/exim/files/eximon.conf @@ -2,13 +2,17 @@ # The Exim Monitor # ################################################## -# This is the template for the Exim monitor's main build-time configuration -# file. It contains settings that are independent of any operating system. It -# should be edited and then saved to a file called Local/eximon.conf before +# This is the template for the Exim monitor's main build-time configuration +# file. It contains settings that are independent of any operating system. It +# should be edited and then saved to a file called Local/eximon.conf before # running the make command to build the monitor, if any settings are required. -# Local/eximon.conf can be empty if no changes are needed. The examples given +# Local/eximon.conf can be empty if no changes are needed. The examples given # here (commented out) are the default settings. +# Any settings made in the configuration file can be overridden at run time +# by setting up an environment variable with the same name as any of these +# options, but preceded by EXIMON_, for example, EXIMON_WINDOW_TITLE. + ################################################################## # Set these variables as appropriate for your system # @@ -16,15 +20,16 @@ # The qualifying name for your domain. The only use made of this is for # testing that certain addresses are the same when displaying the -# log tail, and for shortening sender addresses in the queue display. +# log tail, and for shortening sender addresses in the queue display. # QUALIFY_DOMAIN= -# The initial depth for the main display window, in pixels. The minimum -# is 160, which is enough to hold the stripcharts but not the other -# display sub-windows. +# The default minimum width and height for the whole window are 103 and +# 162 pixels respectively. This is enough to hold the left-most stripchart +# and the quit button. The values can be changed here. -# START_DEPTH=700 +# MIN_HEIGHT=162 +# MIN_WIDTH=103 # The title for eximon's main display window. It is possible to have # host name of the machine you are running on substituted into the @@ -34,7 +39,7 @@ # stripped from its right-hand end before being substituted. Any other # shell or environment variables may also be included. -# If you use any substitutions, remember to ensure that the $ and {} +# If you use any substitutions, remember to ensure that the $ and {} # characters are escaped from the shell, e.g. by using single quotes. # WINDOW_TITLE='${hostname} eximon' @@ -59,7 +64,7 @@ # The font which is used in the log tail display. This is defined in # the normal X manner. It must be a "character cell" font, because this -# is required by the text widget. +# is required by the text widget. # LOG_FONT=-misc-fixed-medium-r-normal-*-14-140-*-*-*-*-iso8859-1 @@ -81,22 +86,48 @@ # QUEUE_MAX_ADDRESSES=10 # The display of the contents of the queue is updated every QUEUE_INTERVAL -# seconds by default (there is a button to request update). +# seconds by default (there is a button to request update). # QUEUE_INTERVAL=300 +# The keystroke/mouse-operation that is used to pop up the menu in the +# queue window is configurable. The default is Shift with the lefthand +# mouse button. The name of an alternative can be specified in the standard +# X way of naming these things. With the default configuration for the monitor, +# individuals can override this by setting the EXIMON_MENU_EVENT environment +# variable. + +# MENU_EVENT=Shift<Btn1Down> + +# When the menu is used to perform an operation on a message, the output +# from the exim command that is generated is displayed in a separate window +# by default. Set this option to "no" if you don't want to see the output - +# the result of the operation is normally visible in the log window in any +# case. This does not apply to the output generated from attempting to +# deliver a message. That is always shown. + +# ACTION_OUTPUT=yes + +# When some action is taken on a message, such as freezing it, or changing +# its recipients, the queue display is normally automatically updated. On +# systems that have very large queues, this can take some time and be dis- +# tracting. If this option is set to "no", the queue display is no longer +# automatically updated after an action is applied to a message. + +# ACTION_QUEUE_UPDATE=yes + # The stripcharts are updated every STRIPCHART_INTERVAL seconds. # STRIPCHART_INTERVAL=60 # The following variable contains a specification of which stripcharts -# you want eximon to display based on log entries. The string consists of -# pairs of strings, delimited by slash characters. The first string in each -# pair is a regular expression that matches some distinguishing feature in a +# you want eximon to display based on log entries. The string consists of +# pairs of strings, delimited by slash characters. The first string in each +# pair is a regular expression that matches some distinguishing feature in a # exim log entry. # Entries that match the expression will be counted and displayed in a -# stripchart whose title is given by the second string. The string may +# stripchart whose title is given by the second string. The string may # be continued over several input lines, provided that it is split # after a slash, and an additional slash (optionally preceded by white # space) is included at the start of the continuation line. @@ -108,18 +139,18 @@ # more pieces, concatenated. It matches a match for the first, followed by # a match for the second, etc. A piece is an atom possibly followed by # `*', `+', or `?'. -# +# # An atom followed by `*' matches a sequence of 0 or more matches of the atom. # An atom followed by `+' matches a sequence of 1 or more matches of the atom. # An atom followed by `?' matches a match of the atom, or the null string. -# +# # An atom is a regular expression in parentheses (matching a match for the # regular expression), a range (see below), `.' (matching any single # character), `^' (matching the null string at the beginning of the input # string), `$' (matching the null string at the end of the input string), # a `\' followed by a single character (matching that character), or a # single character with no other significance (matching that character). -# +# # A range is a sequence of characters enclosed in `[]'. It normally # matches any single character from the sequence. If the sequence begins # with `^', it matches any single character not from the rest of the @@ -129,15 +160,15 @@ # sequence, make it the first character (following a possible `^'). To # include a literal `-', make it the first or last character. -# A stripchart showing the count of messages in the queue is always +# A stripchart showing the count of messages in the queue is always # displayed on the left of eximon's window. Stripcharts configured # by this parameter are displayed to its right, in the order defined # here. # LOG_STRIPCHARTS='/ <= /in/ # / => /out/ -# /D=/local/ -# /T=smtp/smtp/' +# / => .+ D=/local/ +# / => .+ T=smtp/smtp/' # The following variable may be set to the name of a disc partition. If # it is, a stripchart showing the percentage fullness of the partition diff --git a/mail/exim/files/patch-aa b/mail/exim/files/patch-aa index 1f37cb44967e..10178af22133 100644 --- a/mail/exim/files/patch-aa +++ b/mail/exim/files/patch-aa @@ -1,9 +1,38 @@ -diff -udr ../exim-0.52.ORG/scripts/exim_install ./scripts/exim_install ---- ../exim-0.52.ORG/scripts/exim_install Mon Jun 10 12:04:44 1996 -+++ ./scripts/exim_install Sun Jun 23 10:42:40 1996 -@@ -63,6 +63,20 @@ +--- scripts/exim_install.ORG Tue Oct 29 17:46:05 1996 ++++ scripts/exim_install Thu Oct 31 20:53:16 1996 +@@ -8,6 +8,8 @@ + # This script also installs a default configuration file in CONFIGURE_FILE + # if there is no configuration file there. + ++# This script also installs a .info file in INFO_DIRECTORY if required. ++ + # The script can be made to output what it would do, without actually doing + # anything, by giving it the option "-n" (cf make). Arguments are the names + # of things to install. No arguments installs everything. +@@ -65,10 +67,12 @@ + fi + + BIN_DIRECTORY=`grep -h "^ *BIN_DIRECTORY" $files | tail -1 | cut -c15-99` ++INFO_DIRECTORY=`grep -h "^ *INFO_DIRECTORY" $files | tail -1 | cut -c16-99` + CONFIGURE_FILE=`grep -h "^ *CONFIGURE_FILE" $files | tail -1 | cut -c16-99` + + # Allow INST_xx to over-ride xx + case "$INST_BIN_DIRECTORY" in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac ++case "$INST_INFO_DIRECTORY" in ?*) INFO_DIRECTORY="$INST_INFO_DIRECTORY";; esac + case "$INST_CONFIGURE_FILE" in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac + case "$INST_CP" in '') CP=cp;; *) CP="$INST_CP";; esac + case "$INST_MV" in '') MV=mv;; *) MV="$INST_MV";; esac +@@ -76,6 +80,7 @@ + + # Allow the user to over-ride xx + case "$dest" in ?*) BIN_DIRECTORY="$dest";; esac ++case "$info" in ?*) INFO_DIRECTORY="$info";; esac + case "$conf" in ?*) CONFIGURE_FILE="$conf";; esac + case "$cp" in ?*) CP="$cp";; esac + case "$mv" in ?*) MV="$mv";; esac +@@ -101,6 +106,20 @@ fi - fi + fi +# If info directory doesn't exist, try to create it + @@ -22,22 +51,28 @@ diff -udr ../exim-0.52.ORG/scripts/exim_install ./scripts/exim_install # If no arguments, install everything if [ $# -gt 0 ]; then -@@ -127,6 +141,18 @@ - echo $com ${name} is not newer than ${BIN_DIRECTORY}/${name} - fi +@@ -166,12 +185,24 @@ + fi done -+ + +echo $com "" +echo $com Installation directory is ${INFO_DIRECTORY} +echo $com "" + -+if [ -f ../doc/exim-texinfo-0.52 ]; then -+ makeinfo --output ../doc/exim.info ../doc/exim-texinfo-0.52 -+ for info in ../doc/exim.info*; do -+ echo ${CP} ${info} ${INFO_DIRECTORY} -+ ${real} ${CP} ${info} ${INFO_DIRECTORY} ; gzip -9n ${INFO_DIRECTORY}/${info} -+ done ++if [ -f ../doc/spec.texinfo ]; then ++ makeinfo --no-split --output exim.info ../doc/spec.texinfo ++ echo ${CP} exim.info ${INFO_DIRECTORY} ++ ${real} ${CP} exim.info ${INFO_DIRECTORY} +fi - ++ # If there is no configuration file, install the default, # building the lib directory if necessary. + + echo $com "" + + if [ ! -f ${CONFIGURE_FILE} ]; then ++ echo mkdir -p `dirname ${CONFIGURE_FILE}` ++ ${real} mkdir -p `dirname ${CONFIGURE_FILE}` + echo $com Installing default configuration in ${CONFIGURE_FILE} + echo $com because there is no existing configuration file. + echo ${CP} ../src/configure.default ${CONFIGURE_FILE} diff --git a/mail/exim/pkg-descr b/mail/exim/pkg-descr index ffc90bf0c43f..591d2c48a225 100644 --- a/mail/exim/pkg-descr +++ b/mail/exim/pkg-descr @@ -1,7 +1,7 @@ Exim is a mail transfer agent for Unix systems connected to the Internet. . Exim is intended for use as an Internet mailer, and therefore handles - addresses in RFC 822 domain format only. + addresses in RFC 822 domain format only. (No bangpaths!) . The only external transport currently implemented is an SMTP transport over a TCP/IP network (using sockets). A pipe transport is available, @@ -11,5 +11,8 @@ Exim is a mail transfer agent for Unix systems connected to the Internet. be configured to be "fussy" about certain hosts or domains, and can easily serve multiple domains. + . Exim is an excellent mailer for an ISP, as its control and flexibility + are very good. + . Its requeuing and retry algorithms are very powerful. diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist index 636fe3ce67f7..e8892bc5ec9a 100644 --- a/mail/exim/pkg-plist +++ b/mail/exim/pkg-plist @@ -10,13 +10,5 @@ bin/exim_dbmbuild bin/exicyclog bin/exigrep bin/eximstats -etc/exim.conf +etc/exim/configure info/exim.info -info/exim.info-1 -info/exim.info-2 -info/exim.info-3 -info/exim.info-4 -info/exim.info-5 -info/exim.info-6 -info/exim.info-7 -info/exim.info-8 |