Merge ~sergiodj/ubuntu/+source/curl:fix-ftbfs-openldap-2.5 into ubuntu/+source/curl:ubuntu/devel

[Sergio Durigan Junior]

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://launchpad.net/~sergiodj/+archive/ubuntu/curl-ftbfs-openldap/+packages

I have submitted this patch to the Debian curl package here:

https://salsa.debian.org/debian/curl/-/merge_requests/11

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.

[Bryce Harrington (bryce)]

Builds all passed, though there's a couple still publishing.

LGTM, +1

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thanks for the quick review, Bryce.

Pushed & uploaded:

$ git push pkg upload/7.74.0-1.2ubuntu2
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 8 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 2.84 KiB | 223.00 KiB/s, done.
Total 11 (delta 7), reused 1 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/curl
 * [new tag] upload/7.74.0-1.2ubuntu2 -> upload/7.74.0-1.2ubuntu2

$ dput curl_7.74.0-1.2ubuntu2_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/curl/curl_7.74.0-1.2ubuntu2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/curl/curl_7.74.0-1.2ubuntu2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading curl_7.74.0-1.2ubuntu2.dsc: done.
  Uploading curl_7.74.0-1.2ubuntu2.debian.tar.xz: done.
  Uploading curl_7.74.0-1.2ubuntu2_source.buildinfo: done.
  Uploading curl_7.74.0-1.2ubuntu2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index f3b094f..3032a73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+curl (7.74.0-1.2ubuntu2) impish; urgency=medium
+
+  * d/p/16_openldap-replace-ldap_-prefix-on-private-functions.patch:
+    Fix FTBFS with OpenLDAP 2.5.
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 19 May 2021 19:13:37 -0400
+
 curl (7.74.0-1.2ubuntu1) impish; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:
diff --git a/debian/patches/16_openldap-replace-ldap_-prefix-on-private-functions.patch b/debian/patches/16_openldap-replace-ldap_-prefix-on-private-functions.patch
 new file mode 100644
index 0000000..735b668
--- /dev/null
+++ b/debian/patches/16_openldap-replace-ldap_-prefix-on-private-functions.patch
@@ -0,0 +1,175 @@
+From: Daniel Stenberg <[e-mail]>
+Date: Tue, 4 May 2021 16:14:13 +0200
+Subject: openldap: replace ldap_ prefix on private functions
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Since openldap itself uses that prefix and with OpenĹDAP 2.5.4 (at
+least) there's a symbol collision because of that.
+
+The private functions now use the 'oldap_' prefix where it previously
+used 'ldap_'.
+
+Reported-by: 3eka on github
+Fixes #7004
+Closes #7005
+
+Origin: backport, https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19
+Bug: https://github.com/curl/curl/issues/7004
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+Last-Updated: 2021-05-13
+---
+ lib/openldap.c | 58 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/lib/openldap.c b/lib/openldap.c
+index 24892ff..32efe0e 100644
+--- a/lib/openldap.c
++++ b/lib/openldap.c
+@@ -76,14 +76,14 @@ extern int ldap_init_fd(ber_socket_t fd, int proto, const char *url,
+                         LDAP **ld);
+ #endif
+ 
+-static CURLcode ldap_setup_connection(struct connectdata *conn);
+-static CURLcode ldap_do(struct connectdata *conn, bool *done);
+-static CURLcode ldap_done(struct connectdata *conn, CURLcode, bool);
+-static CURLcode ldap_connect(struct connectdata *conn, bool *done);
+-static CURLcode ldap_connecting(struct connectdata *conn, bool *done);
+-static CURLcode ldap_disconnect(struct connectdata *conn, bool dead);
++static CURLcode oldap_setup_connection(struct connectdata *conn);
++static CURLcode oldap_do(struct connectdata *conn, bool *done);
++static CURLcode oldap_done(struct connectdata *conn, CURLcode, bool);
++static CURLcode oldap_connect(struct connectdata *conn, bool *done);
++static CURLcode oldap_connecting(struct connectdata *conn, bool *done);
++static CURLcode oldap_disconnect(struct connectdata *conn, bool dead);
+ 
+-static Curl_recv ldap_recv;
++static Curl_recv oldap_recv;
+ 
+ /*
+  * LDAP protocol handler.
+@@ -91,18 +91,18 @@ static Curl_recv ldap_recv;
+ 
+ const struct Curl_handler Curl_handler_ldap = {
+   "LDAP",                               /* scheme */
+-  ldap_setup_connection,                /* setup_connection */
+-  ldap_do,                              /* do_it */
+-  ldap_done,                            /* done */
++  oldap_setup_connection,               /* setup_connection */
++  oldap_do,                             /* do_it */
++  oldap_done,                           /* done */
+   ZERO_NULL,                            /* do_more */
+-  ldap_connect,                         /* connect_it */
+-  ldap_connecting,                      /* connecting */
++  oldap_connect,                        /* connect_it */
++  oldap_connecting,                     /* connecting */
+   ZERO_NULL,                            /* doing */
+   ZERO_NULL,                            /* proto_getsock */
+   ZERO_NULL,                            /* doing_getsock */
+   ZERO_NULL,                            /* domore_getsock */
+   ZERO_NULL,                            /* perform_getsock */
+-  ldap_disconnect,                      /* disconnect */
++  oldap_disconnect,                     /* disconnect */
+   ZERO_NULL,                            /* readwrite */
+   ZERO_NULL,                            /* connection_check */
+   PORT_LDAP,                            /* defport */
+@@ -118,18 +118,18 @@ const struct Curl_handler Curl_handler_ldap = {
+ 
+ const struct Curl_handler Curl_handler_ldaps = {
+   "LDAPS",                              /* scheme */
+-  ldap_setup_connection,                /* setup_connection */
+-  ldap_do,                              /* do_it */
+-  ldap_done,                            /* done */
++  oldap_setup_connection,               /* setup_connection */
++  oldap_do,                             /* do_it */
++  oldap_done,                           /* done */
+   ZERO_NULL,                            /* do_more */
+-  ldap_connect,                         /* connect_it */
+-  ldap_connecting,                      /* connecting */
++  oldap_connect,                        /* connect_it */
++  oldap_connecting,                     /* connecting */
+   ZERO_NULL,                            /* doing */
+   ZERO_NULL,                            /* proto_getsock */
+   ZERO_NULL,                            /* doing_getsock */
+   ZERO_NULL,                            /* domore_getsock */
+   ZERO_NULL,                            /* perform_getsock */
+-  ldap_disconnect,                      /* disconnect */
++  oldap_disconnect,                     /* disconnect */
+   ZERO_NULL,                            /* readwrite */
+   ZERO_NULL,                            /* connection_check */
+   PORT_LDAPS,                           /* defport */
+@@ -169,7 +169,7 @@ struct ldapreqinfo {
+   int nument;
+ };
+ 
+-static CURLcode ldap_setup_connection(struct connectdata *conn)
++static CURLcode oldap_setup_connection(struct connectdata *conn)
+ {
+   struct ldapconninfo *li;
+   LDAPURLDesc *lud;
+@@ -205,7 +205,7 @@ static CURLcode ldap_setup_connection(struct connectdata *conn)
+ static Sockbuf_IO ldapsb_tls;
+ #endif
+ 
+-static CURLcode ldap_connect(struct connectdata *conn, bool *done)
++static CURLcode oldap_connect(struct connectdata *conn, bool *done)
+ {
+   struct ldapconninfo *li = conn->proto.ldapc;
+   struct Curl_easy *data = conn->data;
+@@ -252,7 +252,7 @@ static CURLcode ldap_connect(struct connectdata *conn, bool *done)
+   return CURLE_OK;
+ }
+ 
+-static CURLcode ldap_connecting(struct connectdata *conn, bool *done)
++static CURLcode oldap_connecting(struct connectdata *conn, bool *done)
+ {
+   struct ldapconninfo *li = conn->proto.ldapc;
+   struct Curl_easy *data = conn->data;
+@@ -351,13 +351,13 @@ static CURLcode ldap_connecting(struct connectdata *conn, bool *done)
+ 
+   if(info)
+     ldap_memfree(info);
+-  conn->recv[FIRSTSOCKET] = ldap_recv;
++  conn->recv[FIRSTSOCKET] = oldap_recv;
+   *done = TRUE;
+ 
+   return CURLE_OK;
+ }
+ 
+-static CURLcode ldap_disconnect(struct connectdata *conn, bool dead_connection)
++static CURLcode oldap_disconnect(struct connectdata *conn, bool dead_connection)
+ {
+   struct ldapconninfo *li = conn->proto.ldapc;
+   (void) dead_connection;
+@@ -373,7 +373,7 @@ static CURLcode ldap_disconnect(struct connectdata *conn, bool dead_connection)
+   return CURLE_OK;
+ }
+ 
+-static CURLcode ldap_do(struct connectdata *conn, bool *done)
++static CURLcode oldap_do(struct connectdata *conn, bool *done)
+ {
+   struct ldapconninfo *li = conn->proto.ldapc;
+   struct ldapreqinfo *lr;
+@@ -418,8 +418,8 @@ static CURLcode ldap_do(struct connectdata *conn, bool *done)
+   return CURLE_OK;
+ }
+ 
+-static CURLcode ldap_done(struct connectdata *conn, CURLcode res,
+-                          bool premature)
++static CURLcode oldap_done(struct connectdata *conn, CURLcode res,
++                           bool premature)
+ {
+   struct ldapreqinfo *lr = conn->data->req.p.ldap;
+ 
+@@ -440,8 +440,8 @@ static CURLcode ldap_done(struct connectdata *conn, CURLcode res,
+   return CURLE_OK;
+ }
+ 
+-static ssize_t ldap_recv(struct connectdata *conn, int sockindex, char *buf,
+-                         size_t len, CURLcode *err)
++static ssize_t oldap_recv(struct connectdata *conn, int sockindex, char *buf,
++                          size_t len, CURLcode *err)
+ {
+   struct ldapconninfo *li = conn->proto.ldapc;
+   struct Curl_easy *data = conn->data;
diff --git a/debian/patches/series b/debian/patches/series
index 48fa80b..2b4a41c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@
 13_fix-man-formatting.patch
 14_transfer-strip-credentials-from-the-auto-referer-hea.patch
 15_vtls-add-isproxy-argument-to-Curl_ssl_get-addsession.patch
+16_openldap-replace-ldap_-prefix-on-private-functions.patch
 
 # do not add patches below
 90_gnutls.patch