debian/EDITME.exim4-light.diff

   1 --- src/EDITME  2012-05-18 19:51:52.000000000 +0200
   2 +++ EDITME.exim4-light  2012-05-18 19:56:25.000000000 +0200
   3 @@ -98,7 +98,7 @@
   4  # /usr/local/sbin. The installation script will try to create this directory,
   5  # and any superior directories, if they do not exist.
   6
   7 -BIN_DIRECTORY=/usr/exim/bin
   8 +BIN_DIRECTORY=/usr/sbin
   9
  10
  11  #------------------------------------------------------------------------------
  12 @@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin
  13  # don't exist. It will also install a default runtime configuration if this
  14  # file does not exist.
  15
  16 -CONFIGURE_FILE=/usr/exim/configure
  17 +CONFIGURE_FILE=/etc/exim4/exim4.conf:/var/lib/exim4/config.autogenerated
  18
  19  # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
  20  # In this case, Exim will use the first of them that exists when it is run.
  21 @@ -131,7 +131,7 @@ CONFIGURE_FILE=/usr/exim/configure
  22  # deliveries. (Local deliveries run as various non-root users, typically as the
  23  # owner of a local mailbox.) Specifying these values as root is not supported.
  24
  25 -EXIM_USER=
  26 +EXIM_USER=ref:Debian-exim
  27
  28  # If you specify EXIM_USER as a name, this is looked up at build time, and the
  29  # uid number is built into the binary. However, you can specify that this
  30 @@ -153,6 +153,7 @@ EXIM_USER=
  31  # you want to use a group other than the default group for the given user.
  32
  33  # EXIM_GROUP=
  34 +EXIM_GROUP=ref:Debian-exim
  35
  36  # Many sites define a user called "exim", with an appropriate default group,
  37  # and use
  38 @@ -173,7 +174,7 @@ EXIM_USER=
  39
  40  # Almost all installations choose this:
  41
  42 -SPOOL_DIRECTORY=/var/spool/exim
  43 +SPOOL_DIRECTORY=/var/spool/exim4
  44
  45
  46
  47 @@ -232,7 +233,7 @@ TRANSPORT_SMTP=yes
  48  # This one is special-purpose, and commonly not required, so it is not
  49  # included by default.
  50
  51 -# TRANSPORT_LMTP=yes
  52 +TRANSPORT_LMTP=yes
  53
  54
  55  #------------------------------------------------------------------------------
  56 @@ -241,8 +242,8 @@ TRANSPORT_SMTP=yes
  57  # MBX, is included only when requested. If you do not know what this is about,
  58  # leave these settings commented out.
  59
  60 -# SUPPORT_MAILDIR=yes
  61 -# SUPPORT_MAILSTORE=yes
  62 +SUPPORT_MAILDIR=yes
  63 +SUPPORT_MAILSTORE=yes
  64  # SUPPORT_MBX=yes
  65
  66
  67 @@ -296,15 +297,15 @@ LOOKUP_DBM=yes
  68  LOOKUP_LSEARCH=yes
  69  LOOKUP_DNSDB=yes
  70
  71 -# LOOKUP_CDB=yes
  72 -# LOOKUP_DSEARCH=yes
  73 +LOOKUP_CDB=yes
  74 +LOOKUP_DSEARCH=yes
  75  # LOOKUP_IBASE=yes
  76  # LOOKUP_LDAP=yes
  77  # LOOKUP_MYSQL=yes
  78 -# LOOKUP_NIS=yes
  79 +LOOKUP_NIS=yes
  80  # LOOKUP_NISPLUS=yes
  81  # LOOKUP_ORACLE=yes
  82 -# LOOKUP_PASSWD=yes
  83 +LOOKUP_PASSWD=yes
  84  # LOOKUP_PGSQL=yes
  85  # LOOKUP_SQLITE=yes
  86  # LOOKUP_SQLITE_PC=sqlite3
  87 @@ -528,7 +529,7 @@ FIXED_NEVER_USERS=root
  88  # CONFIGURE_OWNER setting, to specify a configuration file which is listed in
  89  # the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim.
  90
  91 -# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs
  92 +TRUSTED_CONFIG_LIST=/etc/exim4/trusted_configs
  93
  94
  95  #------------------------------------------------------------------------------
  96 @@ -564,6 +565,9 @@ FIXED_NEVER_USERS=root
  97
  98  # WHITELIST_D_MACROS=TLS:SPOOL
  99
 100 +# Mailscanner uses -DOUTGOING.
 101 +WHITELIST_D_MACROS=OUTGOING
 102 +
 103  #------------------------------------------------------------------------------
 104  # Exim has support for the AUTH (authentication) extension of the SMTP
 105  # protocol, as defined by RFC 2554. If you don't know what SMTP authentication
 106 @@ -573,14 +577,14 @@ FIXED_NEVER_USERS=root
 107  # included in the Exim binary. You will then need to set up the run time
 108  # configuration to make use of the mechanism(s) selected.
 109
 110 -# AUTH_CRAM_MD5=yes
 111 +AUTH_CRAM_MD5=yes
 112  # AUTH_CYRUS_SASL=yes
 113  # AUTH_DOVECOT=yes
 114  # AUTH_GSASL=yes
 115  # AUTH_GSASL_PC=libgsasl
 116  # AUTH_HEIMDAL_GSSAPI=yes
 117  # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
 118 -# AUTH_PLAINTEXT=yes
 119 +AUTH_PLAINTEXT=yes
 120  # AUTH_SPA=yes
 121
 122
 123 @@ -602,7 +606,7 @@ FIXED_NEVER_USERS=root
 124  # one that is set in the headers_charset option. The default setting is
 125  # defined by this setting:
 126
 127 -HEADERS_CHARSET="ISO-8859-1"
 128 +HEADERS_CHARSET="UTF-8"
 129
 130  # If you are going to make use of $header_xxx expansions in your configuration
 131  # file, or if your users are going to use them in filter files, and the normal
 132 @@ -684,7 +688,7 @@ HEADERS_CHARSET="ISO-8859-1"
 133  # leave these settings commented out.
 134
 135  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
 136 -# SUPPORT_TLS=yes
 137 +SUPPORT_TLS=yes
 138
 139  # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
 140  # USE_OPENSSL_PC=openssl
 141 @@ -692,9 +696,9 @@ HEADERS_CHARSET="ISO-8859-1"
 142
 143  # Uncomment the first and either the second or the third of these if you
 144  # are using GnuTLS.  If you have pkg-config, then the second, else the third.
 145 -# USE_GNUTLS=yes
 146 +USE_GNUTLS=yes
 147  # USE_GNUTLS_PC=gnutls
 148 -# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
 149 +TLS_LIBS=-lgnutls
 150
 151  # If you are running Exim as a server, note that just building it with TLS
 152  # support is not all you need to do. You also need to set up a suitable
 153 @@ -775,6 +779,7 @@ CFLAGS += -fvisibility=hidden
 154  # to form the final file names. Some installations may want something like this:
 155
 156  # LOG_FILE_PATH=/var/log/exim_%slog
 157 +LOG_FILE_PATH=/var/log/exim4/%slog
 158
 159  # which results in files with names /var/log/exim_mainlog, etc. The directory
 160  # in which the log files are placed must exist; Exim does not try to create
 161 @@ -823,7 +828,7 @@ EXICYCLOG_MAX=10
 162  # files. Both the name of the command and the suffix that it adds to files
 163  # need to be defined here. See also the EXICYCLOG_MAX configuration.
 164
 165 -COMPRESS_COMMAND=/usr/bin/gzip
 166 +COMPRESS_COMMAND=/bin/gzip
 167  COMPRESS_SUFFIX=gz
 168
 169
 170 @@ -831,7 +836,7 @@ COMPRESS_SUFFIX=gz
 171  # If the exigrep utility is fed compressed log files, it tries to uncompress
 172  # them using this command.
 173
 174 -ZCAT_COMMAND=/usr/bin/zcat
 175 +ZCAT_COMMAND=/bin/zcat
 176
 177
 178  #------------------------------------------------------------------------------
 179 @@ -864,6 +869,7 @@ ZCAT_COMMAND=/usr/bin/zcat
 180
 181  # You probably need to add -lpam to EXTRALIBS, and in some releases of
 182  # GNU/Linux -ldl is also needed.
 183 +EXTRALIBS=-ldl
 184
 185
 186  #------------------------------------------------------------------------------
 187 @@ -930,6 +936,8 @@ ZCAT_COMMAND=/usr/bin/zcat
 188
 189  # CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
 190
 191 +# default in Debian's sasl2-bin
 192 +CYRUS_SASLAUTHD_SOCKET=/var/run/saslauthd/mux
 193
 194  #------------------------------------------------------------------------------
 195  # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
 196 @@ -1233,6 +1241,7 @@ TMPDIR="/tmp"
 197  # file can be specified here. Some installations may want something like this:
 198
 199  # PID_FILE_PATH=/var/lock/exim.pid
 200 +PID_FILE_PATH=/var/run/exim4/exim.pid
 201
 202  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
 203  # using the name "exim-daemon.pid".
 204 @@ -1266,6 +1275,7 @@ TMPDIR="/tmp"
 205  # messages become "invisible" to the normal management tools.
 206
 207  # SUPPORT_MOVE_FROZEN_MESSAGES=yes
 208 +SUPPORT_MOVE_FROZEN_MESSAGES=yes
 209
 210
 211  #------------------------------------------------------------------------------
 212 @@ -1304,3 +1314,6 @@ TMPDIR="/tmp"
 213  # ENABLE_DISABLE_FSYNC=yes
 214
 215  # End of EDITME for Exim 4.
 216 +
 217 +# enable IPv6 support
 218 +HAVE_IPV6=YES