diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 593edf1..8fd85a2 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -30,7 +30,7 @@ sha512sums=('2ece1bf862553c747fda765698ae0d99ce1c37b6006576661580ec7671f6e25590d 'SKIP' '6494d9aae71a630935f3946a136855aadede54fd10b7b3cd7df47972d320ae142410076871e839f6caca8e02ec136604464b0b9c593721db243d8edf75c2f17f' 'd8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81' - '107a30691c961e511a6ae86282c41e4d3dfac771f4a30295a0bdfd1b9229c38272aaabf38321707f3c6b235dc749b6fcb56a1cf732c97f01830e5e8348feaf8d' + '93878f4c3670b6f21d6c69f1e0c51dd24c0b024d33a99b7d3b9b48d791cacb37e4cab5ee3add4cd5b2f2bdb971e69cfd62e2bbe56c8c4ad505c3ee40df97a2b1' 'dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f' 'b3c3b18652df435cb87d647cfd4f19e182fbf12b0b56f9c91f72b27ae5a819fb3d8c4c25445c5a3c184f70a0c181925fabda891f2057b8a917070d6c40529b8d' '11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a' diff --git a/trunk/exim.Makefile b/trunk/exim.Makefile index f94b0b5..ea152f0 100644 --- a/trunk/exim.Makefile +++ b/trunk/exim.Makefile @@ -1,4 +1,3 @@ -# $Cambridge: exim/src/src/EDITME,v 4.93 $ ################################################## # The Exim mail transport agent # ################################################## @@ -14,12 +13,11 @@ # Things that depend on the operating system have default settings in # OS/Makefile-Default, but these are overridden for some OS by files -# called called OS/Makefile-. You can further override these by -# creating files called Local/Makefile-, and -# Local/Makefile- (where "" stands for the name of -# your operating system - look at the names in the OS directory to see -# which names are recognized, and "" is derived from the -# environment variable "build") +# called OS/Makefile-. You can further override these settings by +# creating files Local/Makefile-, and Local/Makefile-. +# The suffix "" stands for the name of your operating system - look +# at the names in the OS directory to see which names are recognized, +# and "" is the content of the environment variable "build". # However, if you are building Exim for a single OS only, you don't need to # worry about setting up Local/Makefile-. Any build-time configuration @@ -203,7 +201,7 @@ SPOOL_DIRECTORY=/var/spool/exim # the libraries and headers are installed, as the pkg-config .pc # specification should include all -L/-I information necessary. # Enabling the USE_*_PC options should be sufficient. If not using -# pkg-config, then you have to specify the libraries, and you mmight +# pkg-config, then you have to specify the libraries, and you might # need to specify the locations too. # Uncomment the following lines if you want @@ -212,7 +210,7 @@ SPOOL_DIRECTORY=/var/spool/exim # Unless you do this, you must define one of USE_OPENSSL or USE_GNUTLS # below. -# If you are buliding with TLS, the library configuration must be done: +# If you are building with TLS, the library configuration must be done: # Uncomment this if you are using OpenSSL USE_OPENSSL=yes @@ -281,6 +279,9 @@ USE_OPENSSL_PC=openssl # specified in INCLUDE. +# Uncomment the following line to remove support for TLS Resumption +# DISABLE_TLS_RESUME=yes + ############################################################################### # THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY # @@ -416,6 +417,8 @@ LOOKUP_DSEARCH=yes # LOOKUP_IBASE=yes # LOOKUP_JSON=yes LOOKUP_LDAP=yes +# LOOKUP_LMDB=yes + # LOOKUP_MYSQL=yes # LOOKUP_MYSQL_PC=mariadb # LOOKUP_NIS=yes @@ -566,13 +569,20 @@ DISABLE_MAL_MKS=yes # DISABLE_DNSSEC=yes # To disable support for Events set DISABLE_EVENT to "yes" - # DISABLE_EVENT=yes -# Uncomment this line to include support for early pipelining, per +# Uncomment this line to remove support for early pipelining, per # https://datatracker.ietf.org/doc/draft-harris-early-pipe/ -# SUPPORT_PIPE_CONNECT=yes +# DISABLE_PIPE_CONNECT=yes + + +# Uncomment the following to remove the fast-ramp two-phase-queue-run support +# DISABLE_QUEUE_RAMP=yes + +# Uncomment the following lines to add SRS (Sender Rewriting Scheme) support +# using only native facilities. See EXPERIMENTAL_SRS_ALT for an alternative. +SUPPORT_SRS=yes #------------------------------------------------------------------------------ @@ -586,21 +596,20 @@ DISABLE_MAL_MKS=yes # EXPERIMENTAL_DCC=yes -# Uncomment the following lines to add SRS (Sender rewriting scheme) support. +# Uncomment the following lines to add SRS (Sender rewriting scheme) support +# using the implementation in linbsrs_alt. # You need to have libsrs_alt installed on your system (srs.mirtol.com). # Depending on where it is installed you may have to edit the CFLAGS and # LDFLAGS lines. -# EXPERIMENTAL_SRS=yes +# EXPERIMENTAL_SRS_ALT=yes # CFLAGS += -I/usr/local/include # LDFLAGS += -lsrs_alt -# Uncomment the following lines to add SRS (Sender rewriting scheme) support -# using only native facilities. -# EXPERIMENTAL_SRS_NATIVE=yes - # Uncomment the following line to add DMARC checking capability, implemented # using libopendmarc libraries. You must have SPF and DKIM support enabled also. +# Library version libopendmarc-1.4.1-1.fc33.x86_64 (on Fedora 33) is known broken; +# 1.3.2-3 works. I seems that the OpenDMARC project broke their API. # SUPPORT_DMARC=yes # CFLAGS += -I/usr/local/include # LDFLAGS += -lopendmarc @@ -624,19 +633,9 @@ DISABLE_MAL_MKS=yes # Uncomment the following to include extra information in fail DSN message (bounces) # EXPERIMENTAL_DSN_INFO=yes -# Uncomment the following to add LMDB lookup support -# You need to have LMDB installed on your system (https://github.com/LMDB/lmdb) -# Depending on where it is installed you may have to edit the CFLAGS and LDFLAGS lines. -# EXPERIMENTAL_LMDB=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -llmdb - # Uncomment the following line to add queuefile transport support # EXPERIMENTAL_QUEUEFILE=yes -# Uncomment the following line to include support for TLS Resumption -# EXPERIMENTAL_TLS_RESUME=yes - ############################################################################### # THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # ############################################################################### @@ -789,6 +788,9 @@ AUTH_TLS=yes # AUTH_LIBS=-lgsasl # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt +# If using AUTH_GSASL with SCRAM methods, you should also be defining +# SUPPORT_I18N to get standards-conformant support of utf8 normalization. + #------------------------------------------------------------------------------ # When Exim is decoding MIME "words" in header lines, most commonly for use