Merge ~bryce/ubuntu/+source/exim4:sru-lp1998678-kinetic into ubuntu/+source/exim4:ubuntu/kinetic-devel

[Bryce Harrington]

This is the SRUable portion of the fix from mp:bryce/exim4/444948

  Bug: https://bugs.launchpad.net/ubuntu/+source/exim4/+bug/1998678
  Ref: https://code.launchpad.net/~bryce/ubuntu/+source/exim4/+git/exim4/+merge/444948
  Ppa: https://launchpad.net/~bryce/+archive/ubuntu/exim4-sru-lp1998678/

  - exim4/4.96-3ubuntu1.2~kinetic2
    + ✅ exim4 on kinetic for amd64 @ 15.04.23 02:32:39 Log️ 🗒️
    + ✅ exim4 on kinetic for arm64 @ 15.04.23 03:01:23 Log️ 🗒️
    + ✅ exim4 on kinetic for armhf @ 15.04.23 02:34:15 Log️ 🗒️
    + ❌ exim4 on kinetic for i386 @ 15.04.23 02:34:25 Log️ 🗒️
      • basic FAIL 🟥
    + ❌ exim4 on kinetic for i386 @ 10.05.23 06:03:23 Log️ 🗒️
      • basic FAIL 🟥
    + ❌ exim4 on kinetic for ppc64el @ 15.04.23 02:32:40 Log️ 🗒️
      • basic FAIL 🟥
    + ❌ exim4 on kinetic for ppc64el @ 10.05.23 06:04:59 Log️ 🗒️
      • basic FAIL 🟥
    + ✅ exim4 on kinetic for s390x @ 15.04.23 02:32:02 Log️ 🗒️

The i386 error is to be expected. The ppc64el issue seems to be TLS related and I wonder if it is an infrastructure issue rather than a problem with this change.

[Lena Voytek (lvoytek)]

LGTM with additional notes in the diff comments of https://code.launchpad.net/~bryce/ubuntu/+source/exim4/+git/exim4/+merge/444948

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, lvoytek
Uploaders: bryce, lvoytek
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

Thanks, updated and uploaded:

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/exim4
Vcs-Git-Commit: 2b7abe03b201b8f168358629f6458a78fbe5fe6a
Vcs-Git-Ref: refs/heads/sru-lp1998678-kinetic
$ dput ubuntu ../exim4_4.96-3ubuntu1.2_source.changes
gpg: ../exim4_4.96-3ubuntu1.2_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../exim4_4.96-3ubuntu1.2.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading exim4_4.96-3ubuntu1.2.dsc: done.
  Uploading exim4_4.96-3ubuntu1.2.debian.tar.xz: done.
  Uploading exim4_4.96-3ubuntu1.2_source.buildinfo: done.
  Uploading exim4_4.96-3ubuntu1.2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 39a48b4..253f9fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+exim4 (4.96-3ubuntu1.2) kinetic; urgency=medium
+
+  * d/p/fix-run--arg-parsing.patch: Fix argument parsing for ${run }
+    expansion. Previously, when an argument included a close-brace
+    character (e.g. it itself used an expansion) an error occurred.
+    (LP: #1998678)
+
+ -- Bryce Harrington <[e-mail]>  Tue, 11 Apr 2023 18:16:12 -0700
+
 exim4 (4.96-3ubuntu1.1) kinetic-security; urgency=medium
 
   * SECURITY UPDATE: use after free in regex handler
diff --git a/debian/patches/fix-run--arg-parsing.patch b/debian/patches/fix-run--arg-parsing.patch
new file mode 100644
index 0000000..c863071
--- /dev/null
+++ b/debian/patches/fix-run--arg-parsing.patch
@@ -0,0 +1,36 @@
+From 44b6e099b76f403a55e77650821f8a69e9d2682e Mon Sep 17 00:00:00 2001
+From: Jeremy Harris <[e-mail]>
+Date: Sat, 3 Dec 2022 23:13:53 +0000
+Subject: [PATCH] Fix ${run } arg parsing
+
+JH/15 Fix argument parsing for ${run } expansion. Previously, when an argument
+      included a close-brace character (eg. it itself used an expansion) an
+      error occurred.
+
+Broken-by: cfe6acff2ddc
+
+Description: Backports the above fix, coupled with some necessary
+ defines from d8fbda7d "Args count reduction in expansions coding".
+Origin: upstream, https://git.exim.org/exim.git/commit/44b6e099b76f403a55e77650821f8a69e9d2682e
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/exim4/+bug/1998678
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1025420
+Reviewed-By: Bryce Harrington <[e-mail]>
+Applied-Upstream: 4.97, commit:44b6e099b76f403a55e77650821f8a69e9d2682e
+---
+ src/src/expand.c             | 13 ++++++++++---
+
+--- a/src/expand.c
++++ b/src/expand.c
+@@ -5568,7 +5568,11 @@
+ 
+       if (late_expand)		/* this is the default case */
+ 	{
+-	int n = Ustrcspn(s, "}");
++	int n;
++	const uschar * t;
++	/* Locate the end of the args */
++	(void) expand_string_internal(s, TRUE, &t, TRUE, TRUE, NULL);
++	n = t - s;
+ 	arg = skipping ? NULL : string_copyn(s, n);
+ 	s += n;
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index 761902c..2b07802 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ CVE-2022-3559-1.patch
 CVE-2022-3559-2.patch
 CVE-2022-3559-3.patch
 CVE-2022-3559-4.patch
+fix-run--arg-parsing.patch