diff options
| -rw-r--r-- | .SRCINFO | 52 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 37 | ||||
| -rw-r--r-- | exim-submission@.service | 2 | ||||
| -rw-r--r-- | exim.Makefile | 275 | ||||
| -rw-r--r-- | exim.service | 17 | ||||
| -rw-r--r-- | exim.socket | 2 | ||||
| -rw-r--r-- | exim@.service | 12 |
8 files changed, 245 insertions, 153 deletions
@@ -1,7 +1,7 @@ pkgbase = exim-heavy pkgdesc = Message Transfer Agent with maximal-enabled features - pkgver = 4.93 - pkgrel = 2 + pkgver = 4.97.1 + pkgrel = 1 url = https://www.exim.org/ arch = x86_64 arch = i686 @@ -10,45 +10,48 @@ pkgbase = exim-heavy arch = armv7h arch = aarch64 license = GPL - makedepends = gdbm - makedepends = libldap - makedepends = libnsl - makedepends = openssl - makedepends = pam - makedepends = pcre - makedepends = sqlite - makedepends = libspf2 - makedepends = libidn - makedepends = libidn2 - makedepends = opendmarc - makedepends = libsrs_alt makedepends = postgresql-libs makedepends = libmariadbclient - source = https://ftp.exim.org/pub/exim/exim4/exim-4.93.tar.bz2 - source = https://ftp.exim.org/pub/exim/exim4/exim-4.93.tar.bz2.asc + makedepends = perl-file-fcntllock + depends = gdbm + depends = db5.3 + depends = libldap + depends = libnsl + depends = openssl + depends = pam + depends = pcre + depends = sqlite + depends = libspf2 + depends = libidn + depends = libidn2 + depends = opendmarc>=1.4.0 + depends = perl-file-fcntllock + source = https://ftp.exim.org/pub/exim/exim4/exim-4.97.1.tar.xz + source = https://ftp.exim.org/pub/exim/exim4/exim-4.97.1.tar.xz.asc source = aliases source = exim.logrotate source = exim.Makefile - source = exim-submission@.service source = exim.service source = exim@.service source = exim.socket + source = exim-submission@.service source = exim-submission.socket source = exim.sysusers source = exim.tmpfiles validpgpkeys = C693A034E1ED6EE954CAE2DA13DAD99C7E41519C validpgpkeys = ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04 validpgpkeys = E5CA331D44AB8E4C806FDBEE26101B62F69376CE + validpgpkeys = D0BFD6B9ECA5694A6F149DCEAF4CC676A6B6C142 validpgpkeys = A986F3A6BD6377D8730958DEBCE58C8CE41F32DF - sha512sums = 18301520ff02978e4f19d7b651495bc9b86d99e45c60d4bef63aa07ec43a5d8ee2e1bdbd512861c974af2210a3aeae2d34d41cff1112a97ec7cedf771126b499 + sha512sums = eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc sha512sums = SKIP sha512sums = a91c6a9e5b3ac9d143741dba01e11616812ba44c3a8c768c8232364026460f0b8fdeeb120a2f2b86742a6e3ebbfc9d6335b86d108b044e43108b4a6f0374c9ad sha512sums = d8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81 - sha512sums = 7544cab32ecb37bd90c6b7e44c97343e628e8b4302a62fb0fdabc01b27bfdfef7e1e1160c9b040d1df9bb6c91cc1db58fc12152d91fbdcbb69d06df99ff4f3c3 - sha512sums = dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f - sha512sums = e2fc3966c320460a26fbbf83e98df725587dc126dfe9d7a84c3285eb4b22a061b30499425c70f3d73cf13aa81c194274004efd20ce1316836463b982117909f8 - sha512sums = 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a - sha512sums = db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae + sha512sums = 28db74cfd84b7870da9ef8feee54c7e3ca099e0904c450c041647f8e12999c18eb7be960f2464f9a01241486a8737e06fd5b70fa8eabe1fcd34550d460db7a1d + sha512sums = ffc08d6ecf0a5b644febb6b8cd90000c8fe614dbfd94d3b387cf21b427608fac9aa0b6ab1b8b6eb74a4426d740a2eb9e2359124c6ef47b7175df9030a334d421 + sha512sums = 726ae20403ede2d72081d88f3bcf5292868f9157ad2f37717698caf25182b449bed09fab941f81deaccfea7f6f33f2089ad70b0dcc24d56b3e31cc0701526ecd + sha512sums = 5f576b8a16995c52d501758c196634065f4416b9577d09ef1770ae3a470d79f7d795111370d5aeaf1516b80eba488cc75ce5962399078b38f0c84881b070fb6d + sha512sums = c14fb960a6a4800e2883237734540822a74e9ba0459dd1c2c7e51d5407cfb87569b6c9c879c9ab9f78ce1414dc30f07d4321640d36829c0bcfb47991f5812a97 sha512sums = 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d sha512sums = 87a16aa7bd60a8df0da8131bb811825232f25e934b9326460a2f8f0f8e0f44c53d71b1225ecfee8d30c8714f6e9f85f5f0821e346a7751d43683b406376d605b sha512sums = f8a34fea0a65d0992732bc444bbb334d060de7d91d9cca6f00bc950ba289afa813783517dd3999437f89bc194290785805df7081606a65abb1db3fd3b3aa94ca @@ -59,7 +62,7 @@ pkgname = exim-heavy depends = libnsl depends = openssl depends = pam - depends = pcre + depends = pcre2 depends = sqlite optdepends = exim-lookup-mysql: for MariaDB/MySQL lookup support optdepends = exim-lookup-passwd: for passwd lookup support @@ -83,4 +86,3 @@ pkgname = exim-lookup-pgsql depends = exim-heavy depends = postgresql-libs replaces = exim-pgsql - diff --git a/.gitignore b/.gitignore index 26ac48df7db9..66a2a28f4b30 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ pkg/ src/ *.pkg.tar* +exim-*.tar.* @@ -1,4 +1,5 @@ -# Maintainer: Sergey Shatunov <me#prok.pw> +# Maintainer: Nathaniel Clark <nathaniel.clark@misrule.us> +# Contributor: Sergey Shatunov <me#prok.pw> # Contributor: Felix Yan <felixonmars@archlinux.org> # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Lukas Fleischer <lfleischer@archlinux.org> @@ -12,40 +13,41 @@ pkgname=(exim-heavy exim-lookup-passwd exim-lookup-pgsql) pkgname=exim-heavy -pkgver=4.93 -pkgrel=2 +pkgver=4.97.1 +pkgrel=1 pkgdesc='Message Transfer Agent with maximal-enabled features' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url='https://www.exim.org/' license=('GPL') -makedepends=('gdbm' 'libldap' 'libnsl' 'openssl' 'pam' 'pcre' 'sqlite') -makedepends+=('libspf2' 'libidn' 'libidn2' 'opendmarc' 'libsrs_alt' 'postgresql-libs' 'libmariadbclient') -source=("https://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.bz2"{,.asc} +depends=('gdbm' 'db5.3' 'libldap' 'libnsl' 'openssl' 'pam' 'pcre' 'sqlite' 'libspf2' 'libidn' 'libidn2' 'opendmarc>=1.4.0' 'perl-file-fcntllock') +makedepends=('postgresql-libs' 'libmariadbclient' 'perl-file-fcntllock') +source=("https://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.xz"{,.asc} aliases exim.logrotate exim.Makefile - exim-submission@.service exim.service exim@.service exim.socket + exim-submission@.service exim-submission.socket exim.sysusers exim.tmpfiles) -sha512sums=('18301520ff02978e4f19d7b651495bc9b86d99e45c60d4bef63aa07ec43a5d8ee2e1bdbd512861c974af2210a3aeae2d34d41cff1112a97ec7cedf771126b499' +sha512sums=('eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc' 'SKIP' 'a91c6a9e5b3ac9d143741dba01e11616812ba44c3a8c768c8232364026460f0b8fdeeb120a2f2b86742a6e3ebbfc9d6335b86d108b044e43108b4a6f0374c9ad' 'd8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81' - '7544cab32ecb37bd90c6b7e44c97343e628e8b4302a62fb0fdabc01b27bfdfef7e1e1160c9b040d1df9bb6c91cc1db58fc12152d91fbdcbb69d06df99ff4f3c3' - 'dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f' - 'e2fc3966c320460a26fbbf83e98df725587dc126dfe9d7a84c3285eb4b22a061b30499425c70f3d73cf13aa81c194274004efd20ce1316836463b982117909f8' - '11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a' - 'db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae' + '28db74cfd84b7870da9ef8feee54c7e3ca099e0904c450c041647f8e12999c18eb7be960f2464f9a01241486a8737e06fd5b70fa8eabe1fcd34550d460db7a1d' + 'ffc08d6ecf0a5b644febb6b8cd90000c8fe614dbfd94d3b387cf21b427608fac9aa0b6ab1b8b6eb74a4426d740a2eb9e2359124c6ef47b7175df9030a334d421' + '726ae20403ede2d72081d88f3bcf5292868f9157ad2f37717698caf25182b449bed09fab941f81deaccfea7f6f33f2089ad70b0dcc24d56b3e31cc0701526ecd' + '5f576b8a16995c52d501758c196634065f4416b9577d09ef1770ae3a470d79f7d795111370d5aeaf1516b80eba488cc75ce5962399078b38f0c84881b070fb6d' + 'c14fb960a6a4800e2883237734540822a74e9ba0459dd1c2c7e51d5407cfb87569b6c9c879c9ab9f78ce1414dc30f07d4321640d36829c0bcfb47991f5812a97' '4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d' '87a16aa7bd60a8df0da8131bb811825232f25e934b9326460a2f8f0f8e0f44c53d71b1225ecfee8d30c8714f6e9f85f5f0821e346a7751d43683b406376d605b' 'f8a34fea0a65d0992732bc444bbb334d060de7d91d9cca6f00bc950ba289afa813783517dd3999437f89bc194290785805df7081606a65abb1db3fd3b3aa94ca') validpgpkeys=('C693A034E1ED6EE954CAE2DA13DAD99C7E41519C' # Phil Pennock <pdp@exim.org> 'ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04' # Phil Pennock <phil.pennock@spodhuis.org> - 'E5CA331D44AB8E4C806FDBEE26101B62F69376CE' # Heiko Schlittermann (Exim MTA Maintainer) <heiko@exim.org> + 'E5CA331D44AB8E4C806FDBEE26101B62F69376CE' # Heiko Schlittermann (Exim MTA Maintainer) <heiko@exim.org> (OLD) + 'D0BFD6B9ECA5694A6F149DCEAF4CC676A6B6C142' # Heiko Schlittermann (Exim MTA Maintainer) <heiko@exim.org> (NEW) 'A986F3A6BD6377D8730958DEBCE58C8CE41F32DF') # Jeremy Harris <jgh@wizmail.org> prepare() { @@ -61,7 +63,7 @@ build() { } package_exim-heavy() { - depends=('gdbm' 'libldap' 'libnsl' 'openssl' 'pam' 'pcre' 'sqlite') + depends=('gdbm' 'libldap' 'libnsl' 'openssl' 'pam' 'pcre2' 'sqlite') optdepends=('exim-lookup-mysql: for MariaDB/MySQL lookup support' 'exim-lookup-passwd: for passwd lookup support' 'exim-lookup-pgsql: for PostgreSQL lookup support') @@ -135,3 +137,8 @@ package_exim-lookup-pgsql() { cd build-Linux-* install -Dm0755 lookups/pgsql.so "$pkgdir"/usr/lib/exim/lookups/pgsql.so } + +# Local Variables: +# mode: sh +# indent-tabs-mode: nil +# End: diff --git a/exim-submission@.service b/exim-submission@.service index 4f90cd83dc8d..c44e5809fd14 100644 --- a/exim-submission@.service +++ b/exim-submission@.service @@ -8,4 +8,4 @@ Description=Exim Mail Daemon per-connection server (message submission) [Service] ExecStart=-/usr/bin/exim -bs StandardInput=socket -StandardError=syslog +StandardError=journal diff --git a/exim.Makefile b/exim.Makefile index 897d6ed4ddab..881a15f397e9 100644 --- a/exim.Makefile +++ b/exim.Makefile @@ -12,11 +12,12 @@ # Exim distribution directory before running the "make" command. # 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-<osname>. You can further override these by creating files -# called Local/Makefile-<osname>, where "<osname>" stands for the name of your -# operating system - look at the names in the OS directory to see which names -# are recognized. +# OS/Makefile-Default, but these are overridden for some OS by files +# called OS/Makefile-<osname>. You can further override these settings by +# creating files Local/Makefile-<osname>, and Local/Makefile-<build>. +# The suffix "<osname>" stands for the name of your operating system - look +# at the names in the OS directory to see which names are recognized, +# and "<build>" 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-<osname>. Any build-time configuration @@ -178,6 +179,108 @@ SPOOL_DIRECTORY=/var/spool/exim ############################################################################### +# TLS # +############################################################################### +# Exim is built by default to support the SMTP STARTTLS command, which implements +# Transport Layer Security using SSL (Secure Sockets Layer). This requires you +# must install the OpenSSL library package or the GnuTLS library. Exim contains +# no cryptographic code of its own. + +# If you are running Exim as a (TLS) server, just building it with TLS support +# is all you need to do, as tls_advertise_hosts is set to '*' by +# default. But you are advised to create a suiteable certificate, and tell +# Exim about it by means of the tls_certificate and tls_privatekey run +# time options, otherwise Exim will create a self signed certificate on +# the fly. If you are running Exim only as a (TLS) client, building it with +# TLS support is all you need to do. +# +# If you are using pkg-config then you should not need to worry where +# 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 might +# need to specify the locations too. + +# Uncomment the following lines if you want +# to build Exim without any TLS support (either OpenSSL or GnuTLS): +# DISABLE_TLS=yes +# Unless you do this, you must define one of USE_OPENSSL or USE_GNUTLS +# below. + +# If you are building with TLS, the library configuration must be done: + +# Uncomment this if you are using OpenSSL +USE_OPENSSL=yes +# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not +# and an optional location. +USE_OPENSSL_PC=openssl +# TLS_LIBS=-lssl -lcrypto +# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto + +# Uncomment this if you are using GnuTLS +# USE_GNUTLS=yes +# Uncomment one of these settings if you are using GnuTLS; pkg-config vs not +# and an optional location. If you disable SUPPORT_DANE below, you +# can remove the gnutls-dane references here. Earlier versions of GnuTLS +# required libtasn1 and libgrypt also; add if needed. +# USE_GNUTLS_PC=gnutls gnutls-dane +# TLS_LIBS=-lgnutls -lgnutls-dane +# TLS_LIBS=-L/usr/local/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane + +# 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 +# version that old is likely to become unsupported by Exim in 2017. + +# The security fix we provide with the gnutls_allow_auto_pkcs11 option +# (4.82 PP/09) introduces a compatibility regression. The symbol is +# 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 + +# 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 +# certificate, and tell Exim about it by means of the tls_certificate +# and tls_privatekey run time options. You also need to set tls_advertise_hosts +# to specify the hosts to which Exim advertises TLS support. On the other hand, +# if you are running Exim only as a client, building it with TLS support +# is all you need to do. + +# If you are using pkg-config then you should not need to worry where the +# libraries and headers are installed, as the pkg-config .pc specification +# should include all -L/-I information necessary. If not using pkg-config +# then you might need to specify the locations too. + +# Additional libraries and include files are required for both OpenSSL and +# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed +# with all your other libraries. If they are in a special directory, you may +# need something like + +# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto + +# or + +# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane +# If not using DANE under GnuTLS we can lose one library +# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt + +# TLS_LIBS is included only on the command for linking Exim itself, not on any +# auxiliary programs. If the include files are not in a standard place, you can +# set TLS_INCLUDE to specify where they are, for example: + +# TLS_INCLUDE=-I/usr/local/openssl/include/ +# or +# TLS_INCLUDE=-I/opt/gnu/include + +# You don't need to set TLS_INCLUDE if the relevant directories are already +# 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 # ############################################################################### @@ -332,6 +435,9 @@ LOOKUP_SQLITE_PC=sqlite3 # LOOKUP_NWILDLSEARCH=yes +# Some platforms may need this for LOOKUP_NIS: +# LIBS += -lnsl + #------------------------------------------------------------------------------ # If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate # which LDAP library you have. Unfortunately, though most of their functions @@ -350,25 +456,27 @@ LDAP_LIB_TYPE=OPENLDAP2 #------------------------------------------------------------------------------ -# The PCRE library is required for Exim. There is no longer an embedded +# The PCRE2 library is required for Exim. There is no longer an embedded # version of the PCRE library included with the source code, instead you -# must use a system library or build your own copy of PCRE. +# must use a system library or build your own copy of PCRE2. # In either case you must specify the library link info here. If the -# PCRE header files are not in the standard search path you must also +# PCRE2 header files are not in the standard search path you must also # modify the INCLUDE path (above) # # Use PCRE_CONFIG to query the pcre-config command (first found in $PATH) # to find the include files and libraries, else use PCRE_LIBS and set INCLUDE # too if needed. -PCRE_CONFIG=yes -# PCRE_LIBS=-lpcre +PCRE2_CONFIG=yes +# PCRE_LIBS=-lpcre2 #------------------------------------------------------------------------------ -# Uncomment the following line to add DANE support +# Comment out the following line to remove DANE support # Note: Enabling this unconditionally overrides DISABLE_DNSSEC -# For DANE under GnuTLS we need an additional library. See TLS_LIBS below. +# forces you to have SUPPORT_TLS enabled (the default). For DANE under +# GnuTLS we need an additional library. See TLS_LIBS or USE_GNUTLS_PC +# below. SUPPORT_DANE=yes #------------------------------------------------------------------------------ @@ -378,23 +486,31 @@ SUPPORT_DANE=yes # don't need to set LOOKUP_INCLUDE if the relevant directories are already # specified in INCLUDE. The settings below are just examples; -lpq is for # PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite, -lhiredis -# is for Redis. +# is for Redis, -ljansson for JSON. # # 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/include +# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 -llmdb + +#------------------------------------------------------------------------------ +# If you included LOOKUP_LMDB above you will need the library. Depending +# on where installed you may also need an include directory +# +# LOOKUP_INCLUDE += -I/usr/local/include +# LOOKUP_LIBS += -llmdb #------------------------------------------------------------------------------ # Compiling the Exim monitor: If you want to compile the Exim monitor, a # program that requires an X11 display, then EXIM_MONITOR should be set to the -# value "eximon.bin". Comment out this setting to disable compilation of the +# value "eximon.bin". De-comment this setting to enable compilation of the # monitor. The locations of various X11 directories for libraries and include # files are defaulted in the OS/Makefile-Default file, but can be overridden in # local OS-specific make files. - +# EXIM_MONITOR=eximon.bin #------------------------------------------------------------------------------ @@ -456,9 +572,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 remove support for early pipelining, per +# https://datatracker.ietf.org/doc/draft-harris-early-pipe/ +# 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. +SUPPORT_SRS=yes + #------------------------------------------------------------------------------ # Compiling Exim with experimental features. These are documented in @@ -471,21 +598,16 @@ DISABLE_MAL_MKS=yes # EXPERIMENTAL_DCC=yes -# Uncomment the following lines to add SRS (Sender rewriting scheme) support. -# 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 -# CFLAGS += -I/usr/local/include -LOOKUP_LIBS += -lsrs_alt - # Uncomment the following line to add DMARC checking capability, implemented # using libopendmarc libraries. You must have SPF and DKIM support enabled also. -EXPERIMENTAL_DMARC=yes -# DMARC_TLD_FILE= /etc/exim/opendmarc.tlds +# 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 -LOOKUP_LIBS += -lopendmarc +LDFLAGS += -lopendmarc +# Uncomment the following if you need to change the default. You can +# override it at runtime (main config option dmarc_tld_file) +# DMARC_TLD_FILE=/etc/exim/opendmarc.tlds # Uncomment the following line to add ARC (Authenticated Received Chain) # support. You must have SPF and DKIM support enabled also. @@ -503,13 +625,6 @@ LOOKUP_LIBS += -lopendmarc # 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 @@ -664,6 +779,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 @@ -752,76 +870,6 @@ HEADERS_CHARSET="ISO-8859-1" #------------------------------------------------------------------------------ -# Exim can be built to support the SMTP STARTTLS command, which implements -# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you -# must install the OpenSSL library package or the GnuTLS library. Exim contains -# no cryptographic code of its own. Uncomment the following lines if you want -# to build Exim with TLS support. If you don't know what this is all about, -# leave these settings commented out. - -# This setting is required for any TLS support (either OpenSSL or GnuTLS) -SUPPORT_TLS=yes - -# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not -USE_OPENSSL=yes -USE_OPENSSL_PC=openssl -# TLS_LIBS=-lssl -lcrypto - -# 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 - -# 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 -# version that old is likely to become unsupported by Exim in 2017. - -# The security fix we provide with the gnutls_allow_auto_pkcs11 option -# (4.82 PP/09) introduces a compatibility regression. The symbol is -# 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 - -# 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 -# certificate, and tell Exim about it by means of the tls_certificate -# and tls_privatekey run time options. You also need to set tls_advertise_hosts -# to specify the hosts to which Exim advertises TLS support. On the other hand, -# if you are running Exim only as a client, building it with TLS support -# is all you need to do. - -# If you are using pkg-config then you should not need to worry where the -# libraries and headers are installed, as the pkg-config .pc specification -# should include all -L/-I information necessary. If not using pkg-config -# then you might need to specify the locations too. - -# Additional libraries and include files are required for both OpenSSL and -# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed -# with all your other libraries. If they are in a special directory, you may -# need something like - -# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto -# or -# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt - -# For DANE under GnuTLS we need an additional library. -# TLS_LIBS += -lgnutls-dane - -# TLS_LIBS is included only on the command for linking Exim itself, not on any -# auxiliary programs. If the include files are not in a standard place, you can -# set TLS_INCLUDE to specify where they are, for example: - -# TLS_INCLUDE=-I/usr/local/openssl/include/ -# or -# TLS_INCLUDE=-I/opt/gnu/include - -# You don't need to set TLS_INCLUDE if the relevant directories are already -# specified in INCLUDE. - - -#------------------------------------------------------------------------------ # The default distribution of Exim contains only the plain text form of the # documentation. Other forms are available separately. If you want to install # the documentation in "info" format, first fetch the Texinfo documentation @@ -1363,7 +1411,7 @@ MAX_NAMED_LIST=16 # (process id) to a file so that it can easily be identified. The path of the # file can be specified here. Some installations may want something like this: -PID_FILE_PATH=/var/run/exim.pid +PID_FILE_PATH=/run/exim.pid # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". @@ -1434,7 +1482,18 @@ PID_FILE_PATH=/var/run/exim.pid # ENABLE_DISABLE_FSYNC=yes -EXTRALIBS=-ldl -lpam -lldap -llber +#------------------------------------------------------------------------------ +# For development, add this to include code to time various stages and report. +# CFLAGS += -DMEASURE_TIMING + +# For a very slightly smaller build, for constrained systems, uncomment this. +# The feature involved is purely for debugging. + +# DISABLE_CLIENT_CMD_LOG=yes + +INCLUDE=-I/usr/include/db5.3 + +EXTRALIBS=-ldl -lpam -lldap -llber -ldb-5 # Fix Errors on loading modules like "undefined symbol: debug_printf_indent" # "Error loading lookup module <modulename>.so: NULL" diff --git a/exim.service b/exim.service index dc48bd7527ad..af86c76f0826 100644 --- a/exim.service +++ b/exim.service @@ -1,10 +1,21 @@ [Unit] -Description=Exim Mail Daemon +Description=Exim MTA Daemon +Documentation=man:exim +Documentation=https://exim.org/docs.html + +Requires=network.target +After=network.target [Service] -PIDFile=/var/run/exim.pid -ExecStart=/usr/bin/exim -bdf -q30m +Environment=DAEMON_OPTS= +Environment=QUEUE_OPTS=-q15m +EnvironmentFile=-/etc/default/exim + +Type=exec +ExecStart=/usr/bin/exim -bdf $DAEMON_OPTS $QUEUE_OPTS ExecReload=/bin/kill -HUP $MAINPID +Slice=exim.slice + [Install] WantedBy=multi-user.target diff --git a/exim.socket b/exim.socket index 36d28684f18a..4c5c90d9ded0 100644 --- a/exim.socket +++ b/exim.socket @@ -1,5 +1,7 @@ [Unit] Description=Exim Mail Transfer Agent +Documentation=man:exim +Documentation=https://exim.org/docs.html Conflicts=exim.service [Socket] diff --git a/exim@.service b/exim@.service index 19c07a51b063..56108f558b11 100644 --- a/exim@.service +++ b/exim@.service @@ -1,7 +1,17 @@ [Unit] Description=Exim Mail Daemon per-connection server +Documentation=man:exim +Documentation=https://exim.org/docs.html [Service] +Type=exec + ExecStart=-/usr/bin/exim -bs + StandardInput=socket -StandardError=syslog +StandardError=journal + +# Don't kill the delivery process we spawned as a child +KillMode=process + +Slice=exim.slice |