Update to 4.97

Add new dependency on AUR package perl-file-fcntllock.
Update systemd file to be more similar to systemd files in upstream exim repo.
Remove patches as they have landed for this release.

Signed-off-by: Nathaniel Clark <Nathaniel.Clark@misrule.us>

8 files changed, 40 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca133d3d13d0..c82483b64ac8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = exim-heavy
 	pkgdesc = Message Transfer Agent with maximal-enabled features
-	pkgver = 4.96.2
-	pkgrel = 2
+	pkgver = 4.97
+	pkgrel = 1
 	url = https://www.exim.org/
 	arch = x86_64
 	arch = i686
@@ -12,6 +12,7 @@ pkgbase = exim-heavy
 	license = GPL
 	makedepends = postgresql-libs
 	makedepends = libmariadbclient
+	makedepends = perl-file-fcntllock
 	depends = gdbm
 	depends = db5.3
 	depends = libldap
@@ -24,10 +25,9 @@ pkgbase = exim-heavy
 	depends = libidn
 	depends = libidn2
 	depends = opendmarc>=1.4.0
-	source = https://ftp.exim.org/pub/exim/exim4/exim-4.96.2.tar.xz
-	source = https://ftp.exim.org/pub/exim/exim4/exim-4.96.2.tar.xz.asc
-	source = exim-typo-d05685413.patch
-	source = exim-opendmarc-1.4.patch
+	depends = perl-file-fcntllock
+	source = https://ftp.exim.org/pub/exim/exim4/exim-4.97.tar.xz
+	source = https://ftp.exim.org/pub/exim/exim4/exim-4.97.tar.xz.asc
 	source = aliases
 	source = exim.logrotate
 	source = exim.Makefile
@@ -43,10 +43,8 @@ pkgbase = exim-heavy
 	validpgpkeys = E5CA331D44AB8E4C806FDBEE26101B62F69376CE
 	validpgpkeys = D0BFD6B9ECA5694A6F149DCEAF4CC676A6B6C142
 	validpgpkeys = A986F3A6BD6377D8730958DEBCE58C8CE41F32DF
-	sha512sums = dc9f6a114e64ac826489edff88d50a24195b64714428e691c10a7bfb119b3ebb6455bf80cbb34dfd0a4e2e44cbde72effb009357a8e0a6065e512fe32092e3ed
+	sha512sums = b28cbb49fa7e143dfcc94e004d57cf98a1945013e676cd103c1ee4cf52933d49d378baa13bea2663353dba97745d6b2ab8b7b66cde870788a2d85d7abd716968
 	sha512sums = SKIP
-	sha512sums = f98d43e42e11d05d3016b9eae2dec860c551cbf3977fff99d0813576114da9a0996facc51f91e4a05510d93115059a6da6c4f005009661c5247574ab31652523
-	sha512sums = f9fd9f857c024cb72989da9344506c4cba0cdb4c270dec048d1f85c92cf4b3423988c545e0783cda1fb6c1b3b541a829181a8ff09ea3ede0db012056b9063963
 	sha512sums = a91c6a9e5b3ac9d143741dba01e11616812ba44c3a8c768c8232364026460f0b8fdeeb120a2f2b86742a6e3ebbfc9d6335b86d108b044e43108b4a6f0374c9ad
 	sha512sums = d8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81
 	sha512sums = 28db74cfd84b7870da9ef8feee54c7e3ca099e0904c450c041647f8e12999c18eb7be960f2464f9a01241486a8737e06fd5b70fa8eabe1fcd34550d460db7a1d
diff --git a/PKGBUILD b/PKGBUILD
index 691c60bf612a..a3ce75534070 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,17 +13,15 @@ pkgname=(exim-heavy
          exim-lookup-passwd
          exim-lookup-pgsql)
 pkgname=exim-heavy
-pkgver=4.96.2
-pkgrel=2
+pkgver=4.97
+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')
-depends=('gdbm' 'db5.3' 'libldap' 'libnsl' 'openssl' 'pam' 'pcre' 'sqlite' 'libspf2' 'libidn' 'libidn2' 'opendmarc>=1.4.0')
-makedepends=('postgresql-libs' 'libmariadbclient')
+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}
-        exim-typo-d05685413.patch
-        exim-opendmarc-1.4.patch
         aliases
         exim.logrotate
         exim.Makefile
