exim exim-html: updated to 4.96

New stuff we've added since 4.95:

  - A new ACL condition: seen. Records/tests a timestamp against a key.
  - A variant of the "mask" expansion operator to give normalised IPv6.
  - UTC output option for exim_dumpdb, exim_fixdb.
  - An event for failing TLS connects to the daemon.
  - The ACL "debug" control gains options "stop", "pretrigger" and "trigger".
  - Query-style lookups are now checked for quoting, if the query string is
     built using untrusted data ("tainted").  For now lack of quoting is merely
     logged; a future release will upgrade this to an error.
  - The expansion conditions match_<list-type> and inlist now set $value for
     the expansion of the "true" result of the ${if}.  With a static list, this
     can be used for de-tainting.

Notable removals since 4.95:

   - the "allow_insecure_tainted_data" main config option and the
     "taint" log_selector.  These were deprecated in the 4.95 release.

4 files changed, 13 insertions, 14 deletions

diff --git a/mail/exim-html/Makefile b/mail/exim-html/Makefile
index 4504766c8ad..f846936c512 100644
--- a/mail/exim-html/Makefile
+++ b/mail/exim-html/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2021/11/14 20:19:08 adam Exp $
+# $NetBSD: Makefile,v 1.46 2022/07/02 09:24:34 adam Exp $
 
-DISTNAME=	exim-html-4.95
+DISTNAME=	exim-html-4.96
 CATEGORIES=	mail net
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/
 EXTRACT_SUFX=	.tar.xz
diff --git a/mail/exim-html/distinfo b/mail/exim-html/distinfo
index 807813858d9..a5c0dabdedd 100644
--- a/mail/exim-html/distinfo
+++ b/mail/exim-html/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.38 2021/11/14 20:19:08 adam Exp $
+$NetBSD: distinfo,v 1.39 2022/07/02 09:24:34 adam Exp $
 
-BLAKE2s (exim-html-4.95.tar.xz) = 153711bc193cfb3687383bcc82a5ce720fb5baadbbd9b9dc2e3538fac559e2d8
-SHA512 (exim-html-4.95.tar.xz) = ddfbc2dde8a88b4de51fa146ce46532835d310e15c2d9dae96e84a3a55f3440d23de556acf5fb87221306ff37cb3b2ed3c14ab3ab2532919ce7975e441aa0157
-Size (exim-html-4.95.tar.xz) = 564164 bytes
+BLAKE2s (exim-html-4.96.tar.xz) = 477081b74c044acbc0e9f30db73d0e588d82e03adb4b50907e0540133fc1958b
+SHA512 (exim-html-4.96.tar.xz) = 60afb7318e18f38e6386c803e806a6d8f6cdc4ae2de6314083f78e6910d7fb3d2daddcb3055099b3be4bffad7c9816a9b3457d0e9537559d5dadca029b697b55
+Size (exim-html-4.96.tar.xz) = 566748 bytes
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 3c1ad3aaec7..a44f39ea4f6 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.192 2022/06/28 11:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.193 2022/07/02 09:24:34 adam Exp $
 
-DISTNAME=	exim-4.95
-PKGREVISION=	3
+DISTNAME=	exim-4.96
 CATEGORIES=	mail net
 MASTER_SITES=	https://ftp.exim.org/pub/exim/exim4/
 MASTER_SITES+=	https://ftp.exim.org/pub/exim/exim4/fixes/
@@ -130,5 +129,5 @@ post-install:
 		${DESTDIR}${PREFIX}/share/doc/exim
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 06c06e917a9..deb34808260 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.82 2021/11/14 20:19:08 adam Exp $
+$NetBSD: distinfo,v 1.83 2022/07/02 09:24:34 adam Exp $
 
-BLAKE2s (exim-4.95.tar.xz) = 93089cb1c4432202d3b3bc6c4215e614d77034ecb84c93de17aabb70c5aa7b71
-SHA512 (exim-4.95.tar.xz) = 93d09c20d99f27da5edbe3e6dc7d25aa4548faa2b67ca26f2cc0b4aeaf58398dd468e0263714fcf0df97531f05d16fcd3f1f0e9d0656ead7858a66b248a44a65
-Size (exim-4.95.tar.xz) = 1865172 bytes
+BLAKE2s (exim-4.96.tar.xz) = 9b7a5e16ad466ede1ca9340cdc4bacb2b756479df64a6c4069805c4f2243f61b
+SHA512 (exim-4.96.tar.xz) = 6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
+Size (exim-4.96.tar.xz) = 1879152 bytes
 SHA1 (patch-Local_Makefile.pkgsrc) = 7d6971cfe6f6fecf854926e90460b1a8bcd6a79d
 SHA1 (patch-OS_Makefile-Default) = 6af17f036ed02a3bc37c1f303269eea447fcb691
 SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5