158 lines
5.4 KiB
Diff
158 lines
5.4 KiB
Diff
From 5932f6bab7fe002815be95f326b6a2d2199d1f66 Mon Sep 17 00:00:00 2001
|
|
Date: Wed, 1 Aug 2018 15:58:05 +0300
|
|
Subject: [PATCH] Modify Local/Makefile
|
|
|
|
---
|
|
Local/Makefile | 40 ++++++++++++++++++++--------------------
|
|
1 file changed, 20 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/Local/Makefile b/Local/Makefile
|
|
index df74aac..b634349 100644
|
|
--- a/Local/Makefile
|
|
+++ b/Local/Makefile
|
|
@@ -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/bin
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -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/exim.conf
|
|
|
|
# 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,14 +131,14 @@ 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=
|
|
|
|
# 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
|
|
# lookup is deferred until runtime. In this case, it is the name that is built
|
|
# into the binary. You can do this by a setting of the form:
|
|
|
|
-# EXIM_USER=ref:exim
|
|
+EXIM_USER=ref:exim
|
|
|
|
# In other words, put "ref:" in front of the user name. If you set EXIM_USER
|
|
# like this, any value specified for EXIM_GROUP is also passed "by reference".
|
|
@@ -241,7 +241,7 @@ 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_MAILDIR=yes
|
|
# SUPPORT_MAILSTORE=yes
|
|
# SUPPORT_MBX=yes
|
|
|
|
@@ -304,7 +304,7 @@ LOOKUP_DNSDB=yes
|
|
# LOOKUP_CDB=yes
|
|
# LOOKUP_DSEARCH=yes
|
|
# LOOKUP_IBASE=yes
|
|
-# LOOKUP_LDAP=yes
|
|
+LOOKUP_LDAP=yes
|
|
# LOOKUP_MYSQL=yes
|
|
# LOOKUP_NIS=yes
|
|
# LOOKUP_NISPLUS=yes
|
|
@@ -333,7 +333,7 @@ LOOKUP_DNSDB=yes
|
|
# with Solaris 7 onwards. Uncomment whichever of these you are using.
|
|
|
|
# LDAP_LIB_TYPE=OPENLDAP1
|
|
-# LDAP_LIB_TYPE=OPENLDAP2
|
|
+LDAP_LIB_TYPE=OPENLDAP2
|
|
# LDAP_LIB_TYPE=NETSCAPE
|
|
# LDAP_LIB_TYPE=SOLARIS
|
|
|
|
@@ -368,8 +368,8 @@ PCRE_CONFIG=yes
|
|
#
|
|
# You do not need to use this for any lookup information added via pkg-config.
|
|
|
|
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
|
|
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3
|
|
+LOOKUP_INCLUDE=-I /usr/local/ldap/include #-I /usr/local/mysql/include -I /usr/local/pgsql/include
|
|
+LOOKUP_LIBS=-L/usr/local/lib -lldap -llber #-lmysqlclient -lpq -lgds -lsqlite3
|
|
|
|
|
|
#------------------------------------------------------------------------------
|
|
@@ -622,15 +622,15 @@ 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_CYRUS_SASL=yes
|
|
-# AUTH_DOVECOT=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_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
|
|
-# AUTH_PLAINTEXT=yes
|
|
+AUTH_PLAINTEXT=yes
|
|
# AUTH_SPA=yes
|
|
# AUTH_TLS=yes
|
|
|
|
@@ -645,7 +645,7 @@ FIXED_NEVER_USERS=root
|
|
# Similarly for GNU SASL, unless pkg-config is used via AUTH_GSASL_PC.
|
|
# Ditto for AUTH_HEIMDAL_GSSAPI(_PC).
|
|
|
|
-# AUTH_LIBS=-lsasl2
|
|
+AUTH_LIBS=-lsasl2 -lpam
|
|
# AUTH_LIBS=-lgsasl
|
|
# AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt
|
|
|
|
@@ -745,7 +745,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
|
|
@@ -753,9 +753,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_PC=gnutls
|
|
-# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
|
|
+USE_GNUTLS=yes
|
|
+USE_GNUTLS_PC=gnutls
|
|
+TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
|
|
|
|
# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's
|
|
# build process will require libgcrypt-config to exist in your $PATH. A
|
|
@@ -766,7 +766,7 @@ HEADERS_CHARSET="ISO-8859-1"
|
|
# not available if GnuTLS is build without p11-kit (--without-p11-kit
|
|
# configure option). In this case use AVOID_GNUTLS_PKCS11=yes when
|
|
# building Exim.
|
|
-# AVOID_GNUTLS_PKCS11=yes
|
|
+AVOID_GNUTLS_PKCS11=yes
|
|
|
|
# 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
|
|
@@ -923,7 +923,7 @@ ZCAT_COMMAND=/usr/bin/zcat
|
|
# support, which is intended for use in conjunction with the SMTP AUTH
|
|
# facilities, is included only when requested by the following setting:
|
|
|
|
-# SUPPORT_PAM=yes
|
|
+SUPPORT_PAM=yes
|
|
|
|
# You probably need to add -lpam to EXTRALIBS, and in some releases of
|
|
# GNU/Linux -ldl is also needed.
|
|
--
|
|
2.16.4
|
|
|