Merge ~sergiodj/ubuntu/+source/ldb:merge-2.2.0-3.1-impish into ubuntu/+source/ldb:debian/sid
Status: | Merged |
---|---|
Merge reported by: | Sergio Durigan Junior |
Merged at revision: | 20b553574c779975141d989d0422f7ff91615542 |
Proposed branch: | ~sergiodj/ubuntu/+source/ldb:merge-2.2.0-3.1-impish |
Merge into: | ubuntu/+source/ldb:debian/sid |
Diff against target: |
102 lines (+75/-1) 2 files modified
debian/changelog (+73/-0) debian/control (+2/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bryce Harrington (community) | Approve | ||
Canonical Server | Pending | ||
Canonical Server packageset reviewers | Pending | ||
Review via email: mp+406331@code.launchpad.net |
Description of the change
This is the merge of ldb 2:2.2.0-3.1ubuntu1 from Debian unstable.
It's a relatively simple merge, whose purpose is to consolidate the CVE fixes that have been added as a delta to the Ubuntu package but are now available in the Debian package as well.
When we remove these patches from our delta, the only thing that is left is the one-liner change on d/rules related to bug 1920825. This change was made because dh-exec on hirsute showed different behaviours depending on the value of DEB_BUILD_PROFILES, which was causing a FTBFS on ldb (and other packages). I was able to verify that the build now passes without this modification.
Considering what I wrote above, this means that the package is actually going to become a sync against Debian. But, in the interest of keeping the merge process transparent and following our conventions, I'm filing this MP and requesting a review before pulling the trigger on requestsync.
There's a PPA with the proposed package here:
https:/
ldb doesn't have dep8 tests, but I verified that the package still installs OK. Samba depends on ldb, but we won't need to rebuild it because this is a minor update that doesn't involve soname bumps.
Yep, LGTM, +1 to syncpackage this.
I had looked at ldb yesterday in doing the merge board review and noticed it looked likely to be a small merge. Glad to hear it can return to sync.