diff options
author | Mark Murray <markm@FreeBSD.org> | 1998-05-25 12:13:38 +0000 |
---|---|---|
committer | Mark Murray <markm@FreeBSD.org> | 1998-05-25 12:13:38 +0000 |
commit | ca0c6e0686fd140bc8b9ae96c81ce7b5c63f7dc7 (patch) | |
tree | 3d7df5f448170062997f596d6d7a668e11dbaa79 /mail/exim/files | |
parent | Upgrade to 2.4. (diff) |
Ugrade to v1.92.
Notes
Notes:
svn path=/head/; revision=11135
Diffstat (limited to 'mail/exim/files')
-rw-r--r-- | mail/exim/files/Makefile | 81 | ||||
-rw-r--r-- | mail/exim/files/eximon.conf | 97 | ||||
-rw-r--r-- | mail/exim/files/patch-aa | 26 |
3 files changed, 108 insertions, 96 deletions
diff --git a/mail/exim/files/Makefile b/mail/exim/files/Makefile index 30c94d5a832b..e62503f0e260 100644 --- a/mail/exim/files/Makefile +++ b/mail/exim/files/Makefile @@ -20,13 +20,14 @@ # 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. +# X11 as well, of course). The four settings concerned here are X11, XINCLUDE, +# XLFLAGS (linking flags) and X11_LD_LIB (dynamic run-time library). + +# 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. # Another area of variability between systems is the type and location of the # dbm library package. Exim has support for ndbm, gdbm, and Berkeley db. By @@ -61,12 +62,15 @@ INFO_DIRECTORY=/usr/local/info # The following commands live in different places in some OS. The OS-specific # files should normally point to the right place, but they can be overridden -# here if necessary. +# here if necessary. Perl is not necessary for running Exim, but there are +# some Perl utilities for processing log files. If you haven't got Perl, +# Exim will still build and run; you just won't be able to run those utilities. -# CHOWN_COMMAND=/usr/bin/chown -# CHGRP_COMMAND=/usr/bin/chgrp -# MV_COMMAND=/bin/mv -# RM_COMMAND=/bin/rm +CHOWN_COMMAND=/usr/sbin/chown +CHGRP_COMMAND=/usr/sbin/chgrp +MV_COMMAND=/bin/mv +RM_COMMAND=/bin/rm +PERL_COMMAND=/usr/local/bin/perl # The compress command is used by the exicyclog script to compress old log @@ -136,19 +140,26 @@ DIRECTOR_SMARTUSER=yes # determines the mode of the created directory. The default value in the # source is 0750. -# DB_DIRECTORY_MODE=0750 +DB_DIRECTORY_MODE=0750 # Database file mode: The mode of files created in the "db" directory defaults # to 0640 in the source, and can be changed here. -# DB_MODE=0640 +DB_MODE=0640 + + +# Database lock file mode: The mode of zero-length files created in the "db" +# directory to use for locking purposes defaults to 0640 in the source, and +# can be changed here. + +DB_LOCKFILE_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 +EXICYCLOG_MAX=7 # Running Exim not as root: A uid and gid for Exim can be specified here. These @@ -185,14 +196,14 @@ EXIM_MONITOR=eximon.bin # the SMTP port, start off a header line, and then just pump junk for ever # at it. The default is 8192. -# HEADER_MAXLENGTH=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). -# INPUT_DIRECTORY_MODE=0750 +INPUT_DIRECTORY_MODE=0750 # Exim log directory and files: Exim creates several log files inside a @@ -233,6 +244,26 @@ LOG_FILE_PATH=/var/log/exim_%slog # LOG_MODE=0640 +# Included file and database lookup methods. DBM and lsearch (linear search) +# are included by default. 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). + +LOOKUP_DBM=yes +LOOKUP_LSEARCH=yes + +# LOOKUP_DNSDB=yes +# LOOKUP_LDAP=yes +# LOOKUP_NIS=yes +# LOOKUP_NISPLUS=yes + +# The TESTDB lookup is for performing tests on the handling of lookup +# results, and is not useful for general running. It should be included +# only when debugging the code of Exim. + +# LOOKUP_TESTDB=yes + + # 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 # human administrators. These logs are held in a directory called "msglog" @@ -241,7 +272,7 @@ LOG_FILE_PATH=/var/log/exim_%slog # transports for returning data to a message's sender (see the "return_output" # option for transports). -# MSGLOG_DIRECTORY_MODE=0750 +MSGLOG_DIRECTORY_MODE=0750 # Identifying the daemon: When an Exim daemon starts up, it writes its pid to @@ -249,8 +280,10 @@ LOG_FILE_PATH=/var/log/exim_%slog # 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 +# replaced with the port number preceded by a dot. If a daemon is run with +# only one of -bd and -q<time>, then that option is added on to the end of +# the file name, allowing sites that run two separate daemons to distinguish +# them. Some installations may want something like this PID_FILE_PATH=/var/run/exim%s.pid @@ -308,18 +341,16 @@ ROUTER_QUERYPROGRAM=yes # 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 # source to 0750. -# SPOOL_DIRECTORY_MODE=0750 +SPOOL_DIRECTORY_MODE=0750 # The mode of files on the input spool which hold the contents of message can @@ -328,7 +359,7 @@ SPOOL_DIRECTORY=/var/spool/exim # member of the Exim group, change the value to 0640. This is particularly # relevant if you are going to run the Exim monitor. -# SPOOL_MODE=0600 +SPOOL_MODE=0600 # If STDERR_FILE is defined then the -df command line option causes Exim to diff --git a/mail/exim/files/eximon.conf b/mail/exim/files/eximon.conf index 5f9e20dc6426..76a7043d101c 100644 --- a/mail/exim/files/eximon.conf +++ b/mail/exim/files/eximon.conf @@ -28,8 +28,8 @@ # 162 pixels respectively. This is enough to hold the left-most stripchart # and the quit button. The values can be changed here. -# MIN_HEIGHT=162 -# MIN_WIDTH=103 +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 @@ -42,7 +42,7 @@ # 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' +WINDOW_TITLE="${hostname} eximon" # The domain that you want to be stripped from the machine's full hostname # when forming the short host name for the eximon window title, as @@ -58,9 +58,9 @@ # by line. The number given can be followed by the letter K to indicate # that the value is in kilobytes. A minimum value of 1K is enforced. -# LOG_DEPTH=300 -# LOG_WIDTH=950 -# LOG_BUFFER=20K +LOG_DEPTH=300 +LOG_WIDTH=950 +LOG_BUFFER=20K # 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 @@ -71,8 +71,8 @@ # Parameters for the display of message that are on the exim queue. # The width and depth are measured in pixels. -# QUEUE_DEPTH=200 -# QUEUE_WIDTH=950 +QUEUE_DEPTH=200 +QUEUE_WIDTH=950 # The font which is used in the queue display. @@ -83,12 +83,12 @@ # displayed for any one message. If there are more, then "..." is used # to indicate this. -# QUEUE_MAX_ADDRESSES=10 +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). -# QUEUE_INTERVAL=300 +QUEUE_INTERVAL=300 # The size of the popup text window that is used for looking at the # contents of messages, etc. @@ -102,7 +102,7 @@ # individuals can override this by setting the EXIMON_MENU_EVENT environment # variable. -# MENU_EVENT=Shift<Btn1Down> +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 @@ -111,7 +111,7 @@ # case. This does not apply to the output generated from attempting to # deliver a message. That is always shown. -# ACTION_OUTPUT=yes +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 @@ -119,17 +119,35 @@ # 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 +ACTION_QUEUE_UPDATE=yes # When the menu item to display a message's body is invoked, the amount # of data is limited to BODY_MAX bytes. This limit is a safety precaution # to save the screen scrolling for ever on an enormous message. -# BODY_MAX=20000 +BODY_MAX=20000 # The stripcharts are updated every STRIPCHART_INTERVAL seconds. -# STRIPCHART_INTERVAL=60 +STRIPCHART_INTERVAL=60 + +# A stripchart showing the count of messages in the queue is always +# displayed on the left of eximon's window. Its name is "queue" by +# default, but can be changed by this variable. + +QUEUE_STRIPCHART_NAME=queue + +# 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 +# will be displayed as the second stripchart. This can be used to keep +# a display of a mail spool partition on the screen. + +# SIZE_STRIPCHART=/var/mail + +# The name of the size stripchar will be the last component of SIZE_STRIPCHART +# unless the following variable is set to override it. + +# SIZE_STRIPCHART_NAME=space # The following variable contains a specification of which stripcharts # you want eximon to display based on log entries. The string consists of @@ -143,49 +161,12 @@ # after a slash, and an additional slash (optionally preceded by white # space) is included at the start of the continuation line. -# The regular expression syntax supported by eximon is as follows: - -# A regular expression is zero or more branches, separated by `|'. It -# matches anything that matches one of the branches. A branch is zero or -# 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 -# sequence. If two characters in the sequence are separated by `-', this -# is shorthand for the full list of ASCII characters between them (e.g. -# `[0-9]' matches any decimal digit). To include a literal `]' in the -# 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 -# 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/' - -# 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 -# will be displayed as the second stripchart. This can be used to keep -# a display of a mail spool partition on the screen. +# Stripcharts configured by the following parameter are displayed to the +# right of the queue and size stripcharts, in the order defined here. -# SIZE_STRIPCHART=/var/mail +LOG_STRIPCHARTS='/ <= /in/ + / => /out/ + / => .+ D=/local/ + / => .+ T=[^ ]*smtp/smtp/' # End of exim_monitor/EDITME diff --git a/mail/exim/files/patch-aa b/mail/exim/files/patch-aa index 87c8a1ed140d..5a81897caf5d 100644 --- a/mail/exim/files/patch-aa +++ b/mail/exim/files/patch-aa @@ -1,5 +1,5 @@ ---- scripts/exim_install.orig Tue Sep 9 15:07:22 1997 -+++ scripts/exim_install Mon Sep 22 15:22:15 1997 +--- scripts/exim_install.orig Wed Apr 29 10:55:08 1998 ++++ scripts/exim_install Thu May 21 16:14:48 1998 @@ -8,6 +8,8 @@ # This script also installs a default configuration file in CONFIGURE_FILE # if there is no configuration file there. @@ -20,17 +20,17 @@ 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 @@ - + case "$INST_UID" in '') INST_UID=root;; *) INST_UID="$INST_UID";; esac + case "$INST_CP" in '') CP=cp;; *) CP="$INST_CP";; esac +@@ -79,6 +83,7 @@ # Allow the user to over-ride xx - case "$inst_dest" in ?*) BIN_DIRECTORY="$inst_dest";; esac -+case "$inst_info" in ?*) INFO_DIRECTORY="$inst_info";; esac - case "$inst_conf" in ?*) CONFIGURE_FILE="$inst_conf";; esac - case "$inst_cp" in ?*) CP="$inst_cp";; esac - case "$inst_mv" in ?*) MV="$inst_mv";; esac -@@ -101,6 +106,20 @@ + case "$inst_dest" in ?*) BIN_DIRECTORY="$inst_dest";; esac + case "$inst_conf" in ?*) CONFIGURE_FILE="$inst_conf";; esac ++case "$inst_info" in ?*) INFO_DIRECTORY="$inst_info";; esac + case "$inst_uid" in ?*) INST_UID="$inst_uid";; esac + case "$inst_cp" in ?*) CP="$inst_cp";; esac + case "$inst_mv" in ?*) MV="$inst_mv";; esac +@@ -113,6 +118,20 @@ fi fi @@ -51,7 +51,7 @@ # If no arguments, install everything if [ $# -gt 0 ]; then -@@ -167,12 +186,39 @@ +@@ -179,12 +198,39 @@ fi done |