Ubuntu
libgcrypt20 package

Merge ~zhsj/ubuntu/+source/libgcrypt20:bug2036527 into ubuntu/+source/libgcrypt20:debian/sid

  1. Git
  2. lp:~zhsj/ubuntu/+source/libgcrypt20
  3. bug2036527
  4. Merge into debian/sid
Proposed by Shengjing Zhu
Status: Approved
Approved by: Robie Basak
Approved revision: 2981759d164b33f21ff4143d0d1b67c01c5ef89f
Proposed branch: ~zhsj/ubuntu/+source/libgcrypt20:bug2036527
Merge into: ubuntu/+source/libgcrypt20:debian/sid
Diff against target: 354 lines (+229/-1)
4 files modified
debian/changelog (+192/-0)
debian/control (+2/-1)
debian/patches/disable_fips_enabled_read.patch (+32/-0)
debian/patches/series (+3/-0)
Reviewer Review Type Date Requested Status
Robie Basak Approve
Shengjing Zhu Pending
Brian Murray Pending
Review via email: mp+452342@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2023-09-19.

To post a comment you must log in.
Revision history for this message
Shengjing Zhu (zhsj) wrote : Posted in a previous version of this proposal

PPA for testing https://launchpad.net/~zhsj/+archive/ubuntu/bug2036527/+packages

Revision history for this message
Shengjing Zhu (zhsj) wrote : Posted in a previous version of this proposal

On hold. It has been fixed in Debian as well. I'll wait the new version being imported in git-ubuntu and resubmit this MP.

review: Needs Resubmitting
Revision history for this message
Shengjing Zhu (zhsj) wrote : Posted in a previous version of this proposal

Should be closed in favor of https://bugs.launchpad.net/ubuntu/+source/libgcrypt20/+bug/2036724 Though I'm not sure how to close a MP...

Revision history for this message
Brian Murray (brian-murray) wrote : Posted in a previous version of this proposal

In my merge proposals I see a hyperlink labeled "Delete proposal to merge". If you see that and use it then the MP will disappear.

review: Disapprove
Revision history for this message
Shengjing Zhu (zhsj) wrote :

Since the FFe (https://bugs.launchpad.net/ubuntu/+source/libgcrypt20/+bug/2036724) for dropping the fips patch is difficult to verify it doesn't cause problem for people using FIPS kerenl with libgcrypt from main archive, I resubmit this MP as a merge from debian/sid.

Reply
Revision history for this message
Robie Basak (racb) wrote :

This looks good. Thanks! Just one minor comment on more information that I think should be present in the changelog, and one on the git-ubuntu workflow.

I confirmed that the FTBFS is still present in Mantic right now and this MP fixes it. The Debian changelog entry 1.10.2-3

[Needs Fixing] There is an FTBFS bug for which the libgcrypt20 task will be fixed by this upload, so we should mention it in the changelog and close the bug. This helps connect the dots - otherwise someone starting from the changelog will be missing important context around why the upload happened. You can just use a plain text explanation in the changelog. The wording doesn't matter; the key is that we should explain *why* we're uploading, and also that we are referencing the bug for more information. For example, we could just add:

 * For Ubuntu, this fixes an FTBFS by following Debian 1.10.2-3 in
   dropping the use of --insert-timestamp (LP: #2036527).

[Comment only; no changes needed] The merge-changelogs commit also adds the new changelog entry for 1.10.2-3ubuntu1. Please note that this isn't the normal workflow. Normally I'd expect to see this in an additional commit. You aren't required to follow this workflow exactly, but integrating the new changelog entry into the merge-changelogs commit makes the commit message inaccurate. This is not worth changing for this MP though.

If you give me a +1 on my suggestion for an additional changelog entry above, then I can just make the change andsponsor and upload for you. If instead you'd like to change it differently, that's fine too. Please let me know.

review: Needs Fixing
Reply
Revision history for this message
Shengjing Zhu (zhsj) wrote :

@racb, sure +1 for your suggestion. I'm on VAC so I'd appreciate you can just go ahead.

Reply
Revision history for this message
Robie Basak (racb) wrote :

Uploaded, thanks!

review: Approve
Reply

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