exim/exim-config.patch

   1 diff -Nru exim-4.74.orig/src/EDITME exim-4.74/src/EDITME
   2 --- exim-4.74.orig/src/EDITME   2011-01-25 10:08:58.230470315 +0100
   3 +++ exim-4.74/src/EDITME        2011-01-25 10:09:14.328390661 +0100
   4 @@ -74,7 +74,7 @@
   5  # this would be wanted.
   6  ###############################################################################
   7
   8 -
   9 +CFLAGS=#CFLAGS#
  10
  11  ###############################################################################
  12  #                    THESE ARE THINGS YOU MUST SPECIFY                        #
  13 @@ -100,7 +100,7 @@
  14  # /usr/local/sbin. The installation script will try to create this directory,
  15  # and any superior directories, if they do not exist.
  16
  17 -BIN_DIRECTORY=/usr/exim/bin
  18 +BIN_DIRECTORY=/usr/sbin
  19
  20
  21  #------------------------------------------------------------------------------
  22 @@ -116,7 +116,7 @@
  23  # don't exist. It will also install a default runtime configuration if this
  24  # file does not exist.
  25
  26 -CONFIGURE_FILE=/usr/exim/configure
  27 +CONFIGURE_FILE=/etc/exim/exim.conf
  28
  29  # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
  30  # In this case, Exim will use the first of them that exists when it is run.
  31 @@ -133,7 +133,7 @@
  32  # deliveries. (Local deliveries run as various non-root users, typically as the
  33  # owner of a local mailbox.) Specifying these values as root is not supported.
  34
  35 -EXIM_USER=
  36 +EXIM_USER=ref:mail
  37
  38  # If you specify EXIM_USER as a name, this is looked up at build time, and the
  39  # uid number is built into the binary. However, you can specify that this
  40 @@ -243,7 +243,7 @@
  41  # MBX, is included only when requested. If you do not know what this is about,
  42  # leave these settings commented out.
  43
  44 -# SUPPORT_MAILDIR=yes
  45 +SUPPORT_MAILDIR=yes
  46  # SUPPORT_MAILSTORE=yes
  47  # SUPPORT_MBX=yes
  48
  49 @@ -286,8 +286,8 @@
  50  LOOKUP_LSEARCH=yes
  51  LOOKUP_DNSDB=yes
  52
  53 -# LOOKUP_CDB=yes
  54 -# LOOKUP_DSEARCH=yes
  55 +LOOKUP_CDB=yes
  56 +LOOKUP_DSEARCH=yes
  57  # LOOKUP_IBASE=yes
  58  # LOOKUP_LDAP=yes
  59  # LOOKUP_MYSQL=yes
  60 @@ -357,7 +357,7 @@
  61  # files are defaulted in the OS/Makefile-Default file, but can be overridden in
  62  # local OS-specific make files.
  63
  64 -EXIM_MONITOR=eximon.bin
  65 +# EXIM_MONITOR=eximon.bin
  66
  67
  68  #------------------------------------------------------------------------------
  69 @@ -552,10 +552,10 @@
  70  # included in the Exim binary. You will then need to set up the run time
  71  # configuration to make use of the mechanism(s) selected.
  72
  73 -# AUTH_CRAM_MD5=yes
  74 +AUTH_CRAM_MD5=yes
  75  # AUTH_CYRUS_SASL=yes
  76  # AUTH_DOVECOT=yes
  77 -# AUTH_PLAINTEXT=yes
  78 +AUTH_PLAINTEXT=yes
  79  # AUTH_SPA=yes
  80
  81
  82 @@ -655,10 +655,10 @@
  83  # leave these settings commented out.
  84
  85  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
  86 -# SUPPORT_TLS=yes
  87 +SUPPORT_TLS=yes
  88
  89  # Uncomment this setting if you are using OpenSSL
  90 -# TLS_LIBS=-lssl -lcrypto
  91 +TLS_LIBS=-lssl -lcrypto
  92
  93  # Uncomment these settings if you are using GnuTLS
  94  # USE_GNUTLS=yes
  95 @@ -722,7 +722,7 @@
  96  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  97  # to form the final file names. Some installations may want something like this:
  98
  99 -# LOG_FILE_PATH=/var/log/exim_%slog
 100 +LOG_FILE_PATH=/var/log/exim/exim_%slog
 101
 102  # which results in files with names /var/log/exim_mainlog, etc. The directory
 103  # in which the log files are placed must exist; Exim does not try to create
 104 @@ -771,7 +771,7 @@
 105  # files. Both the name of the command and the suffix that it adds to files
 106  # need to be defined here. See also the EXICYCLOG_MAX configuration.
 107
 108 -COMPRESS_COMMAND=/usr/bin/gzip
 109 +COMPRESS_COMMAND=/bin/gzip
 110  COMPRESS_SUFFIX=gz
 111
 112
 113 @@ -779,7 +779,7 @@
 114  # If the exigrep utility is fed compressed log files, it tries to uncompress
 115  # them using this command.
 116
 117 -ZCAT_COMMAND=/usr/bin/zcat
 118 +ZCAT_COMMAND=/bin/zcat
 119
 120
 121  #------------------------------------------------------------------------------
 122 @@ -889,9 +889,9 @@
 123  # You may well also have to specify a local "include" file and an additional
 124  # library for TCP wrappers, so you probably need something like this:
 125  #
 126 -# USE_TCP_WRAPPERS=yes
 127 +USE_TCP_WRAPPERS=yes
 128  # CFLAGS=-O -I/usr/local/include
 129 -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
 130 +EXTRALIBS_EXIM=-lwrap
 131  #
 132  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
 133  # as well.
 134 @@ -924,7 +924,7 @@
 135  # aliases). The following setting can be changed to specify a different
 136  # location for the system alias file.
 137
 138 -SYSTEM_ALIASES_FILE=/etc/aliases
 139 +SYSTEM_ALIASES_FILE=/etc/exim/aliases
 140
 141
 142  #------------------------------------------------------------------------------
 143 @@ -970,13 +970,13 @@
 144  # haven't got Perl, Exim will still build and run; you just won't be able to
 145  # use those utilities.
 146
 147 -# CHOWN_COMMAND=/usr/bin/chown
 148 -# CHGRP_COMMAND=/usr/bin/chgrp
 149 -# CHMOD_COMMAND=/usr/bin/chmod
 150 -# MV_COMMAND=/bin/mv
 151 -# RM_COMMAND=/bin/rm
 152 -# TOUCH_COMMAND=/usr/bin/touch
 153 -# PERL_COMMAND=/usr/bin/perl
 154 +CHOWN_COMMAND=/bin/chown
 155 +CHGRP_COMMAND=/bin/chgrp
 156 +CHMOD_COMMAND=/bin/chmod
 157 +MV_COMMAND=/bin/mv
 158 +RM_COMMAND=/bin/rm
 159 +TOUCH_COMMAND=/bin/touch
 160 +PERL_COMMAND=/usr/bin/perl
 161
 162
 163  #------------------------------------------------------------------------------
 164 @@ -1170,7 +1170,7 @@
 165  # (process id) to a file so that it can easily be identified. The path of the
 166  # file can be specified here. Some installations may want something like this:
 167
 168 -# PID_FILE_PATH=/var/lock/exim.pid
 169 +PID_FILE_PATH=/var/run/exim.pid
 170
 171  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
 172  # using the name "exim-daemon.pid".
 173 diff -Nru exim-4.74.orig/src/configure.default exim-4.74/src/configure.default
 174 --- exim-4.74.orig/src/configure.default        2011-01-25 10:08:58.230470315 +0100
 175 +++ exim-4.74/src/configure.default     2011-01-25 10:09:14.328390661 +0100
 176 @@ -56,7 +56,7 @@
 177  # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
 178  # are all colon-separated lists:
 179
 180 -domainlist local_domains = @
 181 +domainlist local_domains = @ : localhost
 182  domainlist relay_to_domains =
 183  hostlist   relay_from_hosts = 127.0.0.1
 184