Ubuntu
dovecot package

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

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

Description of the change

Merge with Debian's package. I'd held off on merging this due to some earlier build/test failures but these seem resolved now.

By this point most delta has been dropped, the one remaining piece is disabling lto, which was done due to Debian and Ubuntu shipping different default gcc versions. Theoretically we should be able to drop this at some point, but I haven't gotten a successful build locally yet.

PPA with test packages: https://launchpad.net/~bryce/+archive/ubuntu/dovecot-merge-v1e2.3.19.1adfsg1-2

    $ sudo add-apt-repository -yus ppa:bryce/dovecot-merge-v1e2.3.19.1adfsg1-2
    $ sudo apt-get install dovecot-lite

* gnome-terminal
  - lp-test-ppa ppa:bryce/dovecot-merge-v1e2.3.19.1adfsg1-2 --release kinetic --showpass

Usual tags pushed for review:
  - tags/old/debian f3c2e9144
  - tags/new/debian 9b315688d
  - tags/old/ubuntu 7f78e9014
  - tags/logical/1%2.3.16+dfsg1-3ubuntu4 502b33a57
  - tags/reconstruct/1%2.3.16+dfsg1-3ubuntu4 256bf0e77
  - tags/split/1%2.3.16+dfsg1-3ubuntu4 95758b5a7

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

Autopkgtest Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-bryce-dovecot-merge-v1e2.3.19.1adfsg1-2/?format=plain)
  dovecot @ amd64:
    10.08.22 15:06:21 Log 🗒️ ✅ Triggers: dovecot/1:2.3.19.1+dfsg1-2ubuntu1~kinetic1
  dovecot @ arm64:
    10.08.22 15:16:42 Log 🗒️ ✅ Triggers: dovecot/1:2.3.19.1+dfsg1-2ubuntu1~kinetic1
  dovecot @ armhf:
    10.08.22 15:12:36 Log 🗒️ ✅ Triggers: dovecot/1:2.3.19.1+dfsg1-2ubuntu1~kinetic1
  dovecot @ ppc64el:
    10.08.22 15:07:40 Log 🗒️ ✅ Triggers: dovecot/1:2.3.19.1+dfsg1-2ubuntu1~kinetic1
  dovecot @ s390x:
    10.08.22 15:05:16 Log 🗒️ ✅ Triggers: dovecot/1:2.3.19.1+dfsg1-2ubuntu1~kinetic1

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

I'll take this one.

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

Thanks for the MP, Bryce.

LGTM. Package builds fine, autopkgtest is still OK. The LTO change is really minimal and (unfortunately) a relatively common sight in our packages. It'd be interesting to monitor what will happen in Debian when they switch to GCC 12, and maybe send a report upstream to let them know of this problem, but for now I think it's totally fine to keep things as is.

I verified that the dropped changes are indeed included in this new release.

There's a very small nit in the changelog entry; feel free to address it before uploading.

+1

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 :

Thanks, fix added and branch updated.

stirling: ~/pkg/Dovecot/merge-v1e2.3.19.1adfsg1-2/dovecot-gu$ grep ^Vcs ../dovecot_2.3.19.1+dfsg1-2ubuntu1_source.changes
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/dovecot
Vcs-Git-Commit: 48e8e18c5f014bdcfc83dd02d452419f0bb75937
Vcs-Git-Ref: refs/heads/merge-v1e2.3.19.1adfsg1-2-kinetic
stirling: ~/pkg/Dovecot/merge-v1e2.3.19.1adfsg1-2/dovecot-gu$ dput ubuntu ../dovecot_2.3.19.1+dfsg1-2ubuntu1_source.changes
Checking signature on .changes
gpg: ../dovecot_2.3.19.1+dfsg1-2ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../dovecot_2.3.19.1+dfsg1-2ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
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-2ubuntu1.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-2ubuntu1.debian.tar.xz: done.
  Uploading dovecot_2.3.19.1+dfsg1-2ubuntu1_source.buildinfo: done.
  Uploading dovecot_2.3.19.1+dfsg1-2ubuntu1_source.changes: done.
Successfully uploaded packages.

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

This finally migrated over the weekend, along with a couple other dovecot-* source packages that were depending on it.

 dovecot | 1:2.3.16+dfsg1-3ubuntu2 | jammy
 dovecot | 1:2.3.16+dfsg1-3ubuntu2.1 | jammy-security
 dovecot | 1:2.3.16+dfsg1-3ubuntu2.1 | jammy-updates
 dovecot | 1:2.3.19.1+dfsg1-2ubuntu2 | kinetic

dovecot | 1:2.3.4.1-5+deb10u1~bpo9+1 | stretch-backports
dovecot | 1:2.3.4.1-5+deb10u1~bpo9+1 | stretch-backports-debug
dovecot | 1:2.3.13+dfsg1-2 | stable
dovecot | 1:2.3.13+dfsg1-2+deb11u1 | proposed-updates
dovecot | 1:2.3.13+dfsg1-2+deb11u1 | proposed-updates-debug
dovecot | 1:2.3.19.1+dfsg1-2 | testing
dovecot | 1:2.3.19.1+dfsg1-2 | unstable
dovecot | 1:2.3.19.1+dfsg1-2 | unstable-debug

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