Merge ~ahasenack/ubuntu/+source/samba:lunar-samba-4177-merge into ubuntu/+source/samba:debian/sid

Proposed by Andreas Hasenack
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: git-ubuntu bot
Merged at revision: f17620b14092761dc2ab70e3b0cab8638901e439
Proposed branch: ~ahasenack/ubuntu/+source/samba:lunar-samba-4177-merge
Merge into: ubuntu/+source/samba:debian/sid
Diff against target: 3348 lines (+2994/-5)
5 files modified
debian/changelog (+2476/-0)
debian/control (+6/-5)
debian/tests/control (+4/-0)
debian/tests/samba-ad-dc-provisioning-internal-dns (+398/-0)
debian/tests/util (+110/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Robie Basak (community) Approve
Canonical Server Reporter Pending
Review via email: mp+440180@code.staging.launchpad.net

Description of the change

This is a merge from debian to pick up two new upstream point releases. It was requested by the security team to facilitate fixing the recent samba security vulnerabilities.

The linked bug will become an FFe, I'm still populating it with information.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/lunar-samba-4177-merge/

DEP8: all green (samba and sssd)

I also included tests for the in-archive sssd (without a rebuild), and will likely include more (thx Sergio for the dep8-url-hacking tip to get these to run).

No delta dropped or added, but I squashed together the latest DEP8 changes in logical.

There are libldb2 symbols changes in 4.17.7: some symbols were added. It could be that we should rebuild sssd after all.

To post a comment you must log in.
Revision history for this message
Robie Basak (racb) wrote :

I'll review this.

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

old/debian matches logical except for the changelog and update-maintainer as expected.

"git range-diff old/debian..ahasenack/logical/2%4.17.5+dfsg-2ubuntu3 new/debian..ahasenack/lunar-samba-4177-merge" reports delta rebased exactly as expected.

The new delta is described precisely in debian/changelog with nothing extra or missing.

All changes look like they still belong in our delta and are correct.

It looks like you've thought about the implications of upstream changes for the archive appropriately, including symbols and ABI changes. Debian's new changelog entries seem reasonable and fit our expectations. I leave it to you to decide whether or not to rebuild sssd.

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

Approvers: ahasenack, racb
Uploaders: ahasenack, racb
MP auto-approved

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Thanks, uploaded:
Uploading samba_4.17.7+dfsg-1ubuntu1.dsc
Uploading samba_4.17.7+dfsg.orig.tar.xz
Uploading samba_4.17.7+dfsg-1ubuntu1.debian.tar.xz
Uploading samba_4.17.7+dfsg-1ubuntu1_source.buildinfo
Uploading samba_4.17.7+dfsg-1ubuntu1_source.changes

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