forked from Lainports/freebsd-ports
e31c84776b
From NewStuff-4.75:
1. In addition to the existing LDAP and LDAP/SSL ("ldaps") support,
there is now LDAP/TLS support, given sufficiently modern OpenLDAP
client libraries. The following global options have been added in
support of this: ldap_ca_cert_dir, ldap_ca_cert_file, ldap_cert_file,
ldap_cert_key, ldap_cipher_suite, ldap_require_cert, ldap_start_tls.
2. The pipe transport now takes a boolean option, "freeze_signal",
default false. When true, if the external delivery command exits on
a signal then Exim will freeze the message in the queue, instead of
generating a bounce.
3. Log filenames may now use %M as an escape, instead of %D (still
available). The %M pattern expands to yyyymm, providing month-level
resolution.
4. The $message_linecount variable is now updated for the maildir_tag
option, in the same way as $message_size, to reflect the real number
of lines, including any header additions or removals from transport.
5. When contacting a pool of SpamAssassin servers configured in
spamd_address, Exim now selects entries randomly, to better scale in
a cluster setup.
Full changelog and new stuff files:
- ftp://exim.inode.at/exim/ChangeLogs/ChangeLog-4.75
- ftp://exim.inode.at/exim/ChangeLogs/NewStuff-4.75
Added two configurable knobs (based on ports/154956):
- CONFIG_FILE_PATH: location of the main configuration file
- ALT_CONFIG_PREFIX: prefix for alternative configuration files.
PR: 154956
Feature safe: yes
Approved by: garga (mentor)
162 lines
5.9 KiB
Text
162 lines
5.9 KiB
Text
--- src/EDITME.orig 2010-12-26 21:17:23.000000000 +0300
|
|
+++ src/EDITME 2011-01-06 11:25:01.000000000 +0300
|
|
@@ -100,7 +100,7 @@
|
|
# /usr/local/sbin. The installation script will try to create this directory,
|
|
# and any superior directories, if they do not exist.
|
|
|
|
-BIN_DIRECTORY=/usr/exim/bin
|
|
+BIN_DIRECTORY=XX_PREFIX_XX/sbin
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -116,7 +116,7 @@
|
|
# don't exist. It will also install a default runtime configuration if this
|
|
# file does not exist.
|
|
|
|
-CONFIGURE_FILE=/usr/exim/configure
|
|
+CONFIGURE_FILE=XX_CONFIG_FILE_PATH_XX
|
|
|
|
# It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
|
|
# In this case, Exim will use the first of them that exists when it is run.
|
|
@@ -133,7 +133,7 @@
|
|
# deliveries. (Local deliveries run as various non-root users, typically as the
|
|
# owner of a local mailbox.) Specifying these values as root is not supported.
|
|
|
|
-EXIM_USER=
|
|
+EXIM_USER=ref:XX_EXIM_USER_XX
|
|
|
|
# If you specify EXIM_USER as a name, this is looked up at build time, and the
|
|
# uid number is built into the binary. However, you can specify that this
|
|
@@ -154,7 +154,7 @@
|
|
# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
|
|
# you want to use a group other than the default group for the given user.
|
|
|
|
-# EXIM_GROUP=
|
|
+EXIM_GROUP=XX_EXIM_GROUP_XX
|
|
|
|
# Many sites define a user called "exim", with an appropriate default group,
|
|
# and use
|
|
@@ -294,6 +294,7 @@
|
|
# LDAP_LIB_TYPE=OPENLDAP2
|
|
# LDAP_LIB_TYPE=NETSCAPE
|
|
# LDAP_LIB_TYPE=SOLARIS
|
|
+LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
|
|
|
|
# If you don't set any of these, Exim assumes the original University of
|
|
# Michigan (OpenLDAP 1) library.
|
|
@@ -320,8 +321,10 @@
|
|
# specified in INCLUDE. The settings below are just examples; -lpq is for
|
|
# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite.
|
|
|
|
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
|
|
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
|
|
+INCLUDE=-IXX_LOCALBASE_XX/include XX_DB_INCLUDES_XX
|
|
+LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX
|
|
+LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX
|
|
+DBMLIB=XX_DB_LIBS_XX
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -332,7 +335,7 @@
|
|
# files are defaulted in the OS/Makefile-Default file, but can be overridden in
|
|
# local OS-specific make files.
|
|
|
|
-EXIM_MONITOR=eximon.bin
|
|
+# EXIM_MONITOR=eximon.bin
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -403,6 +406,7 @@
|
|
|
|
|
|
|
|
+# EXPERIMENTAL_DCC=yes
|
|
###############################################################################
|
|
# THESE ARE THINGS YOU MIGHT WANT TO SPECIFY #
|
|
###############################################################################
|
|
@@ -470,6 +474,7 @@
|
|
|
|
# ALT_CONFIG_PREFIX=/some/directory/
|
|
# ALT_CONFIG_PREFIX=/some/directory/exim.conf-
|
|
+ALT_CONFIG_PREFIX=XX_ALT_CONFIG_PREFIX_XX
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -548,7 +553,7 @@
|
|
# one that is set in the headers_charset option. The default setting is
|
|
# defined by this setting:
|
|
|
|
-HEADERS_CHARSET="ISO-8859-1"
|
|
+HEADERS_CHARSET="XX_DEFAULT_CHARSET_XX"
|
|
|
|
# If you are going to make use of $header_xxx expansions in your configuration
|
|
# file, or if your users are going to use them in filter files, and the normal
|
|
@@ -633,7 +638,7 @@
|
|
# SUPPORT_TLS=yes
|
|
|
|
# Uncomment this setting if you are using OpenSSL
|
|
-# TLS_LIBS=-lssl -lcrypto
|
|
+TLS_LIBS=-lssl -lcrypto
|
|
|
|
# Uncomment these settings if you are using GnuTLS
|
|
# USE_GNUTLS=yes
|
|
@@ -684,7 +689,7 @@
|
|
# Once you have done this, "make install" will build the info files and
|
|
# install them in the directory you have defined.
|
|
|
|
-# INFO_DIRECTORY=/usr/share/info
|
|
+INFO_DIRECTORY=XX_PREFIX_XX/info
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -697,7 +702,7 @@
|
|
# %s. This will be replaced by one of the strings "main", "panic", or "reject"
|
|
# to form the final file names. Some installations may want something like this:
|
|
|
|
-# LOG_FILE_PATH=/var/log/exim_%slog
|
|
+LOG_FILE_PATH=XX_LOG_FILE_PATH_XX
|
|
|
|
# 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
|
|
@@ -773,7 +778,7 @@
|
|
# that the local_scan API is made available by the linker. You may also need
|
|
# to add -ldl to EXTRALIBS so that dlopen() is available to Exim.
|
|
|
|
-# EXPAND_DLFUNC=yes
|
|
+EXPAND_DLFUNC=yes
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -870,6 +875,8 @@
|
|
#
|
|
# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
|
|
# as well.
|
|
+CFLAGS=XX_CFLAGS_XX XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX XX_SQLITE_FLAGS_XX
|
|
+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX XX_SQLITE_LIBS_XX
|
|
#
|
|
# To use a name other than exim in the tcpwrappers config file,
|
|
# e.g. if you're running multiple daemons with different access lists,
|
|
@@ -878,6 +885,14 @@
|
|
#
|
|
# TCP_WRAPPERS_DAEMON_NAME="exim"
|
|
|
|
+# IPv6 is coming. Exim has experimental support that has been tried out on
|
|
+# one or two OS. See the file README.IPV6 for the current status of this
|
|
+# support. Do not set this option unless you are working on IPv6 and know
|
|
+# what you are doing.
|
|
+
|
|
+# HAVE_IPV6=YES
|
|
+
|
|
+
|
|
|
|
#------------------------------------------------------------------------------
|
|
# The default action of the exim_install script (which is run by "make
|
|
@@ -1145,7 +1160,7 @@
|
|
# (process id) to a file so that it can easily be identified. The path of the
|
|
# file can be specified here. Some installations may want something like this:
|
|
|
|
-# PID_FILE_PATH=/var/lock/exim.pid
|
|
+PID_FILE_PATH=/var/run/exim.pid
|
|
|
|
# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
|
|
# using the name "exim-daemon.pid".
|