@@ -34,10 +32,8 @@ source=("https://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.xz"{,.asc}
         exim-submission.socket
         exim.sysusers
         exim.tmpfiles)
-sha512sums=('dc9f6a114e64ac826489edff88d50a24195b64714428e691c10a7bfb119b3ebb6455bf80cbb34dfd0a4e2e44cbde72effb009357a8e0a6065e512fe32092e3ed'
+sha512sums=('b28cbb49fa7e143dfcc94e004d57cf98a1945013e676cd103c1ee4cf52933d49d378baa13bea2663353dba97745d6b2ab8b7b66cde870788a2d85d7abd716968'
             'SKIP'
-            'f98d43e42e11d05d3016b9eae2dec860c551cbf3977fff99d0813576114da9a0996facc51f91e4a05510d93115059a6da6c4f005009661c5247574ab31652523'
-            'f9fd9f857c024cb72989da9344506c4cba0cdb4c270dec048d1f85c92cf4b3423988c545e0783cda1fb6c1b3b541a829181a8ff09ea3ede0db012056b9063963'
             'a91c6a9e5b3ac9d143741dba01e11616812ba44c3a8c768c8232364026460f0b8fdeeb120a2f2b86742a6e3ebbfc9d6335b86d108b044e43108b4a6f0374c9ad'
             'd8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81'
             '28db74cfd84b7870da9ef8feee54c7e3ca099e0904c450c041647f8e12999c18eb7be960f2464f9a01241486a8737e06fd5b70fa8eabe1fcd34550d460db7a1d'
@@ -58,9 +54,6 @@ prepare() {
   cd $_pkgname-$pkgver
 
   cp $srcdir/$_pkgname.Makefile Local/Makefile
-
-  patch -p2 < $srcdir/exim-typo-d05685413.patch
-  patch -p1 < $srcdir/exim-opendmarc-1.4.patch
 }
 
 build() {
diff --git a/exim-opendmarc-1.4.patch b/exim-opendmarc-1.4.patch
deleted file mode 100644
index c128e7998027..000000000000
--- a/exim-opendmarc-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/dmarc.c b/src/dmarc.c
---- a/src/dmarc.c
-+++ b/src/dmarc.c
-@@ -459,7 +459,7 @@ if (!dmarc_abort && !sender_host_authenticated)
- 		  vs == PDKIM_VERIFY_INVALID ? DMARC_POLICY_DKIM_OUTCOME_TMPFAIL :
- 		  DMARC_POLICY_DKIM_OUTCOME_NONE;
-     libdm_status = opendmarc_policy_store_dkim(dmarc_pctx, US sig->domain,
--					       dkim_result, US"");
-+					       sig->selector, dkim_result, US"");
-     DEBUG(D_receive)
-       debug_printf("DMARC adding DKIM sender domain = %s\n", sig->domain);
-     if (libdm_status != DMARC_PARSE_OKAY)
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-typo-d05685413.patch b/exim-typo-d05685413.patch
deleted file mode 100644
index 45869bd2bc29..000000000000
--- a/exim-typo-d05685413.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit d05685413efd3262b4a5622717f90bba351f1074
-Author: Jeremy Harris <jgh146exb@wizmail.org>
-Date:   Sun Jun 26 12:29:05 2022 +0100
-
-    typo
-
-diff --git a/src/src/drtables.c b/src/src/drtables.c
-index b2f2a4b33..30eb855e3 100644
---- a/src/src/drtables.c
-+++ b/src/src/drtables.c
-@@ -736,7 +736,7 @@ else
-     {
-     char * name = ent->d_name;
-     int len = (int)strlen(name);
--    if (regex_match(regex_islookupmod, US name, len, NUL))
-+    if (regex_match(regex_islookupmod, US name, len, NULL))
-       {
-       int pathnamelen = len + (int)strlen(LOOKUP_MODULE_DIR) + 2;
-       void *dl;
diff --git a/exim.service b/exim.service
index 53fff430ef76..bf08b52ea80a 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=/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
 
+Slide=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