Merge ~bryce/ubuntu/+source/exim4:sru-lp1998678-mantic into ubuntu/+source/exim4:ubuntu/mantic-devel
| Status: | Merged |
|---|---|
| Approved by: | git-ubuntu bot |
| Approved revision: | not available |
| Merge reported by: | Bryce Harrington |
| Merged at revision: | 18be129ed530ee8f9231bb9eeb4fab7e2460a881 |
| Proposed branch: | ~bryce/ubuntu/+source/exim4:sru-lp1998678-mantic |
| Merge into: | ubuntu/+source/exim4:ubuntu/mantic-devel |
| Diff against target: |
91 lines (+53/-5) 4 files modified
debian/changelog (+11/-0) debian/debconf/conf.d/acl/30_exim4-config_check_rcpt (+4/-5) debian/patches/fix-run--arg-parsing.patch (+37/-0) debian/patches/series (+1/-0) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| git-ubuntu bot | Approve | ||
| Lena Voytek (community) | Approve | ||
| Canonical Server Reporter | Pending | ||
| Canonical Server | Pending | ||
| Canonical Server Core Reviewers | Pending | ||
|
Review via email:
|
|||
Description of the change
This adds a backported patch to fix a parsing error in the exim4 config file encountered with SPF is enabled.
Bug: https:/
PPA: https:/
Part of Ubuntu's delta includes a config snippet for SPF that as shipped is disabled by default. The user can manually modify the config file to enable it, but will hit a parsing error when the config snippet is actually used.
The complication here is that the Ubuntu exim4 config snippet has *two* bugs. The first upstream recognized as a legit problem and landed a fix. I backported the fix, and Debian picked it up. So the patch this MP adds can be dropped in the next merge.
The second issue arises from having an $if{ structure embedded in the ${run structure. That happened to work previously, but upstream considers that an undocumented feature. The latest code has re-spec'd the parsing behavior and considers this an unsupported behavior.
For the first issue we're including the backported patch from upstream that Debian accepted. For the second issue, we're papering it over in mantic and newer by removing the ${if structure and simplifying the logic. Since the SPF config has been broken for a couple releases already, this isn't going to bring a regression, however I'm thinking of doing this only for mantic and newer. I don't want to change the config and accidentally somehow cause a conflict for people that have already worked around the bug.
| Bryce Harrington (bryce) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
LGTM, I have some recommendations for the patch header which also apply to kinetic and lunar. The patch changes, helo scope change, and changelog all look good though. I agree with the reasoning behind keeping the $if{ change to mantic and later too.