debian/EDITME.exim4-light.diff

   1 --- src/EDITME  2019-04-16 15:52:53.000000000 +0000
   2 +++ EDITME.exim4-light  2019-04-16 15:54:51.009790678 +0000
   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 @@
  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 @@
  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 @@
  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 @@
  39
  40  # Almost all installations choose this:
  41
  42 -SPOOL_DIRECTORY=/var/spool/exim
  43 +SPOOL_DIRECTORY=/var/spool/exim4
  44
  45
  46
  47 @@ -237,7 +238,7 @@
  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 @@ -246,8 +247,8 @@
  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 @@ -306,16 +307,16 @@
  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_MYSQL_PC=mariadb
  79 -# LOOKUP_NIS=yes
  80 +LOOKUP_NIS=yes
  81  # LOOKUP_NISPLUS=yes
  82  # LOOKUP_ORACLE=yes
  83 -# LOOKUP_PASSWD=yes
  84 +LOOKUP_PASSWD=yes
  85  # LOOKUP_PGSQL=yes
  86  # LOOKUP_REDIS=yes
  87  # LOOKUP_SQLITE=yes
  88 @@ -367,7 +368,7 @@
  89  # Uncomment the following line to add DANE support
  90  # Note: Enabling this unconditionally overrides DISABLE_DNSSEC
  91  # For DANE under GnuTLS we need an additional library.  See TLS_LIBS below.
  92 -# SUPPORT_DANE=yes
  93 +SUPPORT_DANE=yes
  94
  95  #------------------------------------------------------------------------------
  96  # Additional libraries and include directories may be required for some
  97 @@ -595,7 +596,7 @@
  98  # CONFIGURE_OWNER setting, to specify a configuration file which is listed in
  99  # the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim.
 100
 101 -# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs
 102 +TRUSTED_CONFIG_LIST=/etc/exim4/trusted_configs
 103
 104
 105  #------------------------------------------------------------------------------
 106 @@ -631,6 +632,9 @@
 107
 108  # WHITELIST_D_MACROS=TLS:SPOOL
 109
 110 +# Mailscanner uses -DOUTGOING.
 111 +WHITELIST_D_MACROS=OUTGOING
 112 +
 113  #------------------------------------------------------------------------------
 114  # Exim has support for the AUTH (authentication) extension of the SMTP
 115  # protocol, as defined by RFC 2554. If you don't know what SMTP authentication
 116 @@ -640,7 +644,7 @@
 117  # included in the Exim binary. You will then need to set up the run time
 118  # configuration to make use of the mechanism(s) selected.
 119
 120 -# AUTH_CRAM_MD5=yes
 121 +AUTH_CRAM_MD5=yes
 122  # AUTH_CYRUS_SASL=yes
 123  # AUTH_DOVECOT=yes
 124  # AUTH_GSASL=yes
 125 @@ -648,7 +652,7 @@
 126  # AUTH_HEIMDAL_GSSAPI=yes
 127  # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
 128  # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
 129 -# AUTH_PLAINTEXT=yes
 130 +AUTH_PLAINTEXT=yes
 131  # AUTH_SPA=yes
 132  # AUTH_TLS=yes
 133
 134 @@ -674,7 +678,7 @@
 135  # one that is set in the headers_charset option. The default setting is
 136  # defined by this setting:
 137
 138 -HEADERS_CHARSET="ISO-8859-1"
 139 +HEADERS_CHARSET="UTF-8"
 140
 141  # If you are going to make use of $header_xxx expansions in your configuration
 142  # file, or if your users are going to use them in filter files, and the normal
 143 @@ -763,7 +767,7 @@
 144  # leave these settings commented out.
 145
 146  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
 147 -# SUPPORT_TLS=yes
 148 +SUPPORT_TLS=yes
 149
 150  # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
 151  # USE_OPENSSL_PC=openssl
 152 @@ -771,9 +775,9 @@
 153
 154  # Uncomment the first and either the second or the third of these if you
 155  # are using GnuTLS.  If you have pkg-config, then the second, else the third.
 156 -# USE_GNUTLS=yes
 157 +USE_GNUTLS=yes
 158  # USE_GNUTLS_PC=gnutls
 159 -# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
 160 +TLS_LIBS=-lgnutls
 161
 162  # If using GnuTLS older than 2.10 and using pkg-config then note that Exim's
 163  # build process will require libgcrypt-config to exist in your $PATH.  A
 164 @@ -809,7 +813,7 @@
 165  # TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
 166
 167  # For DANE under GnuTLS we need an additional library.
 168 -# TLS_LIBS += -lgnutls-dane
 169 +TLS_LIBS += -lgnutls-dane
 170
 171  # TLS_LIBS is included only on the command for linking Exim itself, not on any
 172  # auxiliary programs. If the include files are not in a standard place, you can
 173 @@ -830,6 +834,7 @@
 174  # description of the API to this function, see the Exim specification.
 175
 176  DLOPEN_LOCAL_SCAN=yes
 177 +HAVE_LOCAL_SCAN=yes
 178
 179  # If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
 180  # linker flags.  Without it, the loaded .so won't be able to access any
 181 @@ -868,6 +873,7 @@
 182  # to form the final file names. Some installations may want something like this:
 183
 184  # LOG_FILE_PATH=/var/log/exim_%slog
 185 +LOG_FILE_PATH=/var/log/exim4/%slog
 186
 187  # which results in files with names /var/log/exim_mainlog, etc. The directory
 188  # in which the log files are placed must exist; Exim does not try to create
 189 @@ -916,7 +922,7 @@
 190  # files. Both the name of the command and the suffix that it adds to files
 191  # need to be defined here. See also the EXICYCLOG_MAX configuration.
 192
 193 -COMPRESS_COMMAND=/usr/bin/gzip
 194 +COMPRESS_COMMAND=/bin/gzip
 195  COMPRESS_SUFFIX=gz
 196
 197
 198 @@ -931,7 +937,7 @@
 199  # ZCAT_COMMAND=zcat
 200  #
 201  # Or specify the full pathname:
 202 -ZCAT_COMMAND=/usr/bin/zcat
 203 +ZCAT_COMMAND=zcat
 204
 205  #------------------------------------------------------------------------------
 206  # Compiling in support for embedded Perl: If you want to be able to
 207 @@ -963,6 +969,7 @@
 208
 209  # You probably need to add -lpam to EXTRALIBS, and in some releases of
 210  # GNU/Linux -ldl is also needed.
 211 +EXTRALIBS=-ldl
 212
 213
 214  #------------------------------------------------------------------------------
 215 @@ -971,7 +978,7 @@
 216  # If you may want to use outbound (client-side) proxying, using Socks5,
 217  # uncomment the line below.
 218
 219 -# SUPPORT_SOCKS=yes
 220 +SUPPORT_SOCKS=yes
 221
 222  # If you may want to use inbound (server-side) proxying, using Proxy Protocol,
 223  # uncomment the line below.
 224 @@ -1069,6 +1076,8 @@
 225
 226  # CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
 227
 228 +# default in Debian's sasl2-bin
 229 +CYRUS_SASLAUTHD_SOCKET=/var/run/saslauthd/mux
 230
 231  #------------------------------------------------------------------------------
 232  # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
 233 @@ -1381,6 +1390,7 @@
 234  # file can be specified here. Some installations may want something like this:
 235
 236  # PID_FILE_PATH=/var/lock/exim.pid
 237 +PID_FILE_PATH=/run/exim4/exim.pid
 238
 239  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
 240  # using the name "exim-daemon.pid".
 241 @@ -1414,6 +1424,7 @@
 242  # messages become "invisible" to the normal management tools.
 243
 244  # SUPPORT_MOVE_FROZEN_MESSAGES=yes
 245 +SUPPORT_MOVE_FROZEN_MESSAGES=yes
 246
 247
 248  #------------------------------------------------------------------------------
 249 @@ -1452,3 +1463,6 @@
 250  # ENABLE_DISABLE_FSYNC=yes
 251
 252  # End of EDITME for Exim 4.
 253 +
 254 +# enable IPv6 support
 255 +HAVE_IPV6=YES