exim-config.patch (6567B)
1 diff -Nru exim-4.97.orig/src/EDITME exim-4.97/src/EDITME 2 --- exim-4.97.orig/src/EDITME 2023-11-05 11:02:35.018929775 +0100 3 +++ exim-4.97/src/EDITME 2023-11-05 11:09:56.482201757 +0100 4 @@ -75,7 +75,7 @@ 5 # this would be wanted. 6 ############################################################################### 7 8 - 9 +CFLAGS=#CFLAGS# 10 11 ############################################################################### 12 # THESE ARE THINGS YOU MUST SPECIFY # 13 @@ -101,7 +101,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 @@ -117,7 +117,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 @@ -134,7 +134,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 @@ -212,10 +212,10 @@ 41 # If you are building with TLS, the library configuration must be done: 42 43 # Uncomment this if you are using OpenSSL 44 -# USE_OPENSSL=yes 45 +USE_OPENSSL=yes 46 # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not 47 # and an optional location. 48 -# USE_OPENSSL_PC=openssl 49 +USE_OPENSSL_PC=openssl 50 # TLS_LIBS=-lssl -lcrypto 51 # TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto 52 53 @@ -351,7 +351,7 @@ 54 # MBX, is included only when requested. If you do not know what this is about, 55 # leave these settings commented out. 56 57 -# SUPPORT_MAILDIR=yes 58 +SUPPORT_MAILDIR=yes 59 # SUPPORT_MAILSTORE=yes 60 # SUPPORT_MBX=yes 61 62 @@ -411,8 +411,8 @@ 63 LOOKUP_LSEARCH=yes 64 LOOKUP_DNSDB=yes 65 66 -# LOOKUP_CDB=yes 67 -# LOOKUP_DSEARCH=yes 68 +LOOKUP_CDB=yes 69 +LOOKUP_DSEARCH=yes 70 # LOOKUP_IBASE=yes 71 # LOOKUP_JSON=yes 72 # LOOKUP_LDAP=yes 73 @@ -785,7 +785,7 @@ 74 # included in the Exim binary. You will then need to set up the run time 75 # configuration to make use of the mechanism(s) selected. 76 77 -# AUTH_CRAM_MD5=yes 78 +AUTH_CRAM_MD5=yes 79 # AUTH_CYRUS_SASL=yes 80 # AUTH_DOVECOT=yes 81 # AUTH_EXTERNAL=yes 82 @@ -794,7 +794,7 @@ 83 # AUTH_HEIMDAL_GSSAPI=yes 84 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi 85 # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5 86 -# AUTH_PLAINTEXT=yes 87 +AUTH_PLAINTEXT=yes 88 # AUTH_SPA=yes 89 # AUTH_TLS=yes 90 91 @@ -932,7 +932,7 @@ 92 # %s. This will be replaced by one of the strings "main", "panic", or "reject" 93 # to form the final file names. Some installations may want something like this: 94 95 -# LOG_FILE_PATH=/var/log/exim_%slog 96 +LOG_FILE_PATH=/var/log/exim/exim_%slog 97 98 # which results in files with names /var/log/exim_mainlog, etc. The directory 99 # in which the log files are placed must exist; Exim does not try to create 100 @@ -981,7 +981,7 @@ 101 # files. Both the name of the command and the suffix that it adds to files 102 # need to be defined here. See also the EXICYCLOG_MAX configuration. 103 104 -COMPRESS_COMMAND=/usr/bin/gzip 105 +COMPRESS_COMMAND=/bin/gzip 106 COMPRESS_SUFFIX=gz 107 108 109 @@ -996,7 +996,7 @@ 110 # ZCAT_COMMAND=zcat 111 # 112 # Or specify the full pathname: 113 -ZCAT_COMMAND=/usr/bin/zcat 114 +ZCAT_COMMAND=/bin/zcat 115 116 #------------------------------------------------------------------------------ 117 # Compiling in support for embedded Perl: If you want to be able to 118 @@ -1147,7 +1147,7 @@ 119 # 120 # USE_TCP_WRAPPERS=yes 121 # CFLAGS=-O -I/usr/local/include 122 -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap 123 +# EXTRALIBS_EXIM=-lwrap 124 # 125 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM 126 # as well. 127 @@ -1180,7 +1180,7 @@ 128 # aliases). The following setting can be changed to specify a different 129 # location for the system alias file. 130 131 -SYSTEM_ALIASES_FILE=/etc/aliases 132 +SYSTEM_ALIASES_FILE=/etc/exim/aliases 133 134 135 #------------------------------------------------------------------------------ 136 @@ -1216,7 +1216,7 @@ 137 #------------------------------------------------------------------------------ 138 # Uncomment this setting to include IPv6 support. 139 140 -# HAVE_IPV6=yes 141 +HAVE_IPV6=yes 142 143 ############################################################################### 144 # THINGS YOU ALMOST NEVER NEED TO MENTION # 145 @@ -1237,13 +1237,13 @@ 146 # haven't got Perl, Exim will still build and run; you just won't be able to 147 # use those utilities. 148 149 -# CHOWN_COMMAND=/usr/bin/chown 150 -# CHGRP_COMMAND=/usr/bin/chgrp 151 -# CHMOD_COMMAND=/usr/bin/chmod 152 -# MV_COMMAND=/bin/mv 153 -# RM_COMMAND=/bin/rm 154 -# TOUCH_COMMAND=/usr/bin/touch 155 -# PERL_COMMAND=/usr/bin/perl 156 +CHOWN_COMMAND=/bin/chown 157 +CHGRP_COMMAND=/bin/chgrp 158 +CHMOD_COMMAND=/bin/chmod 159 +MV_COMMAND=/bin/mv 160 +RM_COMMAND=/bin/rm 161 +TOUCH_COMMAND=/bin/touch 162 +PERL_COMMAND=/usr/bin/perl 163 164 165 #------------------------------------------------------------------------------ 166 @@ -1445,7 +1445,7 @@ 167 # (process id) to a file so that it can easily be identified. The path of the 168 # file can be specified here. Some installations may want something like this: 169 170 -# PID_FILE_PATH=/var/lock/exim.pid 171 +PID_FILE_PATH=/run/exim.pid 172 173 # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory 174 # using the name "exim-daemon.pid". 175 diff -Nru exim-4.97.orig/src/configure.default exim-4.97/src/configure.default 176 --- exim-4.97.orig/src/configure.default 2023-11-05 11:02:35.018929775 +0100 177 +++ exim-4.97/src/configure.default 2023-11-05 11:09:56.482201757 +0100 178 @@ -67,7 +67,7 @@ 179 # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They 180 # are all colon-separated lists: 181 182 -domainlist local_domains = @ 183 +domainlist local_domains = @ : localhost 184 domainlist relay_to_domains = 185 hostlist relay_from_hosts = localhost 186 # (We rely upon hostname resolution working for localhost, because the default 187 @@ -165,8 +165,8 @@ 188 # need the first setting, or in separate files, in which case you need both 189 # options. 190 191 -# tls_certificate = /etc/ssl/exim.crt 192 -# tls_privatekey = /etc/ssl/exim.pem 193 +tls_certificate = /etc/ssl/certs/exim.crt 194 +tls_privatekey = /etc/ssl/keys/exim.key 195 196 # For OpenSSL, prefer EC- over RSA-authenticated ciphers 197 .ifdef _HAVE_OPENSSL