Merge ~sergiodj/ubuntu/+source/exim4:fix-exiqgrep-syntax-error-jammy into ubuntu/+source/exim4:ubuntu/devel

[Sergio Durigan Junior]

This MP fixes bug #1966923.

This is about a regression introduced by an upstream commit (df618101a5) which causes exiqgrep to error due to syntax errors in it. Upstream already has a patch for it; the patch is relatively trivial, although I had to edit it in order to make it successfully apply to the git tree.

Debian is also affected by this problem; I submitted the same patch to them (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006661).

There's a PPA with the proposed change here:

https://launchpad.net/~sergiodj/+archive/ubuntu/exim4-merge

Local autopkgtest is still happy:

autopkgtest [16:59:37]: @@@@@@@@@@@@@@@@@@@@ summary
basic PASS

I'll dispatch the autopkgtests using the PPA builds when they're published.

[Sergio Durigan Junior (sergiodj)]

FWIW, autopkgtest passed on all architectures:

https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-sergiodj-exim4-merge/?format=plain

[Bryce Harrington (bryce)]

Looks good... however I note this patch actually makes several changes beyond just fixing the syntax error. I think you need to either simplify the patch to just the syntax fix, or revise the changelog message to indicate it's a broader fix than just a syntax error.

Specifically, I would suggest saying in the changelog entry that the patch adds a -E option to allow specifying the binary to use, and improving the validation of command line options.

Guessing the latter will be the better option, but either WFM, and feel free to upload directly once that's done.

review: Approve

[Bryce Harrington (bryce)]

[Sorry, I inadvertently consumed the canonical-server slot.]

[Sergio Durigan Junior (sergiodj)]

On Wednesday, March 30 2022, Bryce Harrington wrote:

> Looks good... however I note this patch actually makes several changes
> beyond just fixing the syntax error. I think you need to either
> simplify the patch to just the syntax fix, or revise the changelog
> message to indicate it's a broader fix than just a syntax error.

Thanks for the review, Bryce. And you're right, I agree that the patch
is doing more than fixing the syntax error.

It's a simple patch and I don't think it's worth adjusting it, so I will
go with the second option and expand the changelog entry.

> Specifically, I would suggest saying in the changelog entry that the patch adds a -E option to allow specifying the binary to use, and improving the validation of command line options.
>
> Guessing the latter will be the better option, but either WFM, and feel free to upload directly once that's done.

Thanks. Uploaded with the proposed changes:

$ dput exim4_4.95-4ubuntu2_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/exim4/exim4_4.95-4ubuntu2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/exim4/exim4_4.95-4ubuntu2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading exim4_4.95-4ubuntu2.dsc: done.
  Uploading exim4_4.95-4ubuntu2.debian.tar.xz: done.
  Uploading exim4_4.95-4ubuntu2_source.buildinfo: done.
  Uploading exim4_4.95-4ubuntu2_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Bryce Harrington (bryce)]

Btw, this looks like it's migrated, you can set it to Merged now.

 exim4 | 4.95-4ubuntu2 | jammy | source, all
 exim4 | 4.95-4ubuntu2.1 | jammy-updates | source, all
 exim4 | 4.96-3ubuntu1 | kinetic | source, all

$ ubuntu-changes exim4
exim4 (4.95-4ubuntu2) jammy; urgency=medium

  * d/p/lp1966923-exiqgrep-syntax-error.patch: Fix exiqgrep syntax error,
    improve the validation of command-line options and add a new -E option
    to allow specifying a binary to be used. (LP: #1966923)

 -- Sergio Durigan Junior <email address hidden> Wed, 30 Mar 2022 16:45:24 -0400

exim4 (4.95-4ubuntu1) jammy; urgency=medium

[Sergio Durigan Junior (sergiodj)]

Thanks, Bryce.

diff --git a/debian/changelog b/debian/changelog
index 3b907c0..be86696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+exim4 (4.95-4ubuntu2) jammy; urgency=medium
+
+  * d/p/lp1966923-exiqgrep-syntax-error.patch: Fix exiqgrep syntax error,
+    improve the validation of command-line options and add a new -E option
+    to allow specifying a binary to be used. (LP: #1966923)
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 30 Mar 2022 16:45:24 -0400
+
 exim4 (4.95-4ubuntu1) jammy; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/patches/lp1966923-exiqgrep-syntax-error.patch b/debian/patches/lp1966923-exiqgrep-syntax-error.patch
new file mode 100644
index 0000000..d81f788
--- /dev/null
+++ b/debian/patches/lp1966923-exiqgrep-syntax-error.patch
@@ -0,0 +1,46 @@
+From: Jeremy Harris <[e-mail]>
+Date: Sun, 6 Mar 2022 14:25:13 +0000
+Subject: Utilities: fix exiqgrep perl syntax, add testcases. Bug 2821
+
+Utilities: fix exiqgrep perl syntax, add testcases.  Bug 2821
+
+Broken-by: df618101a5
+
+Origin: backport, https://git.exim.org/exim.git/commitdiff/42ed39da5af85552a35626348bb77e5576e18aa4
+Bug: https://bugs.exim.org/show_bug.cgi?id=2821
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006661
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/exim4/+bug/1966923
+---
+ src/exiqgrep.src | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/exiqgrep.src b/src/exiqgrep.src
+index 10664bb..9304160 100644
+--- a/src/exiqgrep.src
++++ b/src/exiqgrep.src
+@@ -53,12 +53,14 @@ if ($ARGV[0] eq '--version') {
+         exit 0;
+ }
+ 
+-if (!getopts('hf:r:y:o:s:C:zxlibRcaG:',\%opt) { &help; exit;}
+-if ($ARGV[0]) { &help; exit;}
+-if ($opt{h}) { &help; exit;}
++if (!getopts('hf:r:y:o:s:C:zxlibRcaG:E:',\%opt)) { &help; exit; }
++if ($opt{h}) { &help; exit; }
++if ($ARGV[0] || !($opt{f} || $opt{r} || $opt{s} || $opt{y} || $opt{o} || $opt{z} || $opt{x} || $opt{c}))
++   { &help; exit(1); }
+ if ($opt{a}) { $eargs = '-bp'; }
+ if ($opt{C} && -e $opt{C} && -f $opt{C} && -R $opt{C}) { $eargs .= ' -C '.$opt{C}; }
+ if ($opt{G}) { $eargs .= ' -qG'.$opt{G}; }
++if ($opt{E}) { $exim = $opt{E}; }
+ 
+ # Read message queue output into hash
+ &collect();
+@@ -75,6 +77,7 @@ Exim message queue display utility.
+ 
+ 	-h		This help message.
+ 	-C		Specify which exim.conf to use.
++	-E		Specify exim binary to use.
+ 
+ Selection criteria:
+ 	-f <regexp>	Match sender address sender (field is "< >" wrapped)
diff --git a/debian/patches/series b/debian/patches/series
index 59ba1c6..5103fb5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 75_55-Specific-check-for-null-pointer.patch
 90_localscan_dlopen.dpatch
 fix_smtp_banner.patch
+lp1966923-exiqgrep-syntax-error.patch