Relax chown requirements when check_owner is false

[hcoop/debian/exim4.git] / debian / EDITME.exim4-light.diff

--- src/EDITME	2012-05-18 19:51:52.000000000 +0200
+++ EDITME.exim4-light	2012-05-18 19:56:25.000000000 +0200
@@ -98,7 +98,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=/usr/sbin
 
 
 #------------------------------------------------------------------------------
@@ -114,7 +114,7 @@ BIN_DIRECTORY=/usr/exim/bin
 # don't exist. It will also install a default runtime configuration if this
 # file does not exist.
 
-CONFIGURE_FILE=/usr/exim/configure
+CONFIGURE_FILE=/etc/exim4/exim4.conf:/var/lib/exim4/config.autogenerated
 
 # 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.
@@ -131,7 +131,7 @@ CONFIGURE_FILE=/usr/exim/configure
 # 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:Debian-exim
 
 # 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
@@ -153,6 +153,7 @@ EXIM_USER=
 # you want to use a group other than the default group for the given user.
 
 # EXIM_GROUP=
+EXIM_GROUP=ref:Debian-exim
 
 # Many sites define a user called "exim", with an appropriate default group,
 # and use
@@ -173,7 +174,7 @@ EXIM_USER=
 
 # Almost all installations choose this:
 
-SPOOL_DIRECTORY=/var/spool/exim
+SPOOL_DIRECTORY=/var/spool/exim4
 
 
 
@@ -232,7 +233,7 @@ TRANSPORT_SMTP=yes
 # This one is special-purpose, and commonly not required, so it is not
 # included by default.
 
-# TRANSPORT_LMTP=yes
+TRANSPORT_LMTP=yes
 
 
 #------------------------------------------------------------------------------
@@ -241,8 +242,8 @@ TRANSPORT_SMTP=yes
 # MBX, is included only when requested. If you do not know what this is about,
 # leave these settings commented out.
 
-# SUPPORT_MAILDIR=yes
-# SUPPORT_MAILSTORE=yes
+SUPPORT_MAILDIR=yes
+SUPPORT_MAILSTORE=yes
 # SUPPORT_MBX=yes
 
 
@@ -296,15 +297,15 @@ LOOKUP_DBM=yes
 LOOKUP_LSEARCH=yes
 LOOKUP_DNSDB=yes
 
-# LOOKUP_CDB=yes
-# LOOKUP_DSEARCH=yes
+LOOKUP_CDB=yes
+LOOKUP_DSEARCH=yes
 # LOOKUP_IBASE=yes
 # LOOKUP_LDAP=yes
 # LOOKUP_MYSQL=yes
-# LOOKUP_NIS=yes
+LOOKUP_NIS=yes
 # LOOKUP_NISPLUS=yes
 # LOOKUP_ORACLE=yes
-# LOOKUP_PASSWD=yes
+LOOKUP_PASSWD=yes
 # LOOKUP_PGSQL=yes
 # LOOKUP_SQLITE=yes
 # LOOKUP_SQLITE_PC=sqlite3
@@ -528,7 +529,7 @@ FIXED_NEVER_USERS=root
 # CONFIGURE_OWNER setting, to specify a configuration file which is listed in
 # the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim.
 
-# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs
+TRUSTED_CONFIG_LIST=/etc/exim4/trusted_configs
 
 
 #------------------------------------------------------------------------------
@@ -564,6 +565,9 @@ FIXED_NEVER_USERS=root
 
 # WHITELIST_D_MACROS=TLS:SPOOL
 
+# Mailscanner uses -DOUTGOING.
+WHITELIST_D_MACROS=OUTGOING
+
 #------------------------------------------------------------------------------
 # Exim has support for the AUTH (authentication) extension of the SMTP
 # protocol, as defined by RFC 2554. If you don't know what SMTP authentication
@@ -573,14 +577,14 @@ FIXED_NEVER_USERS=root
 # included in the Exim binary. You will then need to set up the run time
 # configuration to make use of the mechanism(s) selected.
 
-# AUTH_CRAM_MD5=yes
+AUTH_CRAM_MD5=yes
 # AUTH_CYRUS_SASL=yes
 # AUTH_DOVECOT=yes
 # AUTH_GSASL=yes
 # AUTH_GSASL_PC=libgsasl
 # AUTH_HEIMDAL_GSSAPI=yes
 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
-# AUTH_PLAINTEXT=yes
+AUTH_PLAINTEXT=yes
 # AUTH_SPA=yes
 
 
@@ -602,7 +606,7 @@ FIXED_NEVER_USERS=root
 # one that is set in the headers_charset option. The default setting is
 # defined by this setting:
 
-HEADERS_CHARSET="ISO-8859-1"
+HEADERS_CHARSET="UTF-8"
 
 # 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
@@ -684,7 +688,7 @@ HEADERS_CHARSET="ISO-8859-1"
 # leave these settings commented out.
 
 # This setting is required for any TLS support (either OpenSSL or GnuTLS)
-# SUPPORT_TLS=yes
+SUPPORT_TLS=yes
 
 # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not
 # USE_OPENSSL_PC=openssl
@@ -692,9 +696,9 @@ HEADERS_CHARSET="ISO-8859-1"
 
 # Uncomment the first and either the second or the third of these if you
 # are using GnuTLS.  If you have pkg-config, then the second, else the third.
-# USE_GNUTLS=yes
+USE_GNUTLS=yes
 # USE_GNUTLS_PC=gnutls
-# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
+TLS_LIBS=-lgnutls
 
 # If you are running Exim as a server, note that just building it with TLS
 # support is not all you need to do. You also need to set up a suitable
@@ -775,6 +779,7 @@ CFLAGS += -fvisibility=hidden
 # to form the final file names. Some installations may want something like this:
 
 # LOG_FILE_PATH=/var/log/exim_%slog
+LOG_FILE_PATH=/var/log/exim4/%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
@@ -823,7 +828,7 @@ EXICYCLOG_MAX=10
 # 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_COMMAND=/bin/gzip
 COMPRESS_SUFFIX=gz
 
 
@@ -831,7 +836,7 @@ COMPRESS_SUFFIX=gz
 # If the exigrep utility is fed compressed log files, it tries to uncompress
 # them using this command.
 
-ZCAT_COMMAND=/usr/bin/zcat
+ZCAT_COMMAND=/bin/zcat
 
 
 #------------------------------------------------------------------------------
@@ -864,6 +869,7 @@ ZCAT_COMMAND=/usr/bin/zcat
 
 # You probably need to add -lpam to EXTRALIBS, and in some releases of
 # GNU/Linux -ldl is also needed.
+EXTRALIBS=-ldl
 
 
 #------------------------------------------------------------------------------
@@ -930,6 +936,8 @@ ZCAT_COMMAND=/usr/bin/zcat
 
 # CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
 
+# default in Debian's sasl2-bin
+CYRUS_SASLAUTHD_SOCKET=/var/run/saslauthd/mux
 
 #------------------------------------------------------------------------------
 # TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
@@ -1233,6 +1241,7 @@ TMPDIR="/tmp"
 # file can be specified here. Some installations may want something like this:
 
 # PID_FILE_PATH=/var/lock/exim.pid
+PID_FILE_PATH=/var/run/exim4/exim.pid
 
 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
 # using the name "exim-daemon.pid".
@@ -1266,6 +1275,7 @@ TMPDIR="/tmp"
 # messages become "invisible" to the normal management tools.
 
 # SUPPORT_MOVE_FROZEN_MESSAGES=yes
+SUPPORT_MOVE_FROZEN_MESSAGES=yes
 
 
 #------------------------------------------------------------------------------
@@ -1304,3 +1314,6 @@ TMPDIR="/tmp"
 # ENABLE_DISABLE_FSYNC=yes
 
 # End of EDITME for Exim 4.
+
+# enable IPv6 support
+HAVE_IPV6=YES