Ubuntu
dovecot package

Merge ~bryce/ubuntu/+source/dovecot:merge-v1e2.3.19.1adfsg1-2.1-mantic into ubuntu/+source/dovecot:debian/sid

  1. Git
  2. lp:~bryce/ubuntu/+source/dovecot
  3. merge-v1e2.3.19.1adfsg1-2.1-mantic
  4. Merge into debian/sid
Proposed by Bryce Harrington
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: git-ubuntu bot
Merged at revision: 922f0bb2a2466775116a62e5c83cf89b95447115
Proposed branch: ~bryce/ubuntu/+source/dovecot:merge-v1e2.3.19.1adfsg1-2.1-mantic
Merge into: ubuntu/+source/dovecot:debian/sid
Diff against target: 193 lines (+144/-2)
2 files modified
debian/changelog (+141/-0)
debian/control (+3/-2)
Reviewer Review Type Date Requested Status
Utkarsh Gupta (community) Approve
git-ubuntu bot Approve
Sergio Durigan Junior (community) Approve
Canonical Server Pending
Canonical Server Reporter Pending
Review via email: mp+443377@code.staging.launchpad.net

Description of the change

Merge with Debian's package. The two bits of delta we maintain are disabling LTO, and our Lua version dependence.

For the first bit of delta, I prepared PPAs with and without that disablement. Both PPAs built the package without issue, so from that it looks like we can re-enable LTO builds.

Regarding the Lua delta, both dovecot and apache2 appear ready to move to Lua5.4, so it may be time to MIR that into main, but the delta is left for now until that MIR is undertaken. Once that is in, this delta can be dropped, and dovecot can thenceforth be sync'd.

I ran the i386 test twice, but same results, so seems not to be an irregularity. I've run into this error previously (https://autopkgtest.ubuntu.com/packages/d/dovecot/kinetic/i386) but it seems not to have blocked acceptance, so presumably won't block here either.

PPA:
  [Without LTO] https://launchpad.net/~bryce/+archive/ubuntu/dovecot-merge-v1e2.3.19.1adfsg1-2.1
  [With LTO] https://launchpad.net/~bryce/+archive/ubuntu/dovecot-merge-v1e2.3.19.1adfsg1-2.1-with-lto

Autopkgtest:
  - dovecot/1:2.3.19.1+dfsg1-2.1ubuntu1~with.lto
    + ✅ dovecot on mantic for amd64 @ 19.05.23 05:46:20 Log️ 🗒️
    + ✅ dovecot on mantic for arm64 @ 19.05.23 07:11:39 Log️ 🗒️
    + ✅ dovecot on mantic for armhf @ 19.05.23 05:52:10 Log️ 🗒️
    + ❌ dovecot on mantic for i386 @ 19.05.23 05:53:06 Log️ 🗒️
      • doveadm FAIL 🟥
      • systemd FAIL 🟥
      • command1 FAIL 🟥
      • testmails FAIL 🟥
      • testmails FAIL 🟥
    + ✅ dovecot on mantic for ppc64el @ 19.05.23 05:49:19 Log️ 🗒️
    + ✅ dovecot on mantic for s390x @ 19.05.23 05:47:03 Log️ 🗒️

Usual tags pushed for review:
  - tags/old/debian 9b315688d
  - tags/new/debian 73effa706
  - tags/old/ubuntu 3b2927ff4
  - tags/logical/1%2.3.19.1+dfsg1-2ubuntu4 49a57b0c3
  - tags/reconstruct/1%2.3.19.1+dfsg1-2ubuntu4 676db85e9
  - tags/split/1%2.3.19.1+dfsg1-2ubuntu4 28840f0c6

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

I'll review this one.

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Bryce.

- Builds look fine. I agree with reintroducing LTO; IIRC upstream fixed the problem in https://github.com/dovecot/core/commit/f0c1cf42ea78d22e2674b03fe65f0ee6545c5b99 .

- I believe the i386 dep8 failure is actually telling us something here. Looking at the logs, I see that the problem seems to be the fact that python3-passlib (which is a new dep8 test dependency, added by this merge) isn't available on i386. We would need to either disable this test on i386 (which would mean introducing another delta), or verify if python3-passlib can be added to the i386-whitelist. I believe it's worth pursuing the latter.

- +1 to what you said about Lua, too. Now that both packages can be linked against lua5.4, we should definitely look into MIRing it (and demoting lua5.3).

I'm approving this MP and I believe you can go ahead and upload it, but I believe you will still have a little bit of work with the python3-passlib situation. Hopefully that can be solved with a simple addition to i386-whitelist.

Thanks.

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

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

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

Excellent, thanks for the note about the upstream LTO fix, I've added that sha to the drop rationale, and uploaded.

Good call on python3-passlib, I'll look at adding that to the i386-whitelist once it hits the issue attempting migration.

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/dovecot
Vcs-Git-Commit: 922f0bb2a2466775116a62e5c83cf89b95447115
Vcs-Git-Ref: refs/heads/merge-v1e2.3.19.1adfsg1-2.1-mantic
$ dput ubuntu ../dovecot_2.3.19.1+dfsg1-2.1ubuntu1_source.changes
gpg: ../dovecot_2.3.19.1+dfsg1-2.1ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../dovecot_2.3.19.1+dfsg1-2.1ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
D: Setting host argument.
Checking signature on .changes
Checking signature on .dsc
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading dovecot_2.3.19.1+dfsg1-2.1ubuntu1.dsc: done.
  Uploading dovecot_2.3.19.1+dfsg1.orig-pigeonhole.tar.gz: done.
  Uploading dovecot_2.3.19.1+dfsg1.orig.tar.gz: done.
  Uploading dovecot_2.3.19.1+dfsg1-2.1ubuntu1.debian.tar.xz: done.
  Uploading dovecot_2.3.19.1+dfsg1-2.1ubuntu1_source.buildinfo: done.
  Uploading dovecot_2.3.19.1+dfsg1-2.1ubuntu1_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Utkarsh Gupta (utkarsh) :
review: Approve

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