Update to exim 4.91 and built default modules into main package

6 files changed, 90 insertions, 163 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 544249d2cde8..977869003225 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = exim-heavy
 	pkgdesc = Message Transfer Agent with maximal-enabled features
-	pkgver = 4.90.1
+	pkgver = 4.91
 	pkgrel = 1
-	url = http://www.exim.org/
+	url = https://www.exim.org/
 	arch = x86_64
 	arch = i686
 	arch = arm
@@ -10,19 +10,21 @@ pkgbase = exim-heavy
 	arch = armv7h
 	arch = aarch64
 	license = GPL
-	makedepends = pcre
-	makedepends = pam
-	makedepends = openssl
+	makedepends = gdbm
 	makedepends = libldap
+	makedepends = libnsl
+	makedepends = openssl
+	makedepends = pam
+	makedepends = pcre
+	makedepends = sqlite
 	makedepends = libspf2
 	makedepends = libidn
 	makedepends = opendmarc
 	makedepends = libsrs_alt
 	makedepends = postgresql-libs
 	makedepends = libmariadbclient
-	makedepends = sqlite
-	options = !makeflags
-	source = ftp://ftp.exim.org/pub/exim/exim4/exim-4.90.1.tar.bz2
+	source = https://ftp.exim.org/pub/exim/exim4/exim-4.91.tar.bz2
+	source = https://ftp.exim.org/pub/exim/exim4/exim-4.91.tar.bz2.asc
 	source = aliases
 	source = exim.logrotate
 	source = exim.Makefile
@@ -31,34 +33,36 @@ pkgbase = exim-heavy
 	source = exim@.service
 	source = exim.socket
 	source = exim-submission.socket
-	md5sums = 4b909bf15acfd59ef65ded43d7f38820
-	md5sums = 4874006f0585253ddab027d441009757
-	md5sums = e18a535218718c5eb394ed5c9296fe06
-	md5sums = d9c6c3b4c68313d5cdec7d63670f3e21
-	md5sums = 88cf76405367a6ed371d05db1d3c9565
-	md5sums = be8fdcf7b2d6b6368a21705e69743265
-	md5sums = 6f5a5c2b0835b33f59d2513cce18c65b
-	md5sums = 101a726e4d3f4d0074710273f9808022
-	md5sums = 11b319ba0bd84911fa70e9bef2190715
+	source = exim.sysusers
+	source = exim.tmpfiles
+	validpgpkeys = C693A034E1ED6EE954CAE2DA13DAD99C7E41519C
+	validpgpkeys = ACBB4324393ADE3515DA2DDA4D1E900E14C1CC04
+	validpgpkeys = E5CA331D44AB8E4C806FDBEE26101B62F69376CE
+	validpgpkeys = A986F3A6BD6377D8730958DEBCE58C8CE41F32DF
+	sha512sums = dbdae7e451988d0f5085a700875372d4978c37baa51f1b106b55045eac39a9c92a90a5ebcbf7764dae4c9bb76e1dd52f48e84a3657f68cf96428281177c6d250
+	sha512sums = SKIP
+	sha512sums = a91c6a9e5b3ac9d143741dba01e11616812ba44c3a8c768c8232364026460f0b8fdeeb120a2f2b86742a6e3ebbfc9d6335b86d108b044e43108b4a6f0374c9ad
+	sha512sums = d8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81
+	sha512sums = 4086e401a21e80f92adadb0a637efcfb525a0c250e80e88f9b9a1f61cef463ecf89e769576331cd2b200ac1f4966efc5fa7fd44ac179cbf86a700faf5169e9bf
+	sha512sums = dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f
+	sha512sums = e2fc3966c320460a26fbbf83e98df725587dc126dfe9d7a84c3285eb4b22a061b30499425c70f3d73cf13aa81c194274004efd20ce1316836463b982117909f8
+	sha512sums = 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a
+	sha512sums = db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae
+	sha512sums = 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d
+	sha512sums = 87a16aa7bd60a8df0da8131bb811825232f25e934b9326460a2f8f0f8e0f44c53d71b1225ecfee8d30c8714f6e9f85f5f0821e346a7751d43683b406376d605b
+	sha512sums = f8a34fea0a65d0992732bc444bbb334d060de7d91d9cca6f00bc950ba289afa813783517dd3999437f89bc194290785805df7081606a65abb1db3fd3b3aa94ca
 
 pkgname = exim-heavy
-	install = exim.install
-	depends = pcre
-	depends = pam
-	depends = openssl
+	depends = gdbm
 	depends = libldap
-	depends = libspf2
-	depends = libidn
-	depends = opendmarc
-	depends = libsrs_alt
-	optdepends = exim-lookup-dbmdb: for dbmdb lookup support
-	optdepends = exim-lookup-dnsdb: for dnsdb lookup support
-	optdepends = exim-lookup-dsearch: for dsearch lookup support
-	optdepends = exim-lookup-lsearch: for lsearch lookup support
+	depends = libnsl
+	depends = openssl
+	depends = pam
+	depends = pcre
+	depends = sqlite
 	optdepends = exim-lookup-mysql: for MariaDB/MySQL lookup support
 	optdepends = exim-lookup-passwd: for passwd lookup support
 	optdepends = exim-lookup-pgsql: for PostgreSQL lookup support
-	optdepends = exim-lookup-sqlite: for SQLite lookup support
 	provides = smtp-server
 	provides = smtp-forwarder
 	conflicts = smtp-server
@@ -67,18 +71,6 @@ pkgname = exim-heavy
 	backup = etc/mail/exim.conf
 	backup = etc/logrotate.d/exim
 
-pkgname = exim-lookup-dbmdb
-	depends = exim-heavy
-
-pkgname = exim-lookup-dnsdb
-	depends = exim-heavy
-
-pkgname = exim-lookup-dsearch
-	depends = exim-heavy
-
-pkgname = exim-lookup-lsearch
-	depends = exim-heavy
-
 pkgname = exim-lookup-mysql
 	depends = exim-heavy
 	depends = libmariadbclient
@@ -91,7 +83,3 @@ pkgname = exim-lookup-pgsql
 	depends = postgresql-libs
 	replaces = exim-pgsql
 
-pkgname = exim-lookup-sqlite
-	depends = exim-heavy
-	depends = sqlite
-
diff --git a/PKGBUILD b/PKGBUILD
index 2306b200f86e..d3d2265cbf2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 184569 2016-07-28 18:51:26Z heftig $
 # Maintainer: Sergey Shatunov <me#prok.pw>
 # Contributor: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
@@ -9,24 +8,19 @@
 _pkgname=exim
 pkgbase=${_pkgname}-heavy
 pkgname=(exim-heavy
-         exim-lookup-dbmdb
-         exim-lookup-dnsdb
-         exim-lookup-dsearch
-         exim-lookup-lsearch
          exim-lookup-mysql
          exim-lookup-passwd
-         exim-lookup-pgsql
-         exim-lookup-sqlite)
+         exim-lookup-pgsql)
 pkgname=exim-heavy
-pkgver=4.90.1
+pkgver=4.91
 pkgrel=1
 pkgdesc='Message Transfer Agent with maximal-enabled features'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url='http://www.exim.org/'
+url='https://www.exim.org/'
 license=('GPL')
-makedepends=('pcre' 'pam' 'openssl' 'libldap' 'libspf2' 'libidn' 'opendmarc' 'libsrs_alt' 'postgresql-libs' 'libmariadbclient' 'sqlite')
-options=('!makeflags')
-source=(ftp://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.bz2
+makedepends=('gdbm' 'libldap' 'libnsl' 'openssl' 'pam' 'pcre' 'sqlite')
+makedepends+=('libspf2' 'libidn' 'opendmarc' 'libsrs_alt' 'postgresql-libs' 'libmariadbclient')
+source=("https://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.bz2"{,.asc}
         aliases
         exim.logrotate
         exim.Makefile
@@ -34,17 +28,25 @@ source=(ftp://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.bz2
         exim.service
         exim@.service
         exim.socket
-        exim-submission.socket)
-md5sums=('4b909bf15acfd59ef65ded43d7f38820'
-         '4874006f0585253ddab027d441009757'
-         'e18a535218718c5eb394ed5c9296fe06'
-         'd9c6c3b4c68313d5cdec7d63670f3e21'
-         '88cf76405367a6ed371d05db1d3c9565'
-         'be8fdcf7b2d6b6368a21705e69743265'
-         '6f5a5c2b0835b33f59d2513cce18c65b'
-         '101a726e4d3f4d0074710273f9808022'
-         '11b319ba0bd84911fa70e9bef2190715')
-
+        exim-submission.socket
+        exim.sysusers
+        exim.tmpfiles)
+sha512sums=('dbdae7e451988d0f5085a700875372d4978c37baa51f1b106b55045eac39a9c92a90a5ebcbf7764dae4c9bb76e1dd52f48e84a3657f68cf96428281177c6d250'
+            'SKIP'
+            'a91c6a9e5b3ac9d143741dba01e11616812ba44c3a8c768c8232364026460f0b8fdeeb120a2f2b86742a6e3ebbfc9d6335b86d108b044e43108b4a6f0374c9ad'
+            'd8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81'
+            '4086e401a21e80f92adadb0a637efcfb525a0c250e80e88f9b9a1f61cef463ecf89e769576331cd2b200ac1f4966efc5fa7fd44ac179cbf86a700faf5169e9bf'
+            'dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f'
+            'e2fc3966c320460a26fbbf83e98df725587dc126dfe9d7a84c3285eb4b22a061b30499425c70f3d73cf13aa81c194274004efd20ce1316836463b982117909f8'
+            '11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a'
+            'db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae'
+            '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>
+              'A986F3A6BD6377D8730958DEBCE58C8CE41F32DF') # Jeremy Harris <jgh@wizmail.org>
 build() {
   cd $_pkgname-$pkgver
 
@@ -53,19 +55,13 @@ build() {
 }
 
 package_exim-heavy() {
-  depends=('pcre' 'pam' 'openssl' 'libldap' 'libspf2' 'libidn' 'opendmarc' 'libsrs_alt')
-  optdepends=('exim-lookup-dbmdb: for dbmdb lookup support'
-              'exim-lookup-dnsdb: for dnsdb lookup support'
-              'exim-lookup-dsearch: for dsearch lookup support'
-              'exim-lookup-lsearch: for lsearch lookup support'
-              'exim-lookup-mysql: for MariaDB/MySQL lookup support'
+  depends=('gdbm' 'libldap' 'libnsl' 'openssl' 'pam' 'pcre' 'sqlite')
+  optdepends=('exim-lookup-mysql: for MariaDB/MySQL lookup support'
               'exim-lookup-passwd: for passwd lookup support'
-              'exim-lookup-pgsql: for PostgreSQL lookup support'
-              'exim-lookup-sqlite: for SQLite lookup support')
+              'exim-lookup-pgsql: for PostgreSQL lookup support')
   provides=('smtp-server' 'smtp-forwarder')
   conflicts=('smtp-server' 'smtp-forwarder')
   backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim)
-  install=exim.install
 
   cd $_pkgname-$pkgver
   
@@ -74,26 +70,23 @@ package_exim-heavy() {
   install -Dm0644 ../exim.logrotate "$pkgdir"/etc/logrotate.d/exim
   install -Dm0644 doc/exim.8 "$pkgdir"/usr/share/man/man8/exim.8
 
-  mkdir -p "$pkgdir"/var/spool/exim/db "$pkgdir"/etc/mail \
-    "$pkgdir"/var/log/exim "$pkgdir"/usr/{lib,bin}
-
-  chmod 770 "$pkgdir"/var/spool/exim{,/db} "$pkgdir"/var/log/exim
-  chown 0:79 "$pkgdir"/var/spool/exim "$pkgdir"/var/log/exim
-  chown 79:79 "$pkgdir"/var/spool/exim/db
+  install -Dm0644 ../exim.sysusers "$pkgdir"/usr/lib/sysusers.d/exim.conf
+  install -Dm0644 ../exim.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/exim.conf
 
   cd build-Linux-*
   for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb \
     exipick exiqsumm exigrep exim_dbmbuild exim exim_fixdb eximstats exinext \
     exiqgrep exiwhat; do
-    install -m0755 "$i" "$pkgdir"/usr/bin
+    install -Dm0755 "$i" "$pkgdir"/usr/bin/$i
   done
+  chmod u+s "$pkgdir"/usr/bin/exim
 
   cd ../src
   sed -e "s|/etc/aliases|/etc/mail/aliases|g" \
     -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \
-    configure.default > "$pkgdir"/etc/mail/exim.conf
+    configure.default | install -Dm0644 /dev/stdin "$pkgdir"/etc/mail/exim.conf
 
-  cp "$srcdir"/aliases "$pkgdir"/etc/mail
+  install -Dm0644 "$srcdir"/aliases "$pkgdir"/etc/mail/aliases
 
   cd "$pkgdir"/usr/bin
   for i in mailq newaliases rmail rsmtp runq sendmail; do
@@ -115,34 +108,6 @@ package_exim-heavy() {
     "$pkgdir"/usr/lib/systemd/system/exim-submission.socket
 }
 
-package_exim-lookup-dbmdb() {
-  depends=(${pkgbase})
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  cd build-Linux-*
-  install -Dm0755 lookups/dbmdb.so "$pkgdir"/usr/lib/exim/lookups/dbmdb.so
-}
-
-package_exim-lookup-dnsdb() {
-  depends=(${pkgbase})
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  cd build-Linux-*
-  install -Dm0755 lookups/dnsdb.so "$pkgdir"/usr/lib/exim/lookups/dnsdb.so
-}
-
-package_exim-lookup-dsearch() {
-  depends=(${pkgbase})
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  cd build-Linux-*
-  install -Dm0755 lookups/dsearch.so "$pkgdir"/usr/lib/exim/lookups/dsearch.so
-}
-
-package_exim-lookup-lsearch() {
-  depends=(${pkgbase})
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  cd build-Linux-*
-  install -Dm0755 lookups/lsearch.so "$pkgdir"/usr/lib/exim/lookups/lsearch.so
-}
-
 package_exim-lookup-mysql() {
   depends=(${pkgbase} 'libmariadbclient')
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -164,10 +129,3 @@ package_exim-lookup-pgsql() {
   cd build-Linux-*
   install -Dm0755 lookups/pgsql.so "$pkgdir"/usr/lib/exim/lookups/pgsql.so
 }
-
-package_exim-lookup-sqlite() {
-  depends=(${pkgbase} 'sqlite')
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  cd build-Linux-*
-  install -Dm0755 lookups/sqlite.so "$pkgdir"/usr/lib/exim/lookups/sqlite.so
-}
diff --git a/exim.Makefile b/exim.Makefile
index 9da7ade4496e..fb2c0555a9f4 100644
--- a/exim.Makefile
+++ b/exim.Makefile
@@ -248,7 +248,7 @@ SUPPORT_MAILDIR=yes
 
 #------------------------------------------------------------------------------
 # See below for dynamic lookup modules.
-#
+# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/
 # If not using package management but using this anyway, then think about how
 # you perform upgrades and revert them. You should consider the benefit of
 # embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can
@@ -293,16 +293,12 @@ CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
 # Depending on where it is installed you may have to edit the CFLAGS
 # (often += -I/usr/local/include) and LDFLAGS (-lhiredis) lines.
 
-# If your system has pkg-config then the _INCLUDE/_LIBS setting can be
-# handled for you automatically by also defining the _PC variable to reference
-# the name of the pkg-config package, if such is available.
-
-LOOKUP_DBM=2
-LOOKUP_LSEARCH=2
-LOOKUP_DNSDB=2
+LOOKUP_DBM=yes
+LOOKUP_LSEARCH=yes
+LOOKUP_DNSDB=yes
 
 # LOOKUP_CDB=yes
-LOOKUP_DSEARCH=2
+LOOKUP_DSEARCH=yes
 # LOOKUP_IBASE=yes
 LOOKUP_LDAP=yes
 LOOKUP_MYSQL=2
@@ -315,7 +311,7 @@ LOOKUP_PASSWD=2
 LOOKUP_PGSQL=2
 LOOKUP_PGSQL_PC=libpq
 # LOOKUP_REDIS=yes
-LOOKUP_SQLITE=2
+LOOKUP_SQLITE=yes
 LOOKUP_SQLITE_PC=sqlite3
 # LOOKUP_WHOSON=yes
 
@@ -345,19 +341,16 @@ LDAP_LIB_TYPE=OPENLDAP2
 
 
 #------------------------------------------------------------------------------
-# The PCRE library is required for Exim.  There is no longer an embedded
+# The PCRE 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.
 # 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
 # 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.
+# The default setting of PCRE_LIBS should work on the vast majority of
+# systems
 
-PCRE_CONFIG=yes
-# PCRE_LIBS=-lpcre
+PCRE_LIBS=-lpcre
 
 
 #------------------------------------------------------------------------------
@@ -368,8 +361,8 @@ PCRE_CONFIG=yes
 # specified in INCLUDE. The settings below are just examples; -lpq is for
 # PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite.
 
-# LOOKUP_INCLUDE=-I/usr/include/mysql
-# LOOKUP_LIBS=-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
 
 
 #------------------------------------------------------------------------------
@@ -399,7 +392,6 @@ WITH_CONTENT_SCAN=yes
 
 WITH_OLD_DEMIME=yes
 
-#------------------------------------------------------------------------------
 # If you're using ClamAV and are backporting fixes to an old version, instead
 # of staying current (which is the more usual approach) then you may need to
 # use an older API which uses a STREAM command, now deprecated, instead of
@@ -409,9 +401,8 @@ WITH_OLD_DEMIME=yes
 #
 # WITH_OLD_CLAMAV_STREAM=yes
 
-
 #------------------------------------------------------------------------------
-# If built with TLS, Exim includes code to support DKIM (DomainKeys Identified
+# By default Exim includes code to support DKIM (DomainKeys Identified
 # Mail, RFC4871) signing and verification.  Verification of signatures is
 # turned on by default.  See the spec for information on conditionally
 # disabling it.  To disable the inclusion of the entire feature, set
@@ -1086,10 +1077,6 @@ SYSTEM_ALIASES_FILE=/etc/mail/aliases
 # dynamic loading library is not otherwise included.
 
 
-#------------------------------------------------------------------------------
-# Uncomment this setting to include IPv6 support.
-
-HAVE_IPV6=yes
 
 ###############################################################################
 #              THINGS YOU ALMOST NEVER NEED TO MENTION                        #
@@ -1389,6 +1376,10 @@ PID_FILE_PATH=/var/run/exim.pid
 
 # ENABLE_DISABLE_FSYNC=yes
 
-LDFLAGS += -ldl -lpam -lldap -llber -export-dynamic -rdynamic
+HAVE_IPV6=YES
+LOOKUP_LIBS=-lldap -llber -lsqlite3
+EXTRALIBS_EXIM=-lpam
 
+USE_GDBM=yes
+DBMLIB=-lgdbm
 # End of EDITME for Exim 4.
diff --git a/exim.install b/exim.install
deleted file mode 100644
index 3601231f8f22..000000000000
--- a/exim.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  getent group exim >/dev/null 2>&1 || groupadd -g 79 exim 
-  if getent passwd exim > /dev/null 2>&1; then
-    usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1
-  else
-    usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim 
-  fi
-  passwd -l exim > /dev/null
-  chmod u+s /usr/bin/exim
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/exim.sysusers b/exim.sysusers
new file mode 100644
index 000000000000..adb8ac6a1ffa
--- /dev/null
+++ b/exim.sysusers
@@ -0,0 +1 @@
+u exim 79 "Exim MTA" /var/spool/exim
diff --git a/exim.tmpfiles b/exim.tmpfiles
new file mode 100644
index 000000000000..5705619f006d
--- /dev/null
+++ b/exim.tmpfiles
@@ -0,0 +1,3 @@
+d /var/spool/exim    0770 root exim - -
+d /var/spool/exim/db 0770 exim exim - -
+d /var/log/exim      0770 root exim - -