Merge ~sergiodj/ubuntu/+source/curl:fix-ftbfs-openldap-2.5 into ubuntu/+source/curl:ubuntu/devel
Status: | Merged |
---|---|
Approved by: | Sergio Durigan Junior |
Approved revision: | d8ec2f4e3f4a11c709dcceb7dd45ee68af8482f5 |
Merged at revision: | d8ec2f4e3f4a11c709dcceb7dd45ee68af8482f5 |
Proposed branch: | ~sergiodj/ubuntu/+source/curl:fix-ftbfs-openldap-2.5 |
Merge into: | ubuntu/+source/curl:ubuntu/devel |
Diff against target: |
208 lines (+183/-0) 3 files modified
debian/changelog (+7/-0) debian/patches/16_openldap-replace-ldap_-prefix-on-private-functions.patch (+175/-0) debian/patches/series (+1/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bryce Harrington (community) | Approve | ||
Canonical Server Core Reviewers | Pending | ||
Review via email: mp+403021@code.launchpad.net |
Description of the change
This is the backport of an upstream patch to properly adjust curl so that it can build with OpenLDAP 2.5. We still don't have this openldap version in the archive, but I'm working on getting it ready and fixing FTBFSes is part of this task.
The patch is pretty straightforward and its purpose is to rename an internal curl function called "ldap_connect" to something else, because OpenLDAP 2.5 will export this function name. It ends up renaming a bunch of other internal functions whose names start with "ldap_".
There's a PPA with the proposed change here:
https:/
I have submitted this patch to the Debian curl package here:
https:/
but it seems like it's going to be a while until they pick this up, so I decided to go ahead and backport the patch to Ubuntu first (given that we will have the new OpenLDAP here first).
There are no autopkgtests for this package.
Builds all passed, though there's a couple still publishing.
LGTM, +1