Ubuntu
exim4 package

Merge ~bryce/ubuntu/+source/exim4:merge-v4.96-17-mantic into ubuntu/+source/exim4:debian/sid

  1. Git
  2. lp:~bryce/ubuntu/+source/exim4
  3. merge-v4.96-17-mantic
  4. Merge into debian/sid
Proposed by Bryce Harrington
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: 060e1741ddcda24a5f5f81782782d259998d6a01
Proposed branch: ~bryce/ubuntu/+source/exim4:merge-v4.96-17-mantic
Merge into: ubuntu/+source/exim4:debian/sid
Diff against target: 1674 lines (+1125/-20) (has conflicts)
6 files modified
debian/EDITME.exim4-heavy.diff (+0/-12)
debian/changelog (+1039/-0)
debian/control (+3/-2)
debian/debconf/conf.d/acl/30_exim4-config_check_rcpt (+27/-6)
debian/patches/fix_smtp_banner.patch (+55/-0)
debian/patches/series (+1/-0)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Needs Fixing
Canonical Server Core Reviewers Pending
Canonical Server packageset reviewers Pending
Canonical Server Reporter Pending
git-ubuntu import Pending
Review via email: mp+448540@code.staging.launchpad.net

Description of the change

Bug: LP: #2030098
PPA: https://launchpad.net/~bryce/+archive/ubuntu/exim4-merge-v4.96-17

Update to newer exim4 version.

I worked a bit at cleaning the merge history. We often use this as a training exercise for new folks, so figured it'd be worth adding the --CL-- and [UBUNTU-only] markers so we can start introducing those concepts during training. I reorganized and squashed changes, and a recent fix of mine was taken by Debian so that could be dropped.

In the end this becomes pretty similar to how the exim4 merges always look.

The package is still building in the PPA at time of writing, so I've not yet run dep8 tests against it, however I ran autopkgtest in lxc locally without issue, so I don't expect problems.

autopkgtest [03:33:13]: test basic: -----------------------]
autopkgtest [03:33:13]: test basic: - - - - - - - - - - results - - - - - - - - - -
basic PASS
autopkgtest [03:33:13]: @@@@@@@@@@@@@@@@@@@@ summary
basic PASS

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

FYI, build is complete now and LGTM I've kicked the autopkgtests

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

I like that you added all "modern style" merge process things.
A few findings though once we are cleaning up here:

1.
the dropped for "Fix argument parsing for" is carrying an "active" launchpad reference which will needlessly ping the LP bug on upload. That should be e.g. (LP #1998678) or such in commit and changelog.

2.
Should the disabling of SPF maybe refer (inactively) to LP #1952738 in commit and changelog?

Other than that (read the actual content) LGTM.
Range diff on:
$ git range-diff pkg/import/4.96-15..bryce/logical/4.96-15ubuntu2 pkg/import/4.96-17..bryce/merge-v4.96-17-mantic
Makes sense, no surprises

As you said "In the end this becomes pretty similar to how the exim4 merges always look."

So need fixes for the two changelog bits, and waiting for the tests to complete.
But you can act on that without re-review unless something unexpected comes up.

review: Needs Fixing
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks Christian, I've made both those corrections and uploaded:

 signfile dsc exim4_4.96-17ubuntu1.dsc A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_buildinfo exim4_4.96-17ubuntu1.dsc exim4_4.96-17ubuntu1_source.buildinfo
 signfile buildinfo exim4_4.96-17ubuntu1_source.buildinfo A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_changes dsc exim4_4.96-17ubuntu1.dsc exim4_4.96-17ubuntu1_source.changes
 fixup_changes buildinfo exim4_4.96-17ubuntu1_source.buildinfo exim4_4.96-17ubuntu1_source.changes
 signfile changes exim4_4.96-17ubuntu1_source.changes A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

Successfully signed dsc, buildinfo, changes files
triage-mantic+23.10: ~/pkg/Exim4/merge-v4.96-17/exim4-gu$ grep ^Vcs ../exim4_4.96-17ubuntu1_source.changes
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/exim4
Vcs-Git-Commit: 060e1741ddcda24a5f5f81782782d259998d6a01
Vcs-Git-Ref: refs/heads/merge-v4.96-17-mantic
triage-mantic+23.10: ~/pkg/Exim4/merge-v4.96-17/exim4-gu$ dput ubuntu ../exim4_4.96-17ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../exim4_4.96-17ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../exim4_4.96-17ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading exim4_4.96-17ubuntu1.dsc: done.
  Uploading exim4_4.96-17ubuntu1.debian.tar.xz: done.
  Uploading exim4_4.96-17ubuntu1_source.buildinfo: done.
  Uploading exim4_4.96-17ubuntu1_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Bryce Harrington (bryce) wrote :

There's a dep8 issue on armhf but it built fine on all arches and is in -proposed currently.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches