diff -Nru curl-7.74.0/debian/changelog curl-7.74.0/debian/changelog --- curl-7.74.0/debian/changelog 2021-07-28 05:58:02.000000000 -0600 +++ curl-7.74.0/debian/changelog 2021-08-11 17:39:44.000000000 -0600 @@ -1,3 +1,33 @@ +curl (7.74.0-1.3ubuntu1) impish; urgency=low + + * Merge from Debian unstable. Remaining changes: + + SECURITY UPDATE: TELNET stack contents disclosure + - debian/patches/CVE-2021-22898.patch: check sscanf() for correct + number of matches in lib/telnet.c. + - CVE-2021-22898 + + SECURITY UPDATE: Bad connection reuse due to flawed path name checks + - debian/patches/CVE-2021-22924.patch: fix connection reuse checks for + issuer cert and case sensitivity in lib/url.c, lib/urldata.h, + lib/vtls/gtls.c, lib/vtls/nss.c, lib/vtls/openssl.c, lib/vtls/vtls.c. + - CVE-2021-22924 + + SECURITY UPDATE: TELNET stack contents disclosure again + - debian/patches/CVE-2021-22925.patch: fix option parser to not send + uninitialized contents in lib/telnet.c. + - CVE-2021-22925 + + d/p/openldap-replace-ldap_-prefix-on-private-functions.patch: + Fix FTBFS with OpenLDAP 2.5. Patch renamed to reduce likelihood of + numbering overlap in patches with Debian upstream. + + -- Dan Bungert Wed, 11 Aug 2021 17:39:44 -0600 + +curl (7.74.0-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream patch bc7ecc7 so curl -w times shown as seconds with + fractions (Closes: #989064) + + -- Paul Gevers Fri, 25 Jun 2021 20:59:54 +0200 + curl (7.74.0-1.2ubuntu4) impish; urgency=medium * SECURITY UPDATE: TELNET stack contents disclosure diff -Nru curl-7.74.0/debian/patches/14_transfer-strip-credentials-from-the-auto-referer-hea.patch curl-7.74.0/debian/patches/14_transfer-strip-credentials-from-the-auto-referer-hea.patch --- curl-7.74.0/debian/patches/14_transfer-strip-credentials-from-the-auto-referer-hea.patch 2021-05-19 17:11:55.000000000 -0600 +++ curl-7.74.0/debian/patches/14_transfer-strip-credentials-from-the-auto-referer-hea.patch 2021-08-02 12:44:03.000000000 -0600 @@ -86,11 +86,11 @@ +# Server-side + + -+HTTP/1.1 301 This is a weirdo text message swsclose -+Location: data/%TESTNUMBER0002.txt?coolsite=yes -+Content-Length: 62 -+Connection: close -+ ++HTTP/1.1 301 This is a weirdo text message swsclose ++Location: data/%TESTNUMBER0002.txt?coolsite=yes ++Content-Length: 62 ++Connection: close ++ +This server reply is for testing a simple Location: following + + @@ -114,26 +114,26 @@ +52 + + -+GET /we/want/our/%TESTNUMBER HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+Authorization: Basic dXNlcjpwYXNz -+User-Agent: curl/%VERSION -+Accept: */* -+ -+GET /we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+Authorization: Basic dXNlcjpwYXNz -+User-Agent: curl/%VERSION -+Accept: */* -+Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -+ ++GET /we/want/our/%TESTNUMBER HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic dXNlcjpwYXNz ++User-Agent: curl/%VERSION ++Accept: */* ++ ++GET /we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic dXNlcjpwYXNz ++User-Agent: curl/%VERSION ++Accept: */* ++Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER ++ + + -+HTTP/1.1 301 This is a weirdo text message swsclose -+Location: data/%TESTNUMBER0002.txt?coolsite=yes -+Content-Length: 62 -+Connection: close -+ ++HTTP/1.1 301 This is a weirdo text message swsclose ++Location: data/%TESTNUMBER0002.txt?coolsite=yes ++Content-Length: 62 ++Connection: close ++ +http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER + + diff -Nru curl-7.74.0/debian/patches/16_openldap-replace-ldap_-prefix-on-private-functions.patch curl-7.74.0/debian/patches/16_openldap-replace-ldap_-prefix-on-private-functions.patch --- curl-7.74.0/debian/patches/16_openldap-replace-ldap_-prefix-on-private-functions.patch 2021-05-19 17:12:49.000000000 -0600 +++ curl-7.74.0/debian/patches/16_openldap-replace-ldap_-prefix-on-private-functions.patch 1969-12-31 17:00:00.000000000 -0700 @@ -1,175 +0,0 @@ -From: Daniel Stenberg -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 -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 -Nru curl-7.74.0/debian/patches/fix-regression-microseconds-instead-of-seconds.patch curl-7.74.0/debian/patches/fix-regression-microseconds-instead-of-seconds.patch --- curl-7.74.0/debian/patches/fix-regression-microseconds-instead-of-seconds.patch 1969-12-31 17:00:00.000000000 -0700 +++ curl-7.74.0/debian/patches/fix-regression-microseconds-instead-of-seconds.patch 2021-06-25 12:59:54.000000000 -0600 @@ -0,0 +1,87 @@ +From bc7ecc71c0c11d22fdbe6415a7945bfc43dc3c33 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 15 Dec 2020 08:09:29 +0100 +Subject: [PATCH] =?UTF-8?q?too=C4=BA=5Fwriteout:=20fix=20the=20-w=20time?= + =?UTF-8?q?=20output=20units?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix regression from commit fc813f80e1bcac (#6248) that changed the unit +to microseconds instead of seconds with fractions + +Reported-by: 不确定 +Fixes #6321 +Closes #6322 +--- + src/tool_writeout.c | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) + +diff --git a/src/tool_writeout.c b/src/tool_writeout.c +index c12738c439aa..8b9f590053e5 100644 +--- a/src/tool_writeout.c ++++ b/src/tool_writeout.c +@@ -106,6 +106,14 @@ static const struct writeoutvar variables[] = { + 0, JSON_NONE} + }; + ++static void us2sec(FILE *stream, curl_off_t us) ++{ ++ curl_off_t secs = us / 1000000; ++ us %= 1000000; ++ fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU ".%06" CURL_FORMAT_CURL_OFF_TU, ++ secs, us); ++} ++ + void ourWriteOut(CURL *curl, struct per_transfer *per, const char *writeinfo) + { + FILE *stream = stdout; +@@ -190,41 +198,41 @@ void ourWriteOut(CURL *curl, struct per_transfer *per, const char *writeinfo) + case VAR_REDIRECT_TIME: + if(CURLE_OK == + curl_easy_getinfo(curl, CURLINFO_REDIRECT_TIME_T, &offinfo)) +- fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); ++ us2sec(stream, offinfo); + break; + case VAR_TOTAL_TIME: + if(CURLE_OK == + curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME_T, &offinfo)) +- fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); ++ us2sec(stream, offinfo); + break; + case VAR_NAMELOOKUP_TIME: + if(CURLE_OK == + curl_easy_getinfo(curl, CURLINFO_NAMELOOKUP_TIME_T, + &offinfo)) +- fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); ++ us2sec(stream, offinfo); + break; + case VAR_CONNECT_TIME: + if(CURLE_OK == + curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME_T, &offinfo)) +- fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); ++ us2sec(stream, offinfo); + break; + case VAR_APPCONNECT_TIME: + if(CURLE_OK == + curl_easy_getinfo(curl, CURLINFO_APPCONNECT_TIME_T, + &offinfo)) +- fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); ++ us2sec(stream, offinfo); + break; + case VAR_PRETRANSFER_TIME: + if(CURLE_OK == + curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME_T, + &offinfo)) +- fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); ++ us2sec(stream, offinfo); + break; + case VAR_STARTTRANSFER_TIME: + if(CURLE_OK == + curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME_T, + &offinfo)) +- fprintf(stream, "%" CURL_FORMAT_CURL_OFF_TU, offinfo); ++ us2sec(stream, offinfo); + break; + case VAR_SIZE_UPLOAD: + if(CURLE_OK == diff -Nru curl-7.74.0/debian/patches/openldap-replace-ldap_-prefix-on-private-functions.patch curl-7.74.0/debian/patches/openldap-replace-ldap_-prefix-on-private-functions.patch --- curl-7.74.0/debian/patches/openldap-replace-ldap_-prefix-on-private-functions.patch 1969-12-31 17:00:00.000000000 -0700 +++ curl-7.74.0/debian/patches/openldap-replace-ldap_-prefix-on-private-functions.patch 2021-05-19 17:12:49.000000000 -0600 @@ -0,0 +1,175 @@ +From: Daniel Stenberg +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 +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 -Nru curl-7.74.0/debian/patches/series curl-7.74.0/debian/patches/series --- curl-7.74.0/debian/patches/series 2021-07-28 05:58:02.000000000 -0600 +++ curl-7.74.0/debian/patches/series 2021-08-11 17:38:13.000000000 -0600 @@ -7,7 +7,8 @@ 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 +fix-regression-microseconds-instead-of-seconds.patch +openldap-replace-ldap_-prefix-on-private-functions.patch CVE-2021-22898.patch CVE-2021-22924.patch CVE-2021-22925.patch