diff --git a/.gitignore b/.gitignore index d7bfa33..9bb4285 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ +/curl-[0-9.]*.tar.lzma +/curl-[0-9.]*.tar.lzma.asc /curl-[0-9.]*.tar.xz /curl-[0-9.]*.tar.xz.asc +/curl-[0-9]*.[0-9]*.[0-9]*/ +/*.src.rpm diff --git a/0001-curl-8.0.1-CVE-2023-28322.patch b/0001-curl-8.0.1-CVE-2023-28322.patch deleted file mode 100644 index 133ef63..0000000 --- a/0001-curl-8.0.1-CVE-2023-28322.patch +++ /dev/null @@ -1,437 +0,0 @@ -From 074adec63f0dd7a8f0d823ee503dfb0626061505 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Tue, 25 Apr 2023 08:28:01 +0200 -Subject: [PATCH] lib: unify the upload/method handling - -By making sure we set state.upload based on the set.method value and not -independently as set.upload, we reduce confusion and mixup risks, both -internally and externally. - -Closes #11017 - -(cherry picked from commit 7815647d6582c0a4900be2e1de6c5e61272c496b) -Signed-off-by: Jan Macku ---- - lib/curl_rtmp.c | 4 ++-- - lib/file.c | 4 ++-- - lib/ftp.c | 8 ++++---- - lib/http.c | 4 ++-- - lib/imap.c | 6 +++--- - lib/rtsp.c | 4 ++-- - lib/setopt.c | 6 ++---- - lib/smb.c | 6 +++--- - lib/smtp.c | 4 ++-- - lib/tftp.c | 8 ++++---- - lib/transfer.c | 4 ++-- - lib/urldata.h | 2 +- - lib/vssh/libssh.c | 6 +++--- - lib/vssh/libssh2.c | 6 +++--- - lib/vssh/wolfssh.c | 2 +- - 15 files changed, 36 insertions(+), 38 deletions(-) - -diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c -index 2679a2cdc..406fb42ac 100644 ---- a/lib/curl_rtmp.c -+++ b/lib/curl_rtmp.c -@@ -231,7 +231,7 @@ static CURLcode rtmp_connect(struct Curl_easy *data, bool *done) - /* We have to know if it's a write before we send the - * connect request packet - */ -- if(data->set.upload) -+ if(data->state.upload) - r->Link.protocol |= RTMP_FEATURE_WRITE; - - /* For plain streams, use the buffer toggle trick to keep data flowing */ -@@ -263,7 +263,7 @@ static CURLcode rtmp_do(struct Curl_easy *data, bool *done) - if(!RTMP_ConnectStream(r, 0)) - return CURLE_FAILED_INIT; - -- if(data->set.upload) { -+ if(data->state.upload) { - Curl_pgrsSetUploadSize(data, data->state.infilesize); - Curl_setup_transfer(data, -1, -1, FALSE, FIRSTSOCKET); - } -diff --git a/lib/file.c b/lib/file.c -index 51c5d07ce..c751e8861 100644 ---- a/lib/file.c -+++ b/lib/file.c -@@ -240,7 +240,7 @@ static CURLcode file_connect(struct Curl_easy *data, bool *done) - file->freepath = real_path; /* free this when done */ - - file->fd = fd; -- if(!data->set.upload && (fd == -1)) { -+ if(!data->state.upload && (fd == -1)) { - failf(data, "Couldn't open file %s", data->state.up.path); - file_done(data, CURLE_FILE_COULDNT_READ_FILE, FALSE); - return CURLE_FILE_COULDNT_READ_FILE; -@@ -422,7 +422,7 @@ static CURLcode file_do(struct Curl_easy *data, bool *done) - - Curl_pgrsStartNow(data); - -- if(data->set.upload) -+ if(data->state.upload) - return file_upload(data); - - file = data->req.p.file; -diff --git a/lib/ftp.c b/lib/ftp.c -index caf33d214..0b6e5cd4f 100644 ---- a/lib/ftp.c -+++ b/lib/ftp.c -@@ -1350,7 +1350,7 @@ static CURLcode ftp_state_prepare_transfer(struct Curl_easy *data) - data->set.str[STRING_CUSTOMREQUEST]? - data->set.str[STRING_CUSTOMREQUEST]: - (data->state.list_only?"NLST":"LIST")); -- else if(data->set.upload) -+ else if(data->state.upload) - result = Curl_pp_sendf(data, &ftpc->pp, "PRET STOR %s", - conn->proto.ftpc.file); - else -@@ -3386,7 +3386,7 @@ static CURLcode ftp_done(struct Curl_easy *data, CURLcode status, - /* the response code from the transfer showed an error already so no - use checking further */ - ; -- else if(data->set.upload) { -+ else if(data->state.upload) { - if((-1 != data->state.infilesize) && - (data->state.infilesize != data->req.writebytecount) && - !data->set.crlf && -@@ -3642,7 +3642,7 @@ static CURLcode ftp_do_more(struct Curl_easy *data, int *completep) - connected back to us */ - } - } -- else if(data->set.upload) { -+ else if(data->state.upload) { - result = ftp_nb_type(data, conn, data->state.prefer_ascii, - FTP_STOR_TYPE); - if(result) -@@ -4231,7 +4231,7 @@ CURLcode ftp_parse_url_path(struct Curl_easy *data) - ftpc->file = NULL; /* instead of point to a zero byte, - we make it a NULL pointer */ - -- if(data->set.upload && !ftpc->file && (ftp->transfer == PPTRANSFER_BODY)) { -+ if(data->state.upload && !ftpc->file && (ftp->transfer == PPTRANSFER_BODY)) { - /* We need a file name when uploading. Return error! */ - failf(data, "Uploading to a URL without a file name"); - free(rawPath); -diff --git a/lib/http.c b/lib/http.c -index faa486cc6..400d2b081 100644 ---- a/lib/http.c -+++ b/lib/http.c -@@ -1960,7 +1960,7 @@ void Curl_http_method(struct Curl_easy *data, struct connectdata *conn, - Curl_HttpReq httpreq = (Curl_HttpReq)data->state.httpreq; - const char *request; - if((conn->handler->protocol&(PROTO_FAMILY_HTTP|CURLPROTO_FTP)) && -- data->set.upload) -+ data->state.upload) - httpreq = HTTPREQ_PUT; - - /* Now set the 'request' pointer to the proper request string */ -@@ -2277,7 +2277,7 @@ CURLcode Curl_http_body(struct Curl_easy *data, struct connectdata *conn, - if((conn->handler->protocol & PROTO_FAMILY_HTTP) && - (((httpreq == HTTPREQ_POST_MIME || httpreq == HTTPREQ_POST_FORM) && - http->postsize < 0) || -- ((data->set.upload || httpreq == HTTPREQ_POST) && -+ ((data->state.upload || httpreq == HTTPREQ_POST) && - data->state.infilesize == -1))) { - if(conn->bits.authneg) - /* don't enable chunked during auth neg */ -diff --git a/lib/imap.c b/lib/imap.c -index c2f675d4b..1952e66a1 100644 ---- a/lib/imap.c -+++ b/lib/imap.c -@@ -1511,11 +1511,11 @@ static CURLcode imap_done(struct Curl_easy *data, CURLcode status, - result = status; /* use the already set error code */ - } - else if(!data->set.connect_only && !imap->custom && -- (imap->uid || imap->mindex || data->set.upload || -+ (imap->uid || imap->mindex || data->state.upload || - data->set.mimepost.kind != MIMEKIND_NONE)) { - /* Handle responses after FETCH or APPEND transfer has finished */ - -- if(!data->set.upload && data->set.mimepost.kind == MIMEKIND_NONE) -+ if(!data->state.upload && data->set.mimepost.kind == MIMEKIND_NONE) - state(data, IMAP_FETCH_FINAL); - else { - /* End the APPEND command first by sending an empty line */ -@@ -1581,7 +1581,7 @@ static CURLcode imap_perform(struct Curl_easy *data, bool *connected, - selected = TRUE; - - /* Start the first command in the DO phase */ -- if(data->set.upload || data->set.mimepost.kind != MIMEKIND_NONE) -+ if(data->state.upload || data->set.mimepost.kind != MIMEKIND_NONE) - /* APPEND can be executed directly */ - result = imap_perform_append(data); - else if(imap->custom && (selected || !imap->mailbox)) -diff --git a/lib/rtsp.c b/lib/rtsp.c -index aef3560a9..6df3706b5 100644 ---- a/lib/rtsp.c -+++ b/lib/rtsp.c -@@ -495,7 +495,7 @@ static CURLcode rtsp_do(struct Curl_easy *data, bool *done) - rtspreq == RTSPREQ_SET_PARAMETER || - rtspreq == RTSPREQ_GET_PARAMETER) { - -- if(data->set.upload) { -+ if(data->state.upload) { - putsize = data->state.infilesize; - data->state.httpreq = HTTPREQ_PUT; - -@@ -514,7 +514,7 @@ static CURLcode rtsp_do(struct Curl_easy *data, bool *done) - result = - Curl_dyn_addf(&req_buffer, - "Content-Length: %" CURL_FORMAT_CURL_OFF_T"\r\n", -- (data->set.upload ? putsize : postsize)); -+ (data->state.upload ? putsize : postsize)); - if(result) - return result; - } -diff --git a/lib/setopt.c b/lib/setopt.c -index 6bb88791c..2cbaf898a 100644 ---- a/lib/setopt.c -+++ b/lib/setopt.c -@@ -329,8 +329,8 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) - * We want to sent data to the remote host. If this is HTTP, that equals - * using the PUT request. - */ -- data->set.upload = (0 != va_arg(param, long)) ? TRUE : FALSE; -- if(data->set.upload) { -+ arg = va_arg(param, long); -+ if(arg) { - /* If this is HTTP, PUT is what's needed to "upload" */ - data->set.method = HTTPREQ_PUT; - data->set.opt_no_body = FALSE; /* this is implied */ -@@ -660,7 +660,6 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) - } - else - data->set.method = HTTPREQ_GET; -- data->set.upload = FALSE; - break; - - #ifndef CURL_DISABLE_MIME -@@ -884,7 +883,6 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) - */ - if(va_arg(param, long)) { - data->set.method = HTTPREQ_GET; -- data->set.upload = FALSE; /* switch off upload */ - data->set.opt_no_body = FALSE; /* this is implied */ - } - break; -diff --git a/lib/smb.c b/lib/smb.c -index 076200472..2baf764fa 100644 ---- a/lib/smb.c -+++ b/lib/smb.c -@@ -530,7 +530,7 @@ static CURLcode smb_send_open(struct Curl_easy *data) - byte_count = strlen(req->path); - msg.name_length = smb_swap16((unsigned short)byte_count); - msg.share_access = smb_swap32(SMB_FILE_SHARE_ALL); -- if(data->set.upload) { -+ if(data->state.upload) { - msg.access = smb_swap32(SMB_GENERIC_READ | SMB_GENERIC_WRITE); - msg.create_disposition = smb_swap32(SMB_FILE_OVERWRITE_IF); - } -@@ -762,7 +762,7 @@ static CURLcode smb_request_state(struct Curl_easy *data, bool *done) - void *msg = NULL; - const struct smb_nt_create_response *smb_m; - -- if(data->set.upload && (data->state.infilesize < 0)) { -+ if(data->state.upload && (data->state.infilesize < 0)) { - failf(data, "SMB upload needs to know the size up front"); - return CURLE_SEND_ERROR; - } -@@ -813,7 +813,7 @@ static CURLcode smb_request_state(struct Curl_easy *data, bool *done) - smb_m = (const struct smb_nt_create_response*) msg; - req->fid = smb_swap16(smb_m->fid); - data->req.offset = 0; -- if(data->set.upload) { -+ if(data->state.upload) { - data->req.size = data->state.infilesize; - Curl_pgrsSetUploadSize(data, data->req.size); - next_state = SMB_UPLOAD; -diff --git a/lib/smtp.c b/lib/smtp.c -index 7a030308d..c182cace7 100644 ---- a/lib/smtp.c -+++ b/lib/smtp.c -@@ -1419,7 +1419,7 @@ static CURLcode smtp_done(struct Curl_easy *data, CURLcode status, - result = status; /* use the already set error code */ - } - else if(!data->set.connect_only && data->set.mail_rcpt && -- (data->set.upload || data->set.mimepost.kind)) { -+ (data->state.upload || data->set.mimepost.kind)) { - /* Calculate the EOB taking into account any terminating CRLF from the - previous line of the email or the CRLF of the DATA command when there - is "no mail data". RFC-5321, sect. 4.1.1.4. -@@ -1511,7 +1511,7 @@ static CURLcode smtp_perform(struct Curl_easy *data, bool *connected, - smtp->eob = 2; - - /* Start the first command in the DO phase */ -- if((data->set.upload || data->set.mimepost.kind) && data->set.mail_rcpt) -+ if((data->state.upload || data->set.mimepost.kind) && data->set.mail_rcpt) - /* MAIL transfer */ - result = smtp_perform_mail(data); - else -diff --git a/lib/tftp.c b/lib/tftp.c -index 164d3c723..8ed1b887b 100644 ---- a/lib/tftp.c -+++ b/lib/tftp.c -@@ -370,7 +370,7 @@ static CURLcode tftp_parse_option_ack(struct tftp_state_data *state, - - /* tsize should be ignored on upload: Who cares about the size of the - remote file? */ -- if(!data->set.upload) { -+ if(!data->state.upload) { - if(!tsize) { - failf(data, "invalid tsize -:%s:- value in OACK packet", value); - return CURLE_TFTP_ILLEGAL; -@@ -451,7 +451,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state, - return result; - } - -- if(data->set.upload) { -+ if(data->state.upload) { - /* If we are uploading, send an WRQ */ - setpacketevent(&state->spacket, TFTP_EVENT_WRQ); - state->data->req.upload_fromhere = -@@ -486,7 +486,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state, - if(!data->set.tftp_no_options) { - char buf[64]; - /* add tsize option */ -- if(data->set.upload && (data->state.infilesize != -1)) -+ if(data->state.upload && (data->state.infilesize != -1)) - msnprintf(buf, sizeof(buf), "%" CURL_FORMAT_CURL_OFF_T, - data->state.infilesize); - else -@@ -540,7 +540,7 @@ static CURLcode tftp_send_first(struct tftp_state_data *state, - break; - - case TFTP_EVENT_OACK: -- if(data->set.upload) { -+ if(data->state.upload) { - result = tftp_connect_for_tx(state, event); - } - else { -diff --git a/lib/transfer.c b/lib/transfer.c -index a28395233..85910455c 100644 ---- a/lib/transfer.c -+++ b/lib/transfer.c -@@ -1294,6 +1294,7 @@ void Curl_init_CONNECT(struct Curl_easy *data) - { - data->state.fread_func = data->set.fread_func_set; - data->state.in = data->set.in_set; -+ data->state.upload = (data->state.httpreq == HTTPREQ_PUT); - } - - /* -@@ -1728,7 +1729,6 @@ CURLcode Curl_follow(struct Curl_easy *data, - data->state.httpreq != HTTPREQ_POST_MIME) || - !(data->set.keep_post & CURL_REDIR_POST_303))) { - data->state.httpreq = HTTPREQ_GET; -- data->set.upload = false; - infof(data, "Switch to %s", - data->req.no_body?"HEAD":"GET"); - } -@@ -1766,7 +1766,7 @@ CURLcode Curl_retry_request(struct Curl_easy *data, char **url) - - /* if we're talking upload, we can't do the checks below, unless the protocol - is HTTP as when uploading over HTTP we will still get a response */ -- if(data->set.upload && -+ if(data->state.upload && - !(conn->handler->protocol&(PROTO_FAMILY_HTTP|CURLPROTO_RTSP))) - return CURLE_OK; - -diff --git a/lib/urldata.h b/lib/urldata.h -index 8b54518d2..f3e782ad3 100644 ---- a/lib/urldata.h -+++ b/lib/urldata.h -@@ -1446,6 +1446,7 @@ struct UrlState { - BIT(rewindbeforesend);/* TRUE when the sending couldn't be stopped even - though it will be discarded. We must call the data - rewind callback before trying to send again. */ -+ BIT(upload); /* upload request */ - }; - - /* -@@ -1822,7 +1823,6 @@ struct UserDefined { - BIT(http_auto_referer); /* set "correct" referer when following - location: */ - BIT(opt_no_body); /* as set with CURLOPT_NOBODY */ -- BIT(upload); /* upload request */ - BIT(verbose); /* output verbosity */ - BIT(krb); /* Kerberos connection requested */ - BIT(reuse_forbid); /* forbidden to be reused, close after use */ -diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c -index b31f741ba..d60edaa30 100644 ---- a/lib/vssh/libssh.c -+++ b/lib/vssh/libssh.c -@@ -1209,7 +1209,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block) - } - - case SSH_SFTP_TRANS_INIT: -- if(data->set.upload) -+ if(data->state.upload) - state(data, SSH_SFTP_UPLOAD_INIT); - else { - if(protop->path[strlen(protop->path)-1] == '/') -@@ -1802,7 +1802,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block) - /* Functions from the SCP subsystem cannot handle/return SSH_AGAIN */ - ssh_set_blocking(sshc->ssh_session, 1); - -- if(data->set.upload) { -+ if(data->state.upload) { - if(data->state.infilesize < 0) { - failf(data, "SCP requires a known file size for upload"); - sshc->actualcode = CURLE_UPLOAD_FAILED; -@@ -1907,7 +1907,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block) - break; - } - case SSH_SCP_DONE: -- if(data->set.upload) -+ if(data->state.upload) - state(data, SSH_SCP_SEND_EOF); - else - state(data, SSH_SCP_CHANNEL_FREE); -diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c -index f1154dc47..f2e5352d1 100644 ---- a/lib/vssh/libssh2.c -+++ b/lib/vssh/libssh2.c -@@ -2019,7 +2019,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) - } - - case SSH_SFTP_TRANS_INIT: -- if(data->set.upload) -+ if(data->state.upload) - state(data, SSH_SFTP_UPLOAD_INIT); - else { - if(sshp->path[strlen(sshp->path)-1] == '/') -@@ -2691,7 +2691,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) - break; - } - -- if(data->set.upload) { -+ if(data->state.upload) { - if(data->state.infilesize < 0) { - failf(data, "SCP requires a known file size for upload"); - sshc->actualcode = CURLE_UPLOAD_FAILED; -@@ -2831,7 +2831,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block) - break; - - case SSH_SCP_DONE: -- if(data->set.upload) -+ if(data->state.upload) - state(data, SSH_SCP_SEND_EOF); - else - state(data, SSH_SCP_CHANNEL_FREE); -diff --git a/lib/vssh/wolfssh.c b/lib/vssh/wolfssh.c -index 17d59ecd2..2ca91b736 100644 ---- a/lib/vssh/wolfssh.c -+++ b/lib/vssh/wolfssh.c -@@ -557,7 +557,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block) - } - break; - case SSH_SFTP_TRANS_INIT: -- if(data->set.upload) -+ if(data->state.upload) - state(data, SSH_SFTP_UPLOAD_INIT); - else { - if(sftp_scp->path[strlen(sftp_scp->path)-1] == '/') --- -2.40.1 - diff --git a/0002-curl-8.0.1-CVE-2023-28321.patch b/0002-curl-8.0.1-CVE-2023-28321.patch deleted file mode 100644 index a69fdbd..0000000 --- a/0002-curl-8.0.1-CVE-2023-28321.patch +++ /dev/null @@ -1,498 +0,0 @@ -From 9cfc8e3107920116ac31ab1fbf6439d38ab2f30e Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Mon, 24 Apr 2023 21:07:02 +0200 -Subject: [PATCH] hostcheck: fix host name wildcard checking - -The leftmost "label" of the host name can now only match against single -'*'. Like the browsers have worked for a long time. - -- extended unit test 1397 for this -- move some SOURCE variables from unit/Makefile.am to unit/Makefile.inc - -Reported-by: Hiroki Kurosawa -Closes #11018 - -(cherry picked from commit 199f2d440d8659b42670c1b796220792b01a97bf) -Signed-off-by: Jan Macku ---- - lib/vtls/hostcheck.c | 50 +++++++-------- - tests/data/test1397 | 10 ++- - tests/unit/Makefile.am | 88 -------------------------- - tests/unit/Makefile.inc | 94 ++++++++++++++++++++++++++++ - tests/unit/unit1397.c | 134 ++++++++++++++++++++++++---------------- - 5 files changed, 202 insertions(+), 174 deletions(-) - -diff --git a/lib/vtls/hostcheck.c b/lib/vtls/hostcheck.c -index e827dc58f..d061c6356 100644 ---- a/lib/vtls/hostcheck.c -+++ b/lib/vtls/hostcheck.c -@@ -71,7 +71,12 @@ static bool pmatch(const char *hostname, size_t hostlen, - * apparent distinction between a name and an IP. We need to detect the use of - * an IP address and not wildcard match on such names. - * -+ * Only match on "*" being used for the leftmost label, not "a*", "a*b" nor -+ * "*b". -+ * - * Return TRUE on a match. FALSE if not. -+ * -+ * @unittest: 1397 - */ - - static bool hostmatch(const char *hostname, -@@ -79,53 +84,42 @@ static bool hostmatch(const char *hostname, - const char *pattern, - size_t patternlen) - { -- const char *pattern_label_end, *wildcard, *hostname_label_end; -- size_t prefixlen, suffixlen; -+ const char *pattern_label_end; - -- /* normalize pattern and hostname by stripping off trailing dots */ -+ DEBUGASSERT(pattern); - DEBUGASSERT(patternlen); -+ DEBUGASSERT(hostname); -+ DEBUGASSERT(hostlen); -+ -+ /* normalize pattern and hostname by stripping off trailing dots */ - if(hostname[hostlen-1]=='.') - hostlen--; - if(pattern[patternlen-1]=='.') - patternlen--; - -- wildcard = memchr(pattern, '*', patternlen); -- if(!wildcard) -+ if(strncmp(pattern, "*.", 2)) - return pmatch(hostname, hostlen, pattern, patternlen); - - /* detect IP address as hostname and fail the match if so */ -- if(Curl_host_is_ipnum(hostname)) -+ else if(Curl_host_is_ipnum(hostname)) - return FALSE; - - /* We require at least 2 dots in the pattern to avoid too wide wildcard - match. */ - pattern_label_end = memchr(pattern, '.', patternlen); - if(!pattern_label_end || -- (memrchr(pattern, '.', patternlen) == pattern_label_end) || -- strncasecompare(pattern, "xn--", 4)) -+ (memrchr(pattern, '.', patternlen) == pattern_label_end)) - return pmatch(hostname, hostlen, pattern, patternlen); -- -- hostname_label_end = memchr(hostname, '.', hostlen); -- if(!hostname_label_end) -- return FALSE; - else { -- size_t skiphost = hostname_label_end - hostname; -- size_t skiplen = pattern_label_end - pattern; -- if(!pmatch(hostname_label_end, hostlen - skiphost, -- pattern_label_end, patternlen - skiplen)) -- return FALSE; -+ const char *hostname_label_end = memchr(hostname, '.', hostlen); -+ if(hostname_label_end) { -+ size_t skiphost = hostname_label_end - hostname; -+ size_t skiplen = pattern_label_end - pattern; -+ return pmatch(hostname_label_end, hostlen - skiphost, -+ pattern_label_end, patternlen - skiplen); -+ } - } -- /* The wildcard must match at least one character, so the left-most -- label of the hostname is at least as large as the left-most label -- of the pattern. */ -- if(hostname_label_end - hostname < pattern_label_end - pattern) -- return FALSE; -- -- prefixlen = wildcard - pattern; -- suffixlen = pattern_label_end - (wildcard + 1); -- return strncasecompare(pattern, hostname, prefixlen) && -- strncasecompare(wildcard + 1, hostname_label_end - suffixlen, -- suffixlen) ? TRUE : FALSE; -+ return FALSE; - } - - /* -diff --git a/tests/data/test1397 b/tests/data/test1397 -index 84f962abe..f31b2c2a3 100644 ---- a/tests/data/test1397 -+++ b/tests/data/test1397 -@@ -2,8 +2,7 @@ - - - unittest --ssl --wildcard -+Curl_cert_hostcheck - - - -@@ -16,9 +15,8 @@ none - - unittest - -- --Check wildcard certificate matching function Curl_cert_hostcheck -- -+ -+Curl_cert_hostcheck unit tests -+ - -- - -diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am -index 4f64ff596..e7a6aa452 100644 ---- a/tests/unit/Makefile.am -+++ b/tests/unit/Makefile.am -@@ -67,91 +67,3 @@ noinst_PROGRAMS = $(UNITPROGS) - else - noinst_PROGRAMS = - endif -- --unit1300_SOURCES = unit1300.c $(UNITFILES) -- --unit1302_SOURCES = unit1302.c $(UNITFILES) -- --unit1303_SOURCES = unit1303.c $(UNITFILES) -- --unit1304_SOURCES = unit1304.c $(UNITFILES) -- --unit1305_SOURCES = unit1305.c $(UNITFILES) -- --unit1307_SOURCES = unit1307.c $(UNITFILES) -- --unit1308_SOURCES = unit1308.c $(UNITFILES) -- --unit1309_SOURCES = unit1309.c $(UNITFILES) -- --unit1323_SOURCES = unit1323.c $(UNITFILES) -- --unit1330_SOURCES = unit1330.c $(UNITFILES) -- --unit1394_SOURCES = unit1394.c $(UNITFILES) --unit1394_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ --unit1394_LDFLAGS = $(top_builddir)/src/libcurltool.la --unit1394_LIBS = -- --unit1395_SOURCES = unit1395.c $(UNITFILES) -- --unit1396_SOURCES = unit1396.c $(UNITFILES) -- --unit1397_SOURCES = unit1397.c $(UNITFILES) -- --unit1398_SOURCES = unit1398.c $(UNITFILES) -- --unit1399_SOURCES = unit1399.c $(UNITFILES) -- --unit1600_SOURCES = unit1600.c $(UNITFILES) -- --unit1601_SOURCES = unit1601.c $(UNITFILES) -- --unit1602_SOURCES = unit1602.c $(UNITFILES) -- --unit1603_SOURCES = unit1603.c $(UNITFILES) -- --unit1604_SOURCES = unit1604.c $(UNITFILES) -- --unit1605_SOURCES = unit1605.c $(UNITFILES) -- --unit1606_SOURCES = unit1606.c $(UNITFILES) -- --unit1607_SOURCES = unit1607.c $(UNITFILES) -- --unit1608_SOURCES = unit1608.c $(UNITFILES) -- --unit1609_SOURCES = unit1609.c $(UNITFILES) -- --unit1610_SOURCES = unit1610.c $(UNITFILES) -- --unit1611_SOURCES = unit1611.c $(UNITFILES) -- --unit1612_SOURCES = unit1612.c $(UNITFILES) -- --unit1614_SOURCES = unit1614.c $(UNITFILES) -- --unit1620_SOURCES = unit1620.c $(UNITFILES) -- --unit1621_SOURCES = unit1621.c $(UNITFILES) --unit1621_LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libcurl.la @NSS_LIBS@ -- --unit1650_SOURCES = unit1650.c $(UNITFILES) -- --unit1651_SOURCES = unit1651.c $(UNITFILES) -- --unit1652_SOURCES = unit1652.c $(UNITFILES) -- --unit1653_SOURCES = unit1653.c $(UNITFILES) -- --unit1654_SOURCES = unit1654.c $(UNITFILES) -- --unit1655_SOURCES = unit1655.c $(UNITFILES) -- --unit1660_SOURCES = unit1660.c $(UNITFILES) -- --unit1661_SOURCES = unit1661.c $(UNITFILES) -- --unit2600_SOURCES = unit2600.c $(UNITFILES) -- --unit3200_SOURCES = unit3200.c $(UNITFILES) -diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc -index 4ab15b5db..20a9963d1 100644 ---- a/tests/unit/Makefile.inc -+++ b/tests/unit/Makefile.inc -@@ -40,3 +40,97 @@ UNITPROGS = unit1300 unit1302 unit1303 unit1304 unit1305 unit1307 \ - unit1660 unit1661 \ - unit2600 \ - unit3200 -+ -+unit1300_SOURCES = unit1300.c $(UNITFILES) -+ -+unit1302_SOURCES = unit1302.c $(UNITFILES) -+ -+unit1303_SOURCES = unit1303.c $(UNITFILES) -+ -+unit1304_SOURCES = unit1304.c $(UNITFILES) -+ -+unit1305_SOURCES = unit1305.c $(UNITFILES) -+ -+unit1307_SOURCES = unit1307.c $(UNITFILES) -+ -+unit1308_SOURCES = unit1308.c $(UNITFILES) -+ -+unit1309_SOURCES = unit1309.c $(UNITFILES) -+ -+unit1323_SOURCES = unit1323.c $(UNITFILES) -+ -+unit1330_SOURCES = unit1330.c $(UNITFILES) -+ -+unit1394_SOURCES = unit1394.c $(UNITFILES) -+unit1394_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ -+unit1394_LDFLAGS = $(top_builddir)/src/libcurltool.la -+unit1394_LIBS = -+ -+unit1395_SOURCES = unit1395.c $(UNITFILES) -+ -+unit1396_SOURCES = unit1396.c $(UNITFILES) -+ -+unit1397_SOURCES = unit1397.c $(UNITFILES) -+ -+unit1398_SOURCES = unit1398.c $(UNITFILES) -+ -+unit1399_SOURCES = unit1399.c $(UNITFILES) -+ -+unit1600_SOURCES = unit1600.c $(UNITFILES) -+ -+unit1601_SOURCES = unit1601.c $(UNITFILES) -+ -+unit1602_SOURCES = unit1602.c $(UNITFILES) -+ -+unit1603_SOURCES = unit1603.c $(UNITFILES) -+ -+unit1604_SOURCES = unit1604.c $(UNITFILES) -+ -+unit1605_SOURCES = unit1605.c $(UNITFILES) -+ -+unit1606_SOURCES = unit1606.c $(UNITFILES) -+ -+unit1607_SOURCES = unit1607.c $(UNITFILES) -+ -+unit1608_SOURCES = unit1608.c $(UNITFILES) -+ -+unit1609_SOURCES = unit1609.c $(UNITFILES) -+ -+unit1610_SOURCES = unit1610.c $(UNITFILES) -+ -+unit1611_SOURCES = unit1611.c $(UNITFILES) -+ -+unit1612_SOURCES = unit1612.c $(UNITFILES) -+ -+unit1614_SOURCES = unit1614.c $(UNITFILES) -+ -+unit1620_SOURCES = unit1620.c $(UNITFILES) -+ -+unit1621_SOURCES = unit1621.c $(UNITFILES) -+unit1621_LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libcurl.la @NSS_LIBS@ -+ -+unit1650_SOURCES = unit1650.c $(UNITFILES) -+ -+unit1651_SOURCES = unit1651.c $(UNITFILES) -+ -+unit1652_SOURCES = unit1652.c $(UNITFILES) -+ -+unit1653_SOURCES = unit1653.c $(UNITFILES) -+ -+unit1654_SOURCES = unit1654.c $(UNITFILES) -+ -+unit1655_SOURCES = unit1655.c $(UNITFILES) -+ -+unit1660_SOURCES = unit1660.c $(UNITFILES) -+ -+unit1661_SOURCES = unit1661.c $(UNITFILES) -+ -+unit2600_SOURCES = unit2600.c $(UNITFILES) -+ -+unit2601_SOURCES = unit2601.c $(UNITFILES) -+ -+unit2602_SOURCES = unit2602.c $(UNITFILES) -+ -+unit2603_SOURCES = unit2603.c $(UNITFILES) -+ -+unit3200_SOURCES = unit3200.c $(UNITFILES) -diff --git a/tests/unit/unit1397.c b/tests/unit/unit1397.c -index 2f3d3aa4d..3ae75618d 100644 ---- a/tests/unit/unit1397.c -+++ b/tests/unit/unit1397.c -@@ -23,7 +23,6 @@ - ***************************************************************************/ - #include "curlcheck.h" - --#include "vtls/hostcheck.h" /* from the lib dir */ - - static CURLcode unit_setup(void) - { -@@ -32,63 +31,94 @@ static CURLcode unit_setup(void) - - static void unit_stop(void) - { -- /* done before shutting down and exiting */ - } - --UNITTEST_START -- - /* only these backends define the tested functions */ --#if defined(USE_OPENSSL) || defined(USE_GSKIT) -- -- /* here you start doing things and checking that the results are good */ -+#if defined(USE_OPENSSL) || defined(USE_GSKIT) || defined(USE_SCHANNEL) -+#include "vtls/hostcheck.h" -+struct testcase { -+ const char *host; -+ const char *pattern; -+ bool match; -+}; - --fail_unless(Curl_cert_hostcheck(STRCONST("www.example.com"), -- STRCONST("www.example.com")), "good 1"); --fail_unless(Curl_cert_hostcheck(STRCONST("*.example.com"), -- STRCONST("www.example.com")), -- "good 2"); --fail_unless(Curl_cert_hostcheck(STRCONST("xxx*.example.com"), -- STRCONST("xxxwww.example.com")), "good 3"); --fail_unless(Curl_cert_hostcheck(STRCONST("f*.example.com"), -- STRCONST("foo.example.com")), "good 4"); --fail_unless(Curl_cert_hostcheck(STRCONST("192.168.0.0"), -- STRCONST("192.168.0.0")), "good 5"); -+static struct testcase tests[] = { -+ {"", "", FALSE}, -+ {"a", "", FALSE}, -+ {"", "b", FALSE}, -+ {"a", "b", FALSE}, -+ {"aa", "bb", FALSE}, -+ {"\xff", "\xff", TRUE}, -+ {"aa.aa.aa", "aa.aa.bb", FALSE}, -+ {"aa.aa.aa", "aa.aa.aa", TRUE}, -+ {"aa.aa.aa", "*.aa.bb", FALSE}, -+ {"aa.aa.aa", "*.aa.aa", TRUE}, -+ {"192.168.0.1", "192.168.0.1", TRUE}, -+ {"192.168.0.1", "*.168.0.1", FALSE}, -+ {"192.168.0.1", "*.0.1", FALSE}, -+ {"h.ello", "*.ello", FALSE}, -+ {"h.ello.", "*.ello", FALSE}, -+ {"h.ello", "*.ello.", FALSE}, -+ {"h.e.llo", "*.e.llo", TRUE}, -+ {"h.e.llo", " *.e.llo", FALSE}, -+ {" h.e.llo", "*.e.llo", TRUE}, -+ {"h.e.llo.", "*.e.llo", TRUE}, -+ {"*.e.llo.", "*.e.llo", TRUE}, -+ {"************.e.llo.", "*.e.llo", TRUE}, -+ {"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" -+ "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" -+ "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" -+ "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD" -+ "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE" -+ ".e.llo.", "*.e.llo", TRUE}, -+ {"\xfe\xfe.e.llo.", "*.e.llo", TRUE}, -+ {"h.e.llo.", "*.e.llo.", TRUE}, -+ {"h.e.llo", "*.e.llo.", TRUE}, -+ {".h.e.llo", "*.e.llo.", FALSE}, -+ {"h.e.llo", "*.*.llo.", FALSE}, -+ {"h.e.llo", "h.*.llo", FALSE}, -+ {"h.e.llo", "h.e.*", FALSE}, -+ {"hello", "*.ello", FALSE}, -+ {"hello", "**llo", FALSE}, -+ {"bar.foo.example.com", "*.example.com", FALSE}, -+ {"foo.example.com", "*.example.com", TRUE}, -+ {"baz.example.net", "b*z.example.net", FALSE}, -+ {"foobaz.example.net", "*baz.example.net", FALSE}, -+ {"xn--l8j.example.local", "x*.example.local", FALSE}, -+ {"xn--l8j.example.net", "*.example.net", TRUE}, -+ {"xn--l8j.example.net", "*j.example.net", FALSE}, -+ {"xn--l8j.example.net", "xn--l8j.example.net", TRUE}, -+ {"xn--l8j.example.net", "xn--l8j.*.net", FALSE}, -+ {"xl8j.example.net", "*.example.net", TRUE}, -+ {"fe80::3285:a9ff:fe46:b619", "*::3285:a9ff:fe46:b619", FALSE}, -+ {"fe80::3285:a9ff:fe46:b619", "fe80::3285:a9ff:fe46:b619", TRUE}, -+ {NULL, NULL, FALSE} -+}; - --fail_if(Curl_cert_hostcheck(STRCONST("xxx.example.com"), -- STRCONST("www.example.com")), "bad 1"); --fail_if(Curl_cert_hostcheck(STRCONST("*"), -- STRCONST("www.example.com")),"bad 2"); --fail_if(Curl_cert_hostcheck(STRCONST("*.*.com"), -- STRCONST("www.example.com")), "bad 3"); --fail_if(Curl_cert_hostcheck(STRCONST("*.example.com"), -- STRCONST("baa.foo.example.com")), "bad 4"); --fail_if(Curl_cert_hostcheck(STRCONST("f*.example.com"), -- STRCONST("baa.example.com")), "bad 5"); --fail_if(Curl_cert_hostcheck(STRCONST("*.com"), -- STRCONST("example.com")), "bad 6"); --fail_if(Curl_cert_hostcheck(STRCONST("*fail.com"), -- STRCONST("example.com")), "bad 7"); --fail_if(Curl_cert_hostcheck(STRCONST("*.example."), -- STRCONST("www.example.")), "bad 8"); --fail_if(Curl_cert_hostcheck(STRCONST("*.example."), -- STRCONST("www.example")), "bad 9"); --fail_if(Curl_cert_hostcheck(STRCONST(""), STRCONST("www")), "bad 10"); --fail_if(Curl_cert_hostcheck(STRCONST("*"), STRCONST("www")), "bad 11"); --fail_if(Curl_cert_hostcheck(STRCONST("*.168.0.0"), -- STRCONST("192.168.0.0")), "bad 12"); --fail_if(Curl_cert_hostcheck(STRCONST("www.example.com"), -- STRCONST("192.168.0.0")), "bad 13"); -- --#ifdef ENABLE_IPV6 --fail_if(Curl_cert_hostcheck(STRCONST("*::3285:a9ff:fe46:b619"), -- STRCONST("fe80::3285:a9ff:fe46:b619")), "bad 14"); --fail_unless(Curl_cert_hostcheck(STRCONST("fe80::3285:a9ff:fe46:b619"), -- STRCONST("fe80::3285:a9ff:fe46:b619")), -- "good 6"); --#endif -+UNITTEST_START -+{ -+ int i; -+ for(i = 0; tests[i].host; i++) { -+ if(tests[i].match != Curl_cert_hostcheck(tests[i].pattern, -+ strlen(tests[i].pattern), -+ tests[i].host, -+ strlen(tests[i].host))) { -+ fprintf(stderr, -+ "HOST: %s\n" -+ "PTRN: %s\n" -+ "did %sMATCH\n", -+ tests[i].host, -+ tests[i].pattern, -+ tests[i].match ? "NOT ": ""); -+ unitfail++; -+ } -+ } -+} - --#endif -+UNITTEST_STOP -+#else - -- /* you end the test code like this: */ -+UNITTEST_START - - UNITTEST_STOP -+#endif --- -2.40.1 - diff --git a/0003-curl-8.0.1-CVE-2023-32001.patch b/0003-curl-8.0.1-CVE-2023-32001.patch deleted file mode 100644 index eaa9d8f..0000000 --- a/0003-curl-8.0.1-CVE-2023-32001.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 98474a7848e20716935f471f4e48610b00fe9dc0 Mon Sep 17 00:00:00 2001 -From: SaltyMilk -Date: Mon, 10 Jul 2023 21:43:28 +0200 -Subject: [PATCH] fopen: optimize - -Closes #11419 - -(cherry picked from commit 0c667188e0c6cda615a036b8a2b4125f2c404dde) -Signed-off-by: Jan Macku ---- - lib/fopen.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/fopen.c b/lib/fopen.c -index f710dbf05..8c728f2a8 100644 ---- a/lib/fopen.c -+++ b/lib/fopen.c -@@ -56,13 +56,13 @@ CURLcode Curl_fopen(struct Curl_easy *data, const char *filename, - int fd = -1; - *tempname = NULL; - -- if(stat(filename, &sb) == -1 || !S_ISREG(sb.st_mode)) { -- /* a non-regular file, fallback to direct fopen() */ -- *fh = fopen(filename, FOPEN_WRITETEXT); -- if(*fh) -- return CURLE_OK; -+ *fh = fopen(filename, FOPEN_WRITETEXT); -+ if(!*fh) - goto fail; -- } -+ if(fstat(fileno(*fh), &sb) == -1 || !S_ISREG(sb.st_mode)) -+ return CURLE_OK; -+ fclose(*fh); -+ *fh = NULL; - - result = Curl_rand_hex(data, randsuffix, sizeof(randsuffix)); - if(result) --- -2.41.0 - diff --git a/0004-curl-8.0.1-CVE-2023-38039.patch b/0004-curl-8.0.1-CVE-2023-38039.patch deleted file mode 100644 index dc63e75..0000000 --- a/0004-curl-8.0.1-CVE-2023-38039.patch +++ /dev/null @@ -1,201 +0,0 @@ -From fe13e206a80cee9ffa686ead170980dbdb2cf9e1 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Wed, 2 Aug 2023 23:34:48 +0200 -Subject: [PATCH] http: return error when receiving too large header set - -To avoid abuse. The limit is set to 300 KB for the accumulated size of -all received HTTP headers for a single response. Incomplete research -suggests that Chrome uses a 256-300 KB limit, while Firefox allows up to -1MB. - -Closes #11582 - -(cherry picked from commit 3ee79c1674fd6f99e8efca52cd7510e08b766770) -Signed-off-by: Jan Macku ---- - lib/c-hyper.c | 12 +++++++----- - lib/http.c | 34 ++++++++++++++++++++++++++++++---- - lib/http.h | 9 +++++++++ - lib/pingpong.c | 4 +++- - lib/urldata.h | 17 ++++++++--------- - 5 files changed, 57 insertions(+), 19 deletions(-) - -diff --git a/lib/c-hyper.c b/lib/c-hyper.c -index 9c7632d35..28f64ef97 100644 ---- a/lib/c-hyper.c -+++ b/lib/c-hyper.c -@@ -174,8 +174,11 @@ static int hyper_each_header(void *userdata, - } - } - -- data->info.header_size += (curl_off_t)len; -- data->req.headerbytecount += (curl_off_t)len; -+ result = Curl_bump_headersize(data, len, FALSE); -+ if(result) { -+ data->state.hresult = result; -+ return HYPER_ITER_BREAK; -+ } - return HYPER_ITER_CONTINUE; - } - -@@ -305,9 +308,8 @@ static CURLcode status_line(struct Curl_easy *data, - if(result) - return result; - } -- data->info.header_size += (curl_off_t)len; -- data->req.headerbytecount += (curl_off_t)len; -- return CURLE_OK; -+ result = Curl_bump_headersize(data, len, FALSE); -+ return result; - } - - /* -diff --git a/lib/http.c b/lib/http.c -index 400d2b081..d8c3e1eda 100644 ---- a/lib/http.c -+++ b/lib/http.c -@@ -3760,6 +3760,29 @@ static CURLcode verify_header(struct Curl_easy *data) - return CURLE_OK; - } - -+CURLcode Curl_bump_headersize(struct Curl_easy *data, -+ size_t delta, -+ bool connect_only) -+{ -+ size_t bad = 0; -+ if(delta < MAX_HTTP_RESP_HEADER_SIZE) { -+ if(!connect_only) -+ data->req.headerbytecount += (unsigned int)delta; -+ data->info.header_size += (unsigned int)delta; -+ if(data->info.header_size > MAX_HTTP_RESP_HEADER_SIZE) -+ bad = data->info.header_size; -+ } -+ else -+ bad = data->info.header_size + delta; -+ if(bad) { -+ failf(data, "Too large response headers: %zu > %zu", -+ bad, MAX_HTTP_RESP_HEADER_SIZE); -+ return CURLE_RECV_ERROR; -+ } -+ return CURLE_OK; -+} -+ -+ - /* - * Read any HTTP header lines from the server and pass them to the client app. - */ -@@ -4007,8 +4030,9 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, - if(result) - return result; - -- data->info.header_size += (long)headerlen; -- data->req.headerbytecount += (long)headerlen; -+ result = Curl_bump_headersize(data, headerlen, FALSE); -+ if(result) -+ return result; - - /* - * When all the headers have been parsed, see if we should give -@@ -4330,8 +4354,10 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, - if(result) - return result; - -- data->info.header_size += Curl_dyn_len(&data->state.headerb); -- data->req.headerbytecount += Curl_dyn_len(&data->state.headerb); -+ result = Curl_bump_headersize(data, Curl_dyn_len(&data->state.headerb), -+ FALSE); -+ if(result) -+ return result; - - Curl_dyn_reset(&data->state.headerb); - } -diff --git a/lib/http.h b/lib/http.h -index 444abc0be..b29f3b84f 100644 ---- a/lib/http.h -+++ b/lib/http.h -@@ -61,6 +61,10 @@ extern const struct Curl_handler Curl_handler_wss; - #endif /* websockets */ - - -+CURLcode Curl_bump_headersize(struct Curl_easy *data, -+ size_t delta, -+ bool connect_only); -+ - /* Header specific functions */ - bool Curl_compareheader(const char *headerline, /* line to check */ - const char *header, /* header keyword _with_ colon */ -@@ -176,6 +180,11 @@ CURLcode Curl_http_auth_act(struct Curl_easy *data); - #define EXPECT_100_THRESHOLD (1024*1024) - #endif - -+/* MAX_HTTP_RESP_HEADER_SIZE is the maximum size of all response headers -+ combined that libcurl allows for a single HTTP response, any HTTP -+ version. This count includes CONNECT response headers. */ -+#define MAX_HTTP_RESP_HEADER_SIZE (300*1024) -+ - #endif /* CURL_DISABLE_HTTP */ - - #ifdef USE_NGHTTP3 -diff --git a/lib/pingpong.c b/lib/pingpong.c -index 2f4aa1c34..189a0b68e 100644 ---- a/lib/pingpong.c -+++ b/lib/pingpong.c -@@ -341,7 +341,9 @@ CURLcode Curl_pp_readresp(struct Curl_easy *data, - ssize_t clipamount = 0; - bool restart = FALSE; - -- data->req.headerbytecount += (long)gotbytes; -+ result = Curl_bump_headersize(data, gotbytes, FALSE); -+ if(result) -+ return result; - - pp->nread_resp += gotbytes; - for(i = 0; i < gotbytes; ptr++, i++) { -diff --git a/lib/urldata.h b/lib/urldata.h -index f3e782ad3..390c611e2 100644 ---- a/lib/urldata.h -+++ b/lib/urldata.h -@@ -619,17 +619,16 @@ struct SingleRequest { - curl_off_t bytecount; /* total number of bytes read */ - curl_off_t writebytecount; /* number of bytes written */ - -- curl_off_t headerbytecount; /* only count received headers */ -- curl_off_t deductheadercount; /* this amount of bytes doesn't count when we -- check if anything has been transferred at -- the end of a connection. We use this -- counter to make only a 100 reply (without a -- following second response code) result in a -- CURLE_GOT_NOTHING error code */ -- - curl_off_t pendingheader; /* this many bytes left to send is actually - header and not body */ - struct curltime start; /* transfer started at this time */ -+ unsigned int headerbytecount; /* only count received headers */ -+ unsigned int deductheadercount; /* this amount of bytes doesn't count when -+ we check if anything has been transferred -+ at the end of a connection. We use this -+ counter to make only a 100 reply (without -+ a following second response code) result -+ in a CURLE_GOT_NOTHING error code */ - enum { - HEADER_NORMAL, /* no bad header at all */ - HEADER_PARTHEADER, /* part of the chunk is a bad header, the rest -@@ -1076,7 +1075,6 @@ struct PureInfo { - int httpversion; /* the http version number X.Y = X*10+Y */ - time_t filetime; /* If requested, this is might get set. Set to -1 if the - time was unretrievable. */ -- curl_off_t header_size; /* size of read header(s) in bytes */ - curl_off_t request_size; /* the amount of bytes sent in the request(s) */ - unsigned long proxyauthavail; /* what proxy auth types were announced */ - unsigned long httpauthavail; /* what host auth types were announced */ -@@ -1084,6 +1082,7 @@ struct PureInfo { - char *contenttype; /* the content type of the object */ - char *wouldredirect; /* URL this would've been redirected to if asked to */ - curl_off_t retry_after; /* info from Retry-After: header */ -+ unsigned int header_size; /* size of read header(s) in bytes */ - - /* PureInfo members 'conn_primary_ip', 'conn_primary_port', 'conn_local_ip' - and, 'conn_local_port' are copied over from the connectdata struct in --- -2.41.0 - diff --git a/0005-curl-8.0.1-CVE-2023-38545.patch b/0005-curl-8.0.1-CVE-2023-38545.patch deleted file mode 100644 index 7b06ee4..0000000 --- a/0005-curl-8.0.1-CVE-2023-38545.patch +++ /dev/null @@ -1,135 +0,0 @@ -From fa4aed65588db8e7c7e3d98f6c5bcf394f3a515d Mon Sep 17 00:00:00 2001 -From: Jay Satiro -Date: Wed, 11 Oct 2023 07:34:19 +0200 -Subject: [PATCH 1/2] socks: return error if hostname too long for remote - resolve - -Prior to this change the state machine attempted to change the remote -resolve to a local resolve if the hostname was longer than 255 -characters. Unfortunately that did not work as intended and caused a -security issue. - -Bug: https://curl.se/docs/CVE-2023-38545.html - -(cherry picked from commit fb4415d8aee6c1045be932a34fe6107c2f5ed147) - -Signed-off-by: Jan Macku ---- - lib/socks.c | 8 +++--- - tests/data/Makefile.inc | 2 +- - tests/data/test728 | 64 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 69 insertions(+), 5 deletions(-) - create mode 100644 tests/data/test728 - -diff --git a/lib/socks.c b/lib/socks.c -index 95c2b004c..8cf694d1d 100644 ---- a/lib/socks.c -+++ b/lib/socks.c -@@ -588,9 +588,9 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, - - /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */ - if(!socks5_resolve_local && hostname_len > 255) { -- infof(data, "SOCKS5: server resolving disabled for hostnames of " -- "length > 255 [actual len=%zu]", hostname_len); -- socks5_resolve_local = TRUE; -+ failf(data, "SOCKS5: the destination hostname is too long to be " -+ "resolved remotely by the proxy."); -+ return CURLPX_LONG_HOSTNAME; - } - - if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI)) -@@ -904,7 +904,7 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, - } - else { - socksreq[len++] = 3; -- socksreq[len++] = (char) hostname_len; /* one byte address length */ -+ socksreq[len++] = (unsigned char) hostname_len; /* one byte length */ - memcpy(&socksreq[len], sx->hostname, hostname_len); /* w/o NULL */ - len += hostname_len; - } -diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc -index 7ed03a247..eb89437ef 100644 ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -100,7 +100,7 @@ test679 test680 test681 test682 test683 test684 test685 test686 \ - \ - test700 test701 test702 test703 test704 test705 test706 test707 test708 \ - test709 test710 test711 test712 test713 test714 test715 test716 test717 \ --test718 test719 test720 test721 \ -+test718 test719 test720 test721 test728 \ - \ - test800 test801 test802 test803 test804 test805 test806 test807 test808 \ - test809 test810 test811 test812 test813 test814 test815 test816 test817 \ -diff --git a/tests/data/test728 b/tests/data/test728 -new file mode 100644 -index 000000000..05bcf2883 ---- /dev/null -+++ b/tests/data/test728 -@@ -0,0 +1,64 @@ -+ -+ -+ -+HTTP -+HTTP GET -+SOCKS5 -+SOCKS5h -+followlocation -+ -+ -+ -+# -+# Server-side -+ -+# The hostname in this redirect is 256 characters and too long (> 255) for -+# SOCKS5 remote resolve. curl must return error CURLE_PROXY in this case. -+ -+HTTP/1.1 301 Moved Permanently -+Location: http://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ -+Content-Length: 0 -+Connection: close -+ -+ -+ -+ -+# -+# Client-side -+ -+ -+proxy -+ -+ -+http -+socks5 -+ -+ -+SOCKS5h with HTTP redirect to hostname too long -+ -+ -+--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER -+ -+ -+ -+# -+# Verify data after the test has been "shot" -+ -+ -+GET /%TESTNUMBER HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+User-Agent: curl/%VERSION -+Accept: */* -+ -+ -+ -+97 -+ -+# the error message is verified because error code CURLE_PROXY (97) may be -+# returned for any number of reasons and we need to make sure it is -+# specifically for the reason below so that we know the check is working. -+ -+curl: (97) SOCKS5: the destination hostname is too long to be resolved remotely by the proxy. -+ -+ -+ --- -2.41.0 - diff --git a/0006-curl-8.0.1-CVE-2023-38546.patch b/0006-curl-8.0.1-CVE-2023-38546.patch deleted file mode 100644 index 111f0d3..0000000 --- a/0006-curl-8.0.1-CVE-2023-38546.patch +++ /dev/null @@ -1,136 +0,0 @@ -From a9a3f49fc87d4b64f380e19d69c139e9fba676f2 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 14 Sep 2023 23:28:32 +0200 -Subject: [PATCH 2/2] cookie: remove unnecessary struct fields - -Plus: reduce the hash table size from 256 to 63. It seems unlikely to -make much of a speed difference for most use cases but saves 1.5KB of -data per instance. - -Closes #11862 - -(cherry picked from commit 61275672b46d9abb3285740467b882e22ed75da8) - -Signed-off-by: Jan Macku ---- - lib/cookie.c | 13 +------------ - lib/cookie.h | 14 ++++---------- - lib/easy.c | 4 +--- - 3 files changed, 6 insertions(+), 25 deletions(-) - -diff --git a/lib/cookie.c b/lib/cookie.c -index 0c6e0f7cd..d34620351 100644 ---- a/lib/cookie.c -+++ b/lib/cookie.c -@@ -119,7 +119,6 @@ static void freecookie(struct Cookie *co) - free(co->name); - free(co->value); - free(co->maxage); -- free(co->version); - free(co); - } - -@@ -726,11 +725,7 @@ Curl_cookie_add(struct Curl_easy *data, - } - } - else if((nlen == 7) && strncasecompare("version", namep, 7)) { -- strstore(&co->version, valuep, vlen); -- if(!co->version) { -- badcookie = TRUE; -- break; -- } -+ /* just ignore */ - } - else if((nlen == 7) && strncasecompare("max-age", namep, 7)) { - /* -@@ -1174,7 +1169,6 @@ Curl_cookie_add(struct Curl_easy *data, - free(clist->path); - free(clist->spath); - free(clist->expirestr); -- free(clist->version); - free(clist->maxage); - - *clist = *co; /* then store all the new data */ -@@ -1238,9 +1232,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, - c = calloc(1, sizeof(struct CookieInfo)); - if(!c) - return NULL; /* failed to get memory */ -- c->filename = strdup(file?file:"none"); /* copy the name just in case */ -- if(!c->filename) -- goto fail; /* failed to get memory */ - /* - * Initialize the next_expiration time to signal that we don't have enough - * information yet. -@@ -1394,7 +1385,6 @@ static struct Cookie *dup_cookie(struct Cookie *src) - CLONE(name); - CLONE(value); - CLONE(maxage); -- CLONE(version); - d->expires = src->expires; - d->tailmatch = src->tailmatch; - d->secure = src->secure; -@@ -1611,7 +1601,6 @@ void Curl_cookie_cleanup(struct CookieInfo *c) - { - if(c) { - unsigned int i; -- free(c->filename); - for(i = 0; i < COOKIE_HASH_SIZE; i++) - Curl_cookie_freelist(c->cookies[i]); - free(c); /* free the base struct as well */ -diff --git a/lib/cookie.h b/lib/cookie.h -index 39bb08bc4..3a43bbf33 100644 ---- a/lib/cookie.h -+++ b/lib/cookie.h -@@ -36,11 +36,7 @@ struct Cookie { - char *domain; /* domain = */ - curl_off_t expires; /* expires = */ - char *expirestr; /* the plain text version */ -- -- /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */ -- char *version; /* Version = */ - char *maxage; /* Max-Age = */ -- - bool tailmatch; /* whether we do tail-matching of the domain name */ - bool secure; /* whether the 'secure' keyword was used */ - bool livecookie; /* updated from a server, not a stored file */ -@@ -56,18 +52,16 @@ struct Cookie { - #define COOKIE_PREFIX__SECURE (1<<0) - #define COOKIE_PREFIX__HOST (1<<1) - --#define COOKIE_HASH_SIZE 256 -+#define COOKIE_HASH_SIZE 63 - - struct CookieInfo { - /* linked list of cookies we know of */ - struct Cookie *cookies[COOKIE_HASH_SIZE]; -- -- char *filename; /* file we read from/write to */ -- long numcookies; /* number of cookies in the "jar" */ -+ curl_off_t next_expiration; /* the next time at which expiration happens */ -+ int numcookies; /* number of cookies in the "jar" */ -+ int lastct; /* last creation-time used in the jar */ - bool running; /* state info, for cookie adding information */ - bool newsession; /* new session, discard session cookies on load */ -- int lastct; /* last creation-time used in the jar */ -- curl_off_t next_expiration; /* the next time at which expiration happens */ - }; - - /* This is the maximum line length we accept for a cookie line. RFC 2109 -diff --git a/lib/easy.c b/lib/easy.c -index 27124a72f..fddf047f2 100644 ---- a/lib/easy.c -+++ b/lib/easy.c -@@ -911,9 +911,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) - if(data->cookies) { - /* If cookies are enabled in the parent handle, we enable them - in the clone as well! */ -- outcurl->cookies = Curl_cookie_init(data, -- data->cookies->filename, -- outcurl->cookies, -+ outcurl->cookies = Curl_cookie_init(data, NULL, outcurl->cookies, - data->set.cookiesession); - if(!outcurl->cookies) - goto fail; --- -2.41.0 - diff --git a/0007-curl-8.0.1-CVE-2023-46218.patch b/0007-curl-8.0.1-CVE-2023-46218.patch deleted file mode 100644 index 1494a41..0000000 --- a/0007-curl-8.0.1-CVE-2023-46218.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ef4abe34b2b704e2a318063b387b628773b78663 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 23 Nov 2023 08:15:47 +0100 -Subject: [PATCH 1/2] cookie: lowercase the domain names before PSL checks - -Reported-by: Harry Sintonen - -Closes #12387 - -(cherry picked from commit 2b0994c29a721c91c572cff7808c572a24d251eb) - -Signed-off-by: Jan Macku ---- - lib/cookie.c | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -diff --git a/lib/cookie.c b/lib/cookie.c -index d34620351..730c3c6f4 100644 ---- a/lib/cookie.c -+++ b/lib/cookie.c -@@ -1044,15 +1044,23 @@ Curl_cookie_add(struct Curl_easy *data, - * dereference it. - */ - if(data && (domain && co->domain && !Curl_host_is_ipnum(co->domain))) { -- const psl_ctx_t *psl = Curl_psl_use(data); -- int acceptable; -- -- if(psl) { -- acceptable = psl_is_cookie_domain_acceptable(psl, domain, co->domain); -- Curl_psl_release(data); -+ bool acceptable = FALSE; -+ char lcase[256]; -+ char lcookie[256]; -+ size_t dlen = strlen(domain); -+ size_t clen = strlen(co->domain); -+ if((dlen < sizeof(lcase)) && (clen < sizeof(lcookie))) { -+ const psl_ctx_t *psl = Curl_psl_use(data); -+ if(psl) { -+ /* the PSL check requires lowercase domain name and pattern */ -+ Curl_strntolower(lcase, domain, dlen + 1); -+ Curl_strntolower(lcookie, co->domain, clen + 1); -+ acceptable = psl_is_cookie_domain_acceptable(psl, lcase, lcookie); -+ Curl_psl_release(data); -+ } -+ else -+ acceptable = !bad_domain(domain, strlen(domain)); - } -- else -- acceptable = !bad_domain(domain, strlen(domain)); - - if(!acceptable) { - infof(data, "cookie '%s' dropped, domain '%s' must not " --- -2.43.0 - diff --git a/0008-curl-8.0.1-CVE-2023-46219.patch b/0008-curl-8.0.1-CVE-2023-46219.patch deleted file mode 100644 index 08c4938..0000000 --- a/0008-curl-8.0.1-CVE-2023-46219.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 45ed144efd8b194cc7d0acbe00594f730a2ad62d Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 23 Nov 2023 08:23:17 +0100 -Subject: [PATCH 2/2] fopen: create short(er) temporary file name - -Only using random letters in the name plus a ".tmp" extension. Not by -appending characters to the final file name. - -Reported-by: Maksymilian Arciemowicz - -Closes #12388 - -(cherry picked from commit 73b65e94f3531179de45c6f3c836a610e3d0a846) - -Signed-off-by: Jan Macku ---- - lib/fopen.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 60 insertions(+), 5 deletions(-) - -diff --git a/lib/fopen.c b/lib/fopen.c -index 8c728f2a8..7b9d4022e 100644 ---- a/lib/fopen.c -+++ b/lib/fopen.c -@@ -39,6 +39,51 @@ - #include "curl_memory.h" - #include "memdebug.h" - -+/* -+ The dirslash() function breaks a null-terminated pathname string into -+ directory and filename components then returns the directory component up -+ to, *AND INCLUDING*, a final '/'. If there is no directory in the path, -+ this instead returns a "" string. -+ -+ This function returns a pointer to malloc'ed memory. -+ -+ The input path to this function is expected to have a file name part. -+*/ -+ -+#ifdef _WIN32 -+#define PATHSEP "\\" -+#define IS_SEP(x) (((x) == '/') || ((x) == '\\')) -+#elif defined(MSDOS) || defined(__EMX__) || defined(OS2) -+#define PATHSEP "\\" -+#define IS_SEP(x) ((x) == '\\') -+#else -+#define PATHSEP "/" -+#define IS_SEP(x) ((x) == '/') -+#endif -+ -+static char *dirslash(const char *path) -+{ -+ size_t n; -+ struct dynbuf out; -+ DEBUGASSERT(path); -+ Curl_dyn_init(&out, CURL_MAX_INPUT_LENGTH); -+ n = strlen(path); -+ if(n) { -+ /* find the rightmost path separator, if any */ -+ while(n && !IS_SEP(path[n-1])) -+ --n; -+ /* skip over all the path separators, if any */ -+ while(n && IS_SEP(path[n-1])) -+ --n; -+ } -+ if(Curl_dyn_addn(&out, path, n)) -+ return NULL; -+ /* if there was a directory, append a single trailing slash */ -+ if(n && Curl_dyn_addn(&out, PATHSEP, 1)) -+ return NULL; -+ return Curl_dyn_ptr(&out); -+} -+ - /* - * Curl_fopen() opens a file for writing with a temp name, to be renamed - * to the final name when completed. If there is an existing file using this -@@ -50,25 +95,34 @@ CURLcode Curl_fopen(struct Curl_easy *data, const char *filename, - FILE **fh, char **tempname) - { - CURLcode result = CURLE_WRITE_ERROR; -- unsigned char randsuffix[9]; -+ unsigned char randbuf[41]; - char *tempstore = NULL; - struct_stat sb; - int fd = -1; -+ char *dir; - *tempname = NULL; - -+ dir = dirslash(filename); -+ if(!dir) -+ goto fail; -+ - *fh = fopen(filename, FOPEN_WRITETEXT); - if(!*fh) - goto fail; -- if(fstat(fileno(*fh), &sb) == -1 || !S_ISREG(sb.st_mode)) -+ if(fstat(fileno(*fh), &sb) == -1 || !S_ISREG(sb.st_mode)) { -+ free(dir); - return CURLE_OK; -+ } - fclose(*fh); - *fh = NULL; - -- result = Curl_rand_hex(data, randsuffix, sizeof(randsuffix)); -+ result = Curl_rand_hex(data, randbuf, sizeof(randbuf)); - if(result) - goto fail; - -- tempstore = aprintf("%s.%s.tmp", filename, randsuffix); -+ /* The temp file name should not end up too long for the target file -+ system */ -+ tempstore = aprintf("%s%s.tmp", dir, randbuf); - if(!tempstore) { - result = CURLE_OUT_OF_MEMORY; - goto fail; -@@ -95,6 +149,7 @@ CURLcode Curl_fopen(struct Curl_easy *data, const char *filename, - if(!*fh) - goto fail; - -+ free(dir); - *tempname = tempstore; - return CURLE_OK; - -@@ -105,7 +160,7 @@ fail: - } - - free(tempstore); -- -+ free(dir); - return result; - } - --- -2.43.0 - diff --git a/0009-curl-8.0.1-fix-openldap-conftest.patch b/0009-curl-8.0.1-fix-openldap-conftest.patch deleted file mode 100644 index c3e2e17..0000000 --- a/0009-curl-8.0.1-fix-openldap-conftest.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0ac6108856b9d500bc376d1d7e0b648d15499837 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 22 Jun 2023 14:34:49 +0200 -Subject: [PATCH] configure: add check for ldap_init_fd - -... as otherwise the configure script will say it is OpenLDAP in the -summary, but not set the USE_OPENLDAP define, therefor not using the -intended OpenLDAP code paths. - -Regression since 4d7385446 (7.85.0) -Fixes #11372 -Closes #11374 -Reported-by: vlkl-sap on github ---- - configure.ac | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 373e2e0cef6862..696a50505f37ab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1706,16 +1706,19 @@ if test x$CURL_DISABLE_LDAP != x1 ; then - fi - - if test x$CURL_DISABLE_LDAP != x1 ; then -- AC_CHECK_FUNCS([ldap_url_parse]) -+ AC_CHECK_FUNCS([ldap_url_parse \ -+ ldap_init_fd]) - - if test "$LDAPLIBNAME" = "wldap32"; then - curl_ldap_msg="enabled (winldap)" - AC_DEFINE(USE_WIN32_LDAP, 1, [Use Windows LDAP implementation]) - else -- curl_ldap_msg="enabled (OpenLDAP)" - if test "x$ac_cv_func_ldap_init_fd" = "xyes"; then -+ curl_ldap_msg="enabled (OpenLDAP)" - AC_DEFINE(USE_OPENLDAP, 1, [Use OpenLDAP-specific code]) - AC_SUBST(USE_OPENLDAP, [1]) -+ else -+ curl_ldap_msg="enabled (ancient OpenLDAP)" - fi - fi - fi diff --git a/0101-curl-7.32.0-multilib.patch b/0101-curl-7.32.0-multilib.patch index b4f8e2a..f7f66e6 100644 --- a/0101-curl-7.32.0-multilib.patch +++ b/0101-curl-7.32.0-multilib.patch @@ -1,84 +1,85 @@ -From 2a4754a3a7cf60ecc36d83cbe50b8c337cb87632 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Fri, 12 Apr 2013 12:04:05 +0200 +From 6bb4e674cdc953f5c0048aa84172539900725166 Mon Sep 17 00:00:00 2001 +From: Jan Macku +Date: Tue, 16 Dec 2025 10:04:40 +0100 Subject: [PATCH] prevent multilib conflicts on the curl-config script --- - curl-config.in | 23 +++++------------------ - docs/curl-config.1 | 4 +++- - libcurl.pc.in | 1 + + curl-config.in | 23 +++++------------------ + docs/curl-config.md | 4 +++- + libcurl.pc.in | 1 + 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/curl-config.in b/curl-config.in -index 150004d..95d0759 100644 +index a1c8185875..bb43ca8335 100644 --- a/curl-config.in +++ b/curl-config.in -@@ -78,7 +78,7 @@ while test $# -gt 0; do - ;; +@@ -74,7 +74,7 @@ while test "$#" -gt 0; do + ;; - --cc) -- echo "@CC@" -+ echo "gcc" - ;; + --cc) +- echo '@CC@' ++ echo 'gcc' + ;; - --prefix) -@@ -157,32 +157,19 @@ while test $# -gt 0; do - ;; + --prefix) +@@ -149,16 +149,7 @@ while test "$#" -gt 0; do + ;; - --libs) -- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then -- CURLLIBDIR="-L@libdir@ " -- else -- CURLLIBDIR="" -- fi -- if test "X@ENABLE_SHARED@" = "Xno"; then -- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ -- else -- echo ${CURLLIBDIR}-lcurl -- fi -+ echo -lcurl - ;; - --ssl-backends) - echo "@SSL_BACKENDS@" - ;; + --libs) +- if test "@libdir@" != '/usr/lib' && test "@libdir@" != '/usr/lib64'; then +- curllibdir="-L@libdir@ " +- else +- curllibdir='' +- fi +- if test '@ENABLE_SHARED@' = 'no'; then +- echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@" +- else +- echo "${curllibdir}-lcurl" +- fi ++ echo '-lcurl' + ;; - --static-libs) -- if test "X@ENABLE_STATIC@" != "Xno" ; then -- echo "@libdir@/libcurl.@libext@" @LDFLAGS@ @LIBCURL_LIBS@ -- else -- echo "curl was built with static libraries disabled" >&2 -- exit 1 -- fi -+ echo "curl was built with static libraries disabled" >&2 -+ exit 1 - ;; + --ssl-backends) +@@ -166,16 +157,12 @@ while test "$#" -gt 0; do + ;; - --configure) -- echo @CONFIGURE_OPTIONS@ -+ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' - ;; + --static-libs) +- if test '@ENABLE_STATIC@' != 'no'; then +- echo "@libdir@/libcurl.@libext@ @LIBCURL_PC_LDFLAGS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@" +- else +- echo 'curl was built with static libraries disabled' >&2 +- exit 1 +- fi ++ echo 'curl was built with static libraries disabled' >&2 ++ exit 1 + ;; - *) -diff --git a/docs/curl-config.1 b/docs/curl-config.1 -index 14a9d2b..ffcc004 100644 ---- a/docs/curl-config.1 -+++ b/docs/curl-config.1 -@@ -72,7 +72,9 @@ no, one or several names. If more than one name, they will appear - comma-separated. (Added in 7.58.0) - .IP "--static-libs" - Shows the complete set of libs and other linker options you will need in order --to link your application with libcurl statically. (Added in 7.17.1) -+to link your application with libcurl statically. Note that Fedora/RHEL libcurl + --configure) +- echo @CONFIGURE_OPTIONS@ ++ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' + ;; + + *) +diff --git a/docs/curl-config.md b/docs/curl-config.md +index 12ad245b79..fa0e03d273 100644 +--- a/docs/curl-config.md ++++ b/docs/curl-config.md +@@ -87,7 +87,9 @@ no, one or several names. If more than one name, they appear comma-separated. + ## `--static-libs` + + Shows the complete set of libs and other linker options you need in order to +-link your application with libcurl statically. (Added in 7.17.1) ++link your application with libcurl statically. Note that Fedora/RHEL libcurl +packages do not provide any static libraries, thus cannot be linked statically. +(Added in 7.17.1) - .IP "--version" - Outputs version information about the installed libcurl. - .IP "--vernum" + + ## `--version` + diff --git a/libcurl.pc.in b/libcurl.pc.in -index 2ba9c39..f8f8b00 100644 +index c0ba5244a8..f3645e1748 100644 --- a/libcurl.pc.in +++ b/libcurl.pc.in -@@ -31,6 +31,7 @@ libdir=@libdir@ +@@ -28,6 +28,7 @@ libdir=@libdir@ includedir=@includedir@ supported_protocols="@SUPPORT_PROTOCOLS@" supported_features="@SUPPORT_FEATURES@" @@ -87,5 +88,5 @@ index 2ba9c39..f8f8b00 100644 Name: libcurl URL: https://curl.se/ -- -2.26.2 +2.52.0 diff --git a/0102-curl-7.84.0-test3026.patch b/0102-curl-7.84.0-test3026.patch deleted file mode 100644 index 1098583..0000000 --- a/0102-curl-7.84.0-test3026.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 279b990727a1fd3e2828fbbd80581777e4200b67 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Mon, 27 Jun 2022 16:50:57 +0200 -Subject: [PATCH] test3026: disable valgrind - -It fails on x86_64 with: -``` - Use --max-threads=INT to specify a larger number of threads - and rerun valgrind - valgrind: the 'impossible' happened: - Max number of threads is too low - host stacktrace: - ==174357== at 0x58042F5A: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - ==174357== by 0x58043087: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - ==174357== by 0x580432EF: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - ==174357== by 0x58043310: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - ==174357== by 0x58099E77: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - ==174357== by 0x580E67E9: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - ==174357== by 0x5809D59D: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - ==174357== by 0x5809901A: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - ==174357== by 0x5809B0B6: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - ==174357== by 0x580E4050: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux) - sched status: - running_tid=1 - Thread 1: status = VgTs_Runnable syscall 56 (lwpid 174357) - ==174357== at 0x4A07816: clone (in /usr/lib64/libc.so.6) - ==174357== by 0x4A08720: __clone_internal (in /usr/lib64/libc.so.6) - ==174357== by 0x4987ACF: create_thread (in /usr/lib64/libc.so.6) - ==174357== by 0x49885F6: pthread_create@@GLIBC_2.34 (in /usr/lib64/libc.so.6) - ==174357== by 0x1093B5: test.part.0 (lib3026.c:64) - ==174357== by 0x492454F: (below main) (in /usr/lib64/libc.so.6) - client stack range: [0x1FFEFFC000 0x1FFF000FFF] client SP: 0x1FFEFFC998 - valgrind stack range: [0x1002BAA000 0x1002CA9FFF] top usage: 11728 of 1048576 -[...] -``` ---- - tests/data/test3026 | 3 +++ - tests/libtest/lib3026.c | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/tests/data/test3026 b/tests/data/test3026 -index fb80cc8..01f2ba5 100644 ---- a/tests/data/test3026 -+++ b/tests/data/test3026 -@@ -41,5 +41,8 @@ none - - 0 - -+ -+disable -+ - - -diff --git a/tests/libtest/lib3026.c b/tests/libtest/lib3026.c -index 43fe335..70cd7a4 100644 ---- a/tests/libtest/lib3026.c -+++ b/tests/libtest/lib3026.c -@@ -147,8 +147,8 @@ int test(char *URL) - results[i] = CURL_LAST; /* initialize with invalid value */ - res = pthread_create(&tids[i], NULL, run_thread, &results[i]); - if(res) { -- fprintf(stderr, "%s:%d Couldn't create thread, errno %d\n", -- __FILE__, __LINE__, res); -+ fprintf(stderr, "%s:%d Couldn't create thread, i=%u, errno %d\n", -+ __FILE__, __LINE__, i, res); - tid_count = i; - test_failure = -1; - goto cleanup; --- -2.37.1 - diff --git a/0103-curl-7.87.0-test3012.patch b/0103-curl-7.87.0-test3012.patch deleted file mode 100644 index 108d715..0000000 --- a/0103-curl-7.87.0-test3012.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0d0a256c8e7f6261d49e1bdd583c04c0e5dfe706 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Wed, 11 Jan 2023 08:53:05 +0100 -Subject: [PATCH] test3012: disable valgrind - -valgrind reports a call to memcpy() with overlapping blocks by mistake: -``` -test 3012...[--output-dir with -J] -../libtool --mode=execute /usr/bin/valgrind --tool=memcheck --quiet --leak-check=yes --suppressions=../../tests/valgrind.supp --num-callers=16 --log-file=log/valgrind3012 ../src/curl --trace-ascii log/trace3012 --trace-time http://127.0.0.1:35981/this/is/the/3012 -OJ --output-dir /root/rpmbuild/BUILD/curl-7.86.0/build-minimal/tests/log >log/stdout3012 2>log/stderr3012 -CMD (0): ../libtool --mode=execute /usr/bin/valgrind --tool=memcheck --quiet --leak-check=yes --suppressions=../../tests/valgrind.supp --num-callers=16 --log-file=log/valgrind3012 ../src/curl --trace-ascii log/trace3012 --trace-time http://127.0.0.1:35981/this/is/the/3012 -OJ --output-dir /root/rpmbuild/BUILD/curl-7.86.0/build-minimal/tests/log >log/stdout3012 2>log/stderr3012 - valgrind ERROR ==496584== Source and destination overlap in memcpy_chk(0x54ad1a0, 0x54ad1a1, 11) -==496584== at 0x484C332: __memcpy_chk (vg_replace_strmem.c:1741) -==496584== by 0x118FDB: UnknownInlinedFun (string_fortified.h:36) -==496584== by 0x118FDB: UnknownInlinedFun (tool_cb_hdr.c:301) -==496584== by 0x118FDB: tool_header_cb (tool_cb_hdr.c:173) -==496584== by 0x489907B: chop_write.lto_priv.0 (sendf.c:620) -==496584== by 0x489CDD1: UnknownInlinedFun (http.c:4449) -==496584== by 0x489CDD1: UnknownInlinedFun (transfer.c:633) -==496584== by 0x489CDD1: Curl_readwrite (transfer.c:1219) -==496584== by 0x488C116: multi_runsingle (multi.c:2404) -==496584== by 0x488F491: curl_multi_perform (multi.c:2682) -==496584== by 0x486A9DA: UnknownInlinedFun (easy.c:663) -==496584== by 0x486A9DA: UnknownInlinedFun (easy.c:753) -==496584== by 0x486A9DA: curl_easy_perform (easy.c:772) -==496584== by 0x114B28: UnknownInlinedFun (tool_operate.c:2406) -==496584== by 0x114B28: UnknownInlinedFun (tool_operate.c:2594) -==496584== by 0x114B28: UnknownInlinedFun (tool_operate.c:2706) -==496584== by 0x114B28: main (tool_main.c:284) -``` - -Bug: https://bugzilla.redhat.com/2143040 ---- - tests/data/test3012 | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/data/test3012 b/tests/data/test3012 -index 1889c93..ea43a49 100644 ---- a/tests/data/test3012 -+++ b/tests/data/test3012 -@@ -56,5 +56,9 @@ Accept: */* - - -foo- - -+ -+ -+disable -+ - - --- -2.39.0 - diff --git a/0104-curl-7.88.0-tests-warnings.patch b/0104-curl-7.88.0-tests-warnings.patch deleted file mode 100644 index dff89f9..0000000 --- a/0104-curl-7.88.0-tests-warnings.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d506d885aa16b4a87acbac082eea41dccdc7b69f Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Wed, 15 Feb 2023 10:42:38 +0100 -Subject: [PATCH] Revert "runtests: consider warnings fatal and error on them" - -While it might be useful for upstream developers, it is not so useful -for downstream consumers. - -This reverts upstream commit 22f795c834cfdbacbb1b55426028a581e3cf67a8. ---- - tests/runtests.pl | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tests/runtests.pl b/tests/runtests.pl -index 71644ad18..0cf85c3fe 100755 ---- a/tests/runtests.pl -+++ b/tests/runtests.pl -@@ -75,8 +75,7 @@ BEGIN { - } - - use strict; --# Promote all warnings to fatal --use warnings FATAL => 'all'; -+use warnings; - use Cwd; - use Digest::MD5 qw(md5); - use MIME::Base64; --- -2.39.1 - diff --git a/0105-curl-8.0.1-tests-stunnel-port.patch b/0105-curl-8.0.1-tests-stunnel-port.patch deleted file mode 100644 index 47d1419..0000000 --- a/0105-curl-8.0.1-tests-stunnel-port.patch +++ /dev/null @@ -1,97 +0,0 @@ -From c9a1d18e5f8f28b90c1b2fcc1f15699327067e59 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Fri, 21 Apr 2023 17:44:10 +0200 -Subject: [PATCH] tests/runtests.pl: attempt to fix a conflict on port numbers - -... where stunnel listens for legacy HTTPS and HTTP/2, which manifests -as a hard-to-explain failure of the following tests: 1630 1631 1632 1904 -1941 1945 2050 2055 3028 -``` -[...] -startnew: perl -I../../tests ../../tests/secureserver.pl --pidfile ".https_server.pid" --logfile "log/https_stunnel.log" --ipv4 --proto https --stunnel "/usr/bin/stunnel" --srcdir "../../tests" --connect 42917 --accept 24642 -RUN: HTTPS server is PID 114398 port 24642 -* pid https => 114398 114402 -[...] -startnew: perl -I../../tests ../../tests/secureserver.pl --pidfile ".https2_server.pid" --logfile "log/https2_stunnel.log" --id 2 --ipv4 --proto https --stunnel "/usr/bin/stunnel" --srcdir "../../tests" --connect 36763 --accept 24642 -startnew: child process has died, server might start up -Warning: http2 server unexpectedly alive -RUN: Process with pid 73992 signalled to die -RUN: Process with pid 73992 forced to die with SIGKILL -== Contents of files in the log/ dir after test 1630 -=== Start of file http2_server.log - 14:01:21.881018 exit_signal_handler: 15 - 14:01:21.881372 signalled to die - 14:01:21.881511 ========> IPv4 sws (port 36763 pid: 73992) exits with signal (15) -=== End of file http2_server.log -=== Start of file https2_stunnel.log - [ ] Initializing inetd mode configuration - [ ] Clients allowed=500 - [.] stunnel 5.69 on x86_64-redhat-linux-gnu platform - [.] Compiled/running with OpenSSL 3.0.8 7 Feb 2023 - [.] Threading:PTHREAD Sockets:POLL,IPv6 TLS:ENGINE,FIPS,OCSP,PSK,SNI - [ ] errno: (*__errno_location ()) - [ ] Initializing inetd mode configuration - [.] Reading configuration from file /builddir/build/BUILD/curl-8.0.1/build-minimal/tests/https_stunnel.conf - [.] UTF-8 byte order mark not detected - [.] FIPS mode disabled - [ ] Compression disabled - [ ] No PRNG seeding was required - [ ] Initializing service [curltest] - [ ] Using the default TLS minimum version as specified in crypto policies. Not setting explicitly. - [ ] Using the default TLS maximum version as specified in crypto policies. Not setting explicitly - [ ] stunnel default security level set: 2 - [ ] Ciphers: PROFILE=SYSTEM - [ ] TLSv1.3 ciphersuites: TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256 - [ ] TLS options: 0x2100000 (+0x0, -0x0) - [ ] Session resumption enabled - [ ] Loading certificate from file: /builddir/build/BUILD/curl-8.0.1/tests/stunnel.pem - [ ] Certificate loaded from file: /builddir/build/BUILD/curl-8.0.1/tests/stunnel.pem - [ ] Loading private key from file: /builddir/build/BUILD/curl-8.0.1/tests/stunnel.pem - [ ] Private key loaded from file: /builddir/build/BUILD/curl-8.0.1/tests/stunnel.pem - [ ] Private key check succeeded - [!] No trusted certificates found - [ ] DH initialization needed for DHE-RSA-AES256-GCM-SHA384 - [ ] DH initialization - [ ] Could not load DH parameters from /builddir/build/BUILD/curl-8.0.1/tests/stunnel.pem - [ ] Using dynamic DH parameters - [ ] ECDH initialization - [ ] ECDH initialized with curves X25519:P-256:X448:P-521:P-384 - [.] Configuration successful - [ ] Deallocating deployed section defaults - [ ] Binding service [curltest] - [ ] Listening file descriptor created (FD=8) - [ ] Setting accept socket options (FD=8) - [ ] Option SO_REUSEADDR set on accept socket - [.] Binding service [curltest] to 0.0.0.0:24642: Address already in use (98) - [ ] Listening file descriptor created (FD=8) - [ ] Setting accept socket options (FD=8) - [ ] Option SO_REUSEADDR set on accept socket - [.] Binding service [curltest] to :::24642: Address already in use (98) - [!] Binding service [curltest] failed - [ ] Unbinding service [curltest] - [ ] Service [curltest] closed - [ ] Deallocating deployed section defaults - [ ] Deallocating section [curltest] - [ ] Initializing inetd mode configuration -=== End of file https2_stunnel.log -``` ---- - tests/runtests.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/runtests.pl b/tests/runtests.pl -index 54f6923..bb362c9 100755 ---- a/tests/runtests.pl -+++ b/tests/runtests.pl -@@ -1802,7 +1802,7 @@ sub runhttpsserver { - - my $pid2; - my $httpspid; -- my $port = 24512; # start attempt -+ my $port = 24512 * $idnum; # start attempt - for (1 .. 10) { - $port += int(rand(600)); - my $options = "$flags --accept $port"; --- -2.39.2 - diff --git a/curl.rpmlintrc b/curl.rpmlintrc new file mode 100644 index 0000000..022a98e --- /dev/null +++ b/curl.rpmlintrc @@ -0,0 +1,15 @@ +# Intentional stuff we're not concerned about +addFilter("unversioned-explicit-provides webclient") +addFilter("package-with-huge-docs") +addFilter("crypto-policy-non-compliance-openssl /usr/lib(64)?/libcurl.so.4") + +# This is just plain wrong (%_configure redefinition) +addFilter("configure-without-libdir-spec") + +# Technical term +addFilter("E: spelling-error \('kerberos',") + +# Artefacts of RemovePathPostfixes: .minimal +addFilter("W: dangling-relative-symlink /usr/lib/.build-id/.* ../../../../.*curl.*\.minimal") +#addFilter("W: dangling-relative-symlink /usr/lib.*/libcurl.so.4 libcurl.so.4.*.minimal") +#addFilter("E: invalid-ldconfig-symlink /usr/lib.*/libcurl.so.4.* libcurl.so.4.*.minimal") diff --git a/curl.spec b/curl.spec index 7224088..c0ad4db 100644 --- a/curl.spec +++ b/curl.spec @@ -1,60 +1,45 @@ +# OpenSSL ENGINE support +# This is deprecated by OpenSSL since OpenSSL 3.0 and by Fedora since Fedora 41 +# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine +# Change the bcond to 0 to turn off ENGINE support by default +%bcond openssl_engine_support %[%{defined fedora} || 0%{?rhel} < 10] + +# HTTP/3 support +# This is using ngtcp2 with OpenSSL 3.5 QUIC support instead of curl's +# experimental native OpenSSL 3.5 support. +%bcond http3 %[0%{?fedora} >= 43] + Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 8.0.1 -Release: 7%{?dist} -License: MIT -Source0: https://curl.se/download/%{name}-%{version}.tar.xz -Source1: https://curl.se/download/%{name}-%{version}.tar.xz.asc +Version: 8.18.0 +Release: 1%{?dist} +License: curl +Source0: https://curl.se/download/%{name}-%{version_no_tilde}.tar.xz +Source1: https://curl.se/download/%{name}-%{version_no_tilde}.tar.xz.asc # The curl download page ( https://curl.se/download.html ) links # to Daniel's address page https://daniel.haxx.se/address.html for the GPG Key, # which points to the GPG key as of April 7th 2016 of https://daniel.haxx.se/mykey.asc Source2: mykey.asc -# fix more POST-after-PUT confusion (CVE-2023-28322) -Patch1: 0001-curl-8.0.1-CVE-2023-28322.patch - -# fix IDN wildcard match (CVE-2023-28321) -Patch2: 0002-curl-8.0.1-CVE-2023-28321.patch - -# fix fopen race condition (CVE-2023-32001) -Patch3: 0003-curl-8.0.1-CVE-2023-32001.patch - -# fix HTTP headers eat all memory (CVE-2023-38039) -Patch4: 0004-curl-8.0.1-CVE-2023-38039.patch - -# fix SOCKS5 heap buffer overflow (CVE-2023-38545) -Patch5: 0005-curl-8.0.1-CVE-2023-38545.patch - -# fix cookie injection with none file (CVE-2023-38546) -Patch6: 0006-curl-8.0.1-CVE-2023-38546.patch - -# fix cookie mixed case PSL bypass (CVE-2023-46218) -Patch7: 0007-curl-8.0.1-CVE-2023-46218.patch - -# fix HSTS long file name clears contents (CVE-2023-46219) -Patch8: 0008-curl-8.0.1-CVE-2023-46219.patch - -# fix OpenLDAP conftest -Patch9: 0009-curl-8.0.1-fix-openldap-conftest.patch - # patch making libcurl multilib ready Patch101: 0101-curl-7.32.0-multilib.patch -# test3026: disable valgrind -Patch102: 0102-curl-7.84.0-test3026.patch - -# test3012: temporarily disable valgrind (#2143040) -Patch103: 0103-curl-7.87.0-test3012.patch - -# do not fail on warnings in the upstream test driver -Patch104: 0104-curl-7.88.0-tests-warnings.patch - -# tests: attempt to fix a conflict on port numbers -Patch105: 0105-curl-8.0.1-tests-stunnel-port.patch - Provides: curl-full = %{version}-%{release} +# do not fail when trying to install curl-minimal after drop +Provides: curl-minimal = %{version}-%{release} Provides: webclient URL: https://curl.se/ + +%if 0%{?fedora} +# instead of bundled wcurl utility, recommend wcurl package +Recommends: wcurl +%endif + +# The reason for maintaining two separate packages for curl is no longer valid. +# The curl-minimal is currently almost identical to curl-full, so let's drop curl-minimal. +# For more details, see https://bugzilla.redhat.com/show_bug.cgi?id=2262096 +Obsoletes: curl-minimal < 8.6.0-4 + BuildRequires: automake BuildRequires: brotli-devel BuildRequires: coreutils @@ -63,14 +48,24 @@ BuildRequires: groff BuildRequires: krb5-devel BuildRequires: libidn2-devel BuildRequires: libnghttp2-devel +%if %{with http3} +BuildRequires: libnghttp3-devel +%endif BuildRequires: libpsl-devel BuildRequires: libssh-devel BuildRequires: libtool BuildRequires: make +%if %{with http3} +BuildRequires: ngtcp2-crypto-ossl-devel +%endif BuildRequires: openldap-devel BuildRequires: openssh-clients BuildRequires: openssh-server +BuildRequires: openssl BuildRequires: openssl-devel +%if %{with openssl_engine_support} && 0%{?fedora} >= 41 +BuildRequires: openssl-devel-engine +%endif BuildRequires: perl-interpreter BuildRequires: pkgconfig BuildRequires: python-unversioned-command @@ -103,6 +98,9 @@ BuildRequires: hostname BuildRequires: nghttp2 # perl modules used in the test suite +BuildRequires: perl(B) +BuildRequires: perl(base) +BuildRequires: perl(constant) BuildRequires: perl(Cwd) BuildRequires: perl(Digest::MD5) BuildRequires: perl(Digest::SHA) @@ -110,10 +108,15 @@ BuildRequires: perl(Exporter) BuildRequires: perl(File::Basename) BuildRequires: perl(File::Copy) BuildRequires: perl(File::Spec) +BuildRequires: perl(I18N::Langinfo) BuildRequires: perl(IPC::Open2) +BuildRequires: perl(List::Util) +BuildRequires: perl(Memoize) BuildRequires: perl(MIME::Base64) -BuildRequires: perl(Time::Local) +BuildRequires: perl(POSIX) +BuildRequires: perl(Storable) BuildRequires: perl(Time::HiRes) +BuildRequires: perl(Time::Local) BuildRequires: perl(vars) %if 0%{?fedora} @@ -140,10 +143,19 @@ BuildRequires: stunnel # using an older version of libcurl could result in CURLE_UNKNOWN_OPTION Requires: libcurl%{?_isa} >= %{version}-%{release} +# Define OPENSSL_NO_ENGINE to avoid inclusion of +%if %{without openssl_engine_support} +%global _preprocessor_defines %{?_preprocessor_defines} -DOPENSSL_NO_ENGINE +%endif + # require at least the version of libnghttp2 that we were built against, # to ensure that we have the necessary symbols available (#2144277) %global libnghttp2_version %(pkg-config --modversion libnghttp2 2>/dev/null || echo 0) +# require at least the version of libnghttp3 that we were built against, +# to ensure that we have the necessary symbols available +%global libnghttp3_version %(pkg-config --modversion libnghttp3 2>/dev/null || echo 0) + # require at least the version of libpsl that we were built against, # to ensure that we have the necessary symbols available (#1631804) %global libpsl_version %(pkg-config --modversion libpsl 2>/dev/null || echo 0) @@ -152,6 +164,10 @@ Requires: libcurl%{?_isa} >= %{version}-%{release} # to ensure that we have the necessary symbols available (#525002, #642796) %global libssh_version %(pkg-config --modversion libssh 2>/dev/null || echo 0) +# require at least the version of ngtcp2 that we were built against, +# to ensure that we have the necessary symbols available +%global ngtcp2_version %(pkg-config --modversion libngtcp2 2>/dev/null || echo 0) + # require at least the version of openssl-libs that we were built against, # to ensure that we have the necessary symbols available (#1462184, #1462211) # (we need to translate 3.0.0-alpha16 -> 3.0.0-0.alpha16 and 3.0.0-beta1 -> 3.0.0-0.beta1 though) @@ -168,8 +184,14 @@ resume, proxy tunneling and a busload of other useful tricks. %package -n libcurl Summary: A library for getting files from web servers Requires: libnghttp2%{?_isa} >= %{libnghttp2_version} +%if %{with http3} +Requires: libnghttp3%{?_isa} >= %{libnghttp3_version} +%endif Requires: libpsl%{?_isa} >= %{libpsl_version} Requires: libssh%{?_isa} >= %{libssh_version} +%if %{with http3} +Requires: ngtcp2%{?_isa} >= %{ngtcp2_version} +%endif Requires: openssl-libs%{?_isa} >= 1:%{openssl_version} Provides: libcurl-full = %{version}-%{release} Provides: libcurl-full%{?_isa} = %{version}-%{release} @@ -195,22 +217,6 @@ The libcurl-devel package includes header files and libraries necessary for developing programs which use the libcurl library. It contains the API documentation of the library, too. -%package -n curl-minimal -Summary: Conservatively configured build of curl for minimal installations -Provides: curl = %{version}-%{release} -Conflicts: curl -Suggests: libcurl-minimal -RemovePathPostfixes: .minimal - -# using an older version of libcurl could result in CURLE_UNKNOWN_OPTION -Requires: libcurl%{?_isa} >= %{version}-%{release} - -%description -n curl-minimal -This is a replacement of the 'curl' package for minimal installations. It -comes with a limited set of features compared to the 'curl' package. On the -other hand, the package is smaller and requires fewer run-time dependencies to -be installed. - %package -n libcurl-minimal Summary: Conservatively configured build of libcurl for minimal installations Requires: libnghttp2%{?_isa} >= %{libnghttp2_version} @@ -230,11 +236,11 @@ be installed. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -p1 +%autosetup -n %{name}-%{version_no_tilde} -p1 # disable test 1801 # -echo "1801" >> tests/data/DISABLED +printf "1801\n" >>tests/data/DISABLED # test3026: avoid pthread_create() failure due to resource exhaustion on i386 %ifarch %{ix86} @@ -254,13 +260,18 @@ sed -e 's|^35$|35,52|' -i tests/data/test323 eval "$cmd" ) +# avoid unnecessary arch-dependent line in the processed file +sed -e '/# Used in @libdir@/d' \ + -i curl-config.in + +%build # regenerate the configure script and Makefile.in files autoreconf -fiv -%build mkdir build-{full,minimal} export common_configure_opts=" \ --cache-file=../config.cache \ + --disable-manual \ --disable-static \ --enable-hsts \ --enable-ipv6 \ @@ -270,7 +281,8 @@ export common_configure_opts=" \ --with-gssapi \ --with-libidn2 \ --with-nghttp2 \ - --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt" + --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem \ + --with-zsh-functions-dir" %global _configure ../configure @@ -283,10 +295,8 @@ export common_configure_opts=" \ --disable-imap \ --disable-ldap \ --disable-ldaps \ - --disable-manual \ --disable-mqtt \ --disable-ntlm \ - --disable-ntlm-wb \ --disable-pop3 \ --disable-rtsp \ --disable-smb \ @@ -294,6 +304,7 @@ export common_configure_opts=" \ --disable-telnet \ --disable-tftp \ --disable-tls-srp \ + --disable-websockets \ --without-brotli \ --without-libpsl \ --without-libssh @@ -308,10 +319,8 @@ export common_configure_opts=" \ --enable-imap \ --enable-ldap \ --enable-ldaps \ - --enable-manual \ --enable-mqtt \ --enable-ntlm \ - --enable-ntlm-wb \ --enable-pop3 \ --enable-rtsp \ --enable-smb \ @@ -319,9 +328,14 @@ export common_configure_opts=" \ --enable-telnet \ --enable-tftp \ --enable-tls-srp \ + --enable-websockets \ --with-brotli \ --with-libpsl \ - --with-libssh + --with-libssh \ +%if %{with http3} + --with-nghttp3 \ + --with-ngtcp2 \ +%endif ) # avoid using rpath @@ -369,10 +383,6 @@ for i in ${RPM_BUILD_ROOT}%{_libdir}/*; do mv -v $i $i.minimal done -# install and rename the executable that will be packaged as curl-minimal -%make_install -C build-minimal/src -mv -v ${RPM_BUILD_ROOT}%{_bindir}/curl{,.minimal} - # install libcurl.m4 install -d $RPM_BUILD_ROOT%{_datadir}/aclocal install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal @@ -381,28 +391,30 @@ install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal cd build-full %make_install -# install zsh completion for curl -# (we have to override LD_LIBRARY_PATH because we eliminated rpath) -LD_LIBRARY_PATH="$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH" \ - %make_install -C scripts - # do not install /usr/share/fish/completions/curl.fish which is also installed # by fish-3.0.2-1.module_f31+3716+57207597 and would trigger a conflict rm -rf ${RPM_BUILD_ROOT}%{_datadir}/fish rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la +# do not install bundled wcurl utility +# it is provided by the wcurl package +rm -f ${RPM_BUILD_ROOT}%{_bindir}/wcurl +rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/wcurl.1* + %ldconfig_scriptlets -n libcurl %ldconfig_scriptlets -n libcurl-minimal %files -%doc CHANGES +%doc CHANGES.md %doc README %doc docs/BUGS.md -%doc docs/FAQ +%doc docs/DISTROS.md +%doc docs/FAQ.md %doc docs/FEATURES.md -%doc docs/TODO +%doc docs/KNOWN_BUGS.md +%doc docs/TODO.md %doc docs/TheArtOfHttpScripting.md %{_bindir}/curl %{_mandir}/man1/curl.1* @@ -424,66 +436,278 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_mandir}/man3/* %{_datadir}/aclocal/libcurl.m4 -%files -n curl-minimal -%{_bindir}/curl.minimal -%{_mandir}/man1/curl.1* - %files -n libcurl-minimal %license COPYING %{_libdir}/libcurl.so.4.minimal %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal %changelog -* Wed Feb 14 2024 Lukáš Zaoral - 8.0.1-7 -- fix openldap conftest +* Wed Jan 07 2026 Jan Macku - 8.18.0-1 +- new upstream release -* Wed Dec 06 2023 Jan Macku - 8.0.1-6 -- fix HSTS long file name clears contents (CVE-2023-46219) -- fix cookie mixed case PSL bypass (CVE-2023-46218) +* Mon Jan 05 2026 Jan Macku - 8.18.0~rc3-1 +- new upstream release candidate -* Thu Oct 12 2023 Jan Macku - 8.0.1-5 -- fix cookie injection with none file (CVE-2023-38546) -- fix SOCKS5 heap buffer overflow (CVE-2023-38545) +* Tue Dec 16 2025 Jan Macku - 8.18.0~rc2-1 +- new upstream release candidate +- reenable valgrind on test 616 -* Wed Sep 13 2023 Jan Macku - 8.0.1-4 -- fix HTTP headers eat all memory (CVE-2023-38039) +* Tue Dec 09 2025 Jan Macku - 8.18.0~rc1-1 +- new upstream release candidate +- drop upstreamed patches -* Thu Jul 20 2023 Jan Macku - 8.0.1-3 -- fix fopen race condition (CVE-2023-32001) +* Sun Dec 07 2025 Aleksei Bavshin - 8.17.0-5 +- Enable HTTP/3 support with ngtcp2 -* Mon Jun 05 2023 Jan Macku - 8.0.1-2 -- fix more POST-after-PUT confusion (CVE-2023-28322) -- fix IDN wildcard match (CVE-2023-28321) +* Thu Dec 04 2025 Jan Macku - 8.17.0-4 +- apply upstream patches for valgrind issues in HTTP/3 (#2408809) -* Wed May 03 2023 Kamil Dudka - 8.0.1-1 +* Thu Nov 13 2025 Jan Macku - 8.17.0-3 +- recommend wcurl package instead of bundled wcurl utility + +* Thu Nov 13 2025 Jan Macku - 8.17.0-2 +- remove bundled wcurl utility that was added in 8.14.0~rc1, use wcurl package instead + +* Mon Nov 10 2025 Jan Macku - 8.17.0-1 +- new upstream release + +* Thu Oct 30 2025 Jan Macku - 8.17.0~rc3-1 +- new upstream release candidate + +* Tue Oct 21 2025 Jan Macku - 8.17.0~rc2-1 +- new upstream release candidate + +* Mon Oct 13 2025 Jan Macku - 8.17.0~rc1-1 +- new upstream release candidate + +* Wed Sep 10 2025 Jan Macku - 8.16.0-1 +- new upstream release + +* Wed Sep 03 2025 Jan Macku - 8.16.0~rc3-1 +- new upstream release candidate + +* Tue Aug 26 2025 Jan Macku - 8.16.0~rc2-1 +- new upstream release candidate + +* Wed Jul 23 2025 Fedora Release Engineering - 8.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Jul 16 2025 Jan Macku - 8.15.0-1 +- new upstream release + +* Thu Jul 10 2025 Jan Macku - 8.15.0~rc3-1 +- new upstream release candidate + +* Mon Jun 30 2025 Jan Macku - 8.15.0~rc2-1 +- new upstream release candidate + +* Mon Jun 23 2025 Jan Macku - 8.15.0~rc1-1 +- new upstream release candidate + +* Wed Jun 04 2025 Jan Macku - 8.14.1-1 +- new upstream release +- drop: 0001-curl-8.14.0-multi-fix-add_handle-resizing.patch (no longer needed) + +* Wed May 28 2025 Jan Macku - 8.14.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2025-5025 - No QUIC certificate pinning with wolfSSL + CVE-2025-4947 - QUIC certificate check skip with wolfSSL +- fix regression: curl_multi_add_handle() returning OOM when using more than 400 handles + +* Fri May 02 2025 Jan Macku - 8.14.0~rc1-1 +- new upstream release candidate +- new utility: wcurl which lets you download URLs without having to remember any parameters + +* Wed Apr 02 2025 Jan Macku - 8.13.0-1 +- new upstream release +- add build time dependency on openssl (required by tests) + +* Wed Mar 26 2025 Jan Macku - 8.13.0~rc3-1 +- new upstream release candidate +- drop: 0102-curl-7.84.0-test3026.patch (no longer needed) + +* Tue Mar 18 2025 Jan Macku - 8.13.0~rc2-1 +- new upstream release candidate + +* Thu Mar 13 2025 Jan Macku - 8.13.0~rc1-2 +- fix --cert parameter (#2351531) + +* Mon Mar 10 2025 Jan Macku - 8.13.0~rc1-1 +- new upstream release candidate + +* Wed Feb 05 2025 Jan Macku - 8.12.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2025-0725 - gzip integer overflow + CVE-2025-0665 - eventfd double close + CVE-2025-0167 - netrc and default credential leak +- drop upstreamed patches + +* Fri Jan 31 2025 Jan Macku - 8.11.1-4 +- TLS: check connection for SSL use, not handler (#2324130#c7) + +* Thu Jan 16 2025 Fedora Release Engineering - 8.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sun Dec 15 2024 Paul Howarth - 8.11.1-2 +- Fix crash with Unexpected error 9 on netlink descriptor 10 (rhbz#2332350) + - https://github.com/curl/curl/issues/15725 + - https://github.com/curl/curl/pull/15727 + +* Wed Dec 11 2024 Jan Macku - 8.11.1-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2024-11053 - netrc and redirect credential leak + +* Wed Nov 06 2024 Yaakov Selkowitz - 8.11.0-2 +- Disable engine support on RHEL 10+ + +* Wed Nov 06 2024 Jan Macku - 8.11.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2024-9681 - HSTS subdomain overwrites parent cache entry + +* Tue Sep 24 2024 Jan Macku - 8.10.1-2 +- Use tls-ca-bundle.pem instead of ca-bundle.crt (OpenSSL specific) (#2313564) + +* Wed Sep 18 2024 Jan Macku - 8.10.1-1 +- new upstream release + +* Wed Sep 11 2024 Jan Macku - 8.10.0-1 +- new upstream release + +* Wed Aug 21 2024 Jacek Migacz - 8.9.1-3 +- Retire deprecated ntlm-wb configure option + +* Mon Aug 5 2024 voidanix - 8.9.1-2 +- Apply SIGPIPE-related patch due to upstream regression + +* Wed Jul 24 2024 Jan Macku - 8.9.1-1 +- new upstream release + +* Wed Jul 24 2024 Jan Macku - 8.9.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2024-6874 - macidn punycode buffer overread + CVE-2024-6197 - freeing stack buffer in utf8asn1str +- drop upstreamed patches + +* Wed Jul 17 2024 Fedora Release Engineering - 8.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jul 12 2024 Paul Howarth - 8.8.0-2 +- adapt for https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine +- added build condition for openssl_engine_support, true by default so as to + not change the resulting built package (yet) +- with openssl_engine_support true, BR: openssl-devel-engine +- with openssl_engine_support false, build with -DOPENSSL_NO_ENGINE + +* Wed May 22 2024 Jan Macku - 8.8.0-1 +- new upstream release +- drop upstreamed patches + +* Wed Mar 27 2024 Jan Macku - 8.7.1-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2024-2004 - Usage of disabled protocol + CVE-2024-2379 - QUIC certificate check bypass with wolfSSL + CVE-2024-2398 - HTTP/2 push headers memory-leak + CVE-2024-2466 - TLS certificate check bypass with mbedTLS +- drop upstreamed patches +- reenable test 0313 +- fix zsh completions, use --with-zsh-functions-dir +- apply upstream patches for 8.7.1 issues and regressions + +* Mon Feb 19 2024 Jan Macku - 8.6.0-7 +- Fix: Leftovers after chunking should not be part of the curl buffer output (#2264220) + +* Mon Feb 12 2024 Jan Macku - 8.6.0-6 +- revert "receive max buffer" + add test case +- temporarily disable test 0313 +- remove suggests of libcurl-minimal in curl-full + +* Mon Feb 12 2024 Jan Macku - 8.6.0-5 +- add Provides to curl-minimal + +* Wed Feb 07 2024 Jan Macku - 8.6.0-4 +- drop curl-minimal subpackage in favor of curl-full (#2262096) + +* Mon Feb 05 2024 Jan Macku - 8.6.0-3 +- ignore response body to HEAD requests + +* Fri Feb 02 2024 Jan Macku - 8.6.0-2 +- don't build manual for curl-full - use man 1 curl instead (#2262373) + +* Thu Feb 01 2024 Jan Macku - 8.6.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2024-0853 - OCSP verification bypass with TLS session reuse +- drop 001-dist-add-tests-errorcodes.pl-to-the-tarball.patch (replaced by upstream fix) +- remove accidentally included mk-ca-bundle.1 man page (upstream bug #12843) + +* Fri Jan 19 2024 Fedora Release Engineering - 8.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Dec 06 2023 Jan Macku - 8.5.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2023-46218 - cookie mixed case PSL bypass + CVE-2023-46219 - HSTS long file name clears contents + +* Wed Oct 11 2023 Jan Macku - 8.4.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2023-38545 - SOCKS5 heap buffer overflow + CVE-2023-38546 - cookie injection with none file + +* Wed Sep 13 2023 Jan Macku - 8.3.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2023-38039 - HTTP headers eat all memory + +* Wed Aug 02 2023 Jan Macku - 8.2.1-2 +- enable websockets (#2224651) + +* Wed Jul 26 2023 Lukáš Zaoral - 8.2.1-1 +- new upstream release (rhbz#2226659) + +* Wed Jul 19 2023 Jan Macku - 8.2.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2023-32001 - fopen race condition + +* Tue May 30 2023 Jan Macku - 8.1.2-1 +- new upstream release, with small bugfixes and improvements + +* Tue May 23 2023 Jan Macku - 8.1.1-1 +- new upstream release, with small bugfixes and improvements + +* Wed May 17 2023 Kamil Dudka - 8.1.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2023-28321 - IDN wildcard match + CVE-2023-28322 - more POST-after-PUT confusion + +* Fri Apr 21 2023 Kamil Dudka - 8.0.1-3 - tests: re-enable temporarily disabled test-cases - tests: attempt to fix a conflict on port numbers - apply patches automatically -- rebase to latest upstream release (#2192665) -* Wed May 03 2023 Kamil Dudka - 7.87.0-10 -- http_proxy: fix memory corruption with http proxy tunneling (#2192665) +* Tue Mar 21 2023 Lukáš Zaoral - 8.0.1-2 +- migrated to SPDX license -* Wed May 03 2023 Kamil Dudka - 7.87.0-9 -- vtls: fix hostname handling in filters (#2192665) +* Mon Mar 20 2023 Kamil Dudka - 8.0.1-1 +- new upstream release -* Fri Apr 21 2023 Kamil Dudka - 7.87.0-8 -- cfilters: use the first non-connected filter (#2185433) +* Mon Mar 20 2023 Kamil Dudka - 8.0.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2023-27538 - SSH connection too eager reuse still + CVE-2023-27537 - HSTS double-free + CVE-2023-27536 - GSS delegation too eager connection re-use + CVE-2023-27535 - FTP too eager connection reuse + CVE-2023-27534 - SFTP path ~ resolving discrepancy + CVE-2023-27533 - TELNET option IAC injection -* Fri Mar 24 2023 Kamil Dudka - 7.87.0-7 -- fix SSH connection too eager reuse still (CVE-2023-27538) -- fix HSTS double-free (CVE-2023-27537) -- fix GSS delegation too eager connection re-use (CVE-2023-27536) -- fix FTP too eager connection reuse (CVE-2023-27535) -- fix SFTP path ~ resolving discrepancy (CVE-2023-27534) -- fix TELNET option IAC injection (CVE-2023-27533) +* Mon Feb 20 2023 Kamil Dudka - 7.88.1-1 +- new upstream release -* Wed Mar 15 2023 Kamil Dudka - 7.87.0-6 -- tests: make sure gnuserv-tls has SRP support before using it +* Fri Feb 17 2023 Kamil Dudka - 7.88.0-2 +- http2: set drain on stream end -* Wed Feb 15 2023 Kamil Dudka - 7.87.0-5 -- fix HTTP multi-header compression denial of service (CVE-2023-23916) -- share HSTS between handles (CVE-2023-23915 CVE-2023-23914) +* Wed Feb 15 2023 Kamil Dudka - 7.88.0-1 +- new upstream release, which fixes the following vulnerabilities + CVE-2023-23916 - HTTP multi-header compression denial of service + CVE-2023-23915 - HSTS amnesia with --parallel + CVE-2023-23914 - HSTS ignored on multiple requests * Fri Jan 20 2023 Kamil Dudka - 7.87.0-4 - fix regression in a public header file (#2162716) @@ -1258,881 +1482,3 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la * Wed Feb 06 2013 Kamil Dudka 7.29.0-1 - new upstream release (fixes CVE-2013-0249) - -* Tue Jan 15 2013 Kamil Dudka 7.28.1-3 -- require valgrind for build only on i386 and x86_64 (#886891) - -* Tue Jan 15 2013 Kamil Dudka 7.28.1-2 -- prevent NSS from crashing on client auth hook failure -- clear session cache if a client cert from file is used -- fix error messages for CURLE_SSL_{CACERT,CRL}_BADFILE - -* Tue Nov 20 2012 Kamil Dudka 7.28.1-1 -- new upstream release - -* Wed Oct 31 2012 Kamil Dudka 7.28.0-1 -- new upstream release - -* Mon Oct 01 2012 Kamil Dudka 7.27.0-3 -- use the upstream facility to disable problematic tests -- do not crash if MD5 fingerprint is not provided by libssh2 - -* Wed Aug 01 2012 Kamil Dudka 7.27.0-2 -- eliminate unnecessary inotify events on upload via file protocol (#844385) - -* Sat Jul 28 2012 Kamil Dudka 7.27.0-1 -- new upstream release - -* Mon Jul 23 2012 Kamil Dudka 7.26.0-6 -- print reason phrase from HTTP status line on error (#676596) - -* Wed Jul 18 2012 Fedora Release Engineering - 7.26.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 09 2012 Kamil Dudka 7.26.0-4 -- fix duplicated SSL handshake with multi interface and proxy (#788526) - -* Wed May 30 2012 Karsten Hopp 7.26.0-3 -- disable test 1319 on ppc64, server times out - -* Mon May 28 2012 Kamil Dudka 7.26.0-2 -- use human-readable error messages provided by NSS (upstream commit 72f4b534) - -* Fri May 25 2012 Kamil Dudka 7.26.0-1 -- new upstream release - -* Wed Apr 25 2012 Karsten Hopp 7.25.0-3 -- valgrind on ppc64 works fine, disable ppc32 only - -* Wed Apr 25 2012 Karsten Hopp 7.25.0-3 -- drop BR valgrind on PPC(64) until bugzilla #810992 gets fixed - -* Fri Apr 13 2012 Kamil Dudka 7.25.0-2 -- use NSS_InitContext() to initialize NSS if available (#738456) -- provide human-readable names for NSS errors (upstream commit a60edcc6) - -* Fri Mar 23 2012 Paul Howarth 7.25.0-1 -- new upstream release (#806264) -- fix character encoding of docs with a patch rather than just iconv -- update debug and multilib patches -- don't use macros for commands -- reduce size of %%prep output for readability - -* Tue Jan 24 2012 Kamil Dudka 7.24.0-1 -- new upstream release (fixes CVE-2012-0036) - -* Thu Jan 05 2012 Paul Howarth 7.23.0-6 -- rebuild for gcc 4.7 - -* Mon Jan 02 2012 Kamil Dudka 7.23.0-5 -- upstream patch that allows to run FTPS tests with nss-3.13 (#760060) - -* Tue Dec 27 2011 Kamil Dudka 7.23.0-4 -- allow to run FTPS tests with nss-3.13 (#760060) - -* Sun Dec 25 2011 Kamil Dudka 7.23.0-3 -- avoid unnecessary timeout event when waiting for 100-continue (#767490) - -* Mon Nov 21 2011 Kamil Dudka 7.23.0-2 -- curl -JO now uses -O name if no C-D header comes (upstream commit c532604) - -* Wed Nov 16 2011 Kamil Dudka 7.23.0-1 -- new upstream release (#754391) - -* Mon Sep 19 2011 Kamil Dudka 7.22.0-2 -- nss: select client certificates by DER (#733657) - -* Tue Sep 13 2011 Kamil Dudka 7.22.0-1 -- new upstream release -- curl-config now provides dummy --static-libs option (#733956) - -* Sun Aug 21 2011 Paul Howarth 7.21.7-4 -- actually fix SIGSEGV of curl -O -J given more than one URL (#723075) - -* Mon Aug 15 2011 Kamil Dudka 7.21.7-3 -- fix SIGSEGV of curl -O -J given more than one URL (#723075) -- introduce the --delegation option of curl (#730444) -- initialize NSS with no database if the selected database is broken (#728562) - -* Wed Aug 03 2011 Kamil Dudka 7.21.7-2 -- add a new option CURLOPT_GSSAPI_DELEGATION (#719939) - -* Thu Jun 23 2011 Kamil Dudka 7.21.7-1 -- new upstream release (fixes CVE-2011-2192) - -* Wed Jun 08 2011 Kamil Dudka 7.21.6-2 -- avoid an invalid timeout event on a reused handle (#679709) - -* Sat Apr 23 2011 Paul Howarth 7.21.6-1 -- new upstream release - -* Mon Apr 18 2011 Kamil Dudka 7.21.5-2 -- fix the output of curl-config --version (upstream commit 82ecc85) - -* Mon Apr 18 2011 Kamil Dudka 7.21.5-1 -- new upstream release - -* Sat Apr 16 2011 Peter Robinson 7.21.4-4 -- no valgrind on ARMv5 arches - -* Sat Mar 05 2011 Dennis Gilmore 7.21.4-3 -- no valgrind on sparc arches - -* Tue Feb 22 2011 Kamil Dudka 7.21.4-2 -- do not ignore failure of SSL handshake (upstream commit 7aa2d10) - -* Fri Feb 18 2011 Kamil Dudka 7.21.4-1 -- new upstream release -- avoid memory leak on SSL connection failure (upstream commit a40f58d) -- work around valgrind bug (#678518) - -* Tue Feb 08 2011 Fedora Release Engineering - 7.21.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jan 12 2011 Kamil Dudka 7.21.3-2 -- build libcurl with --enable-hidden-symbols - -* Thu Dec 16 2010 Paul Howarth 7.21.3-1 -- update to 7.21.3: - - added --noconfigure switch to testcurl.pl - - added --xattr option - - added CURLOPT_RESOLVE and --resolve - - added CURLAUTH_ONLY - - added version-check.pl to the examples dir - - check for libcurl features for some command line options - - Curl_setopt: disallow CURLOPT_USE_SSL without SSL support - - http_chunks: remove debug output - - URL-parsing: consider ? a divider - - SSH: avoid using the libssh2_ prefix - - SSH: use libssh2_session_handshake() to work on win64 - - ftp: prevent server from hanging on closed data connection when stopping - a transfer before the end of the full transfer (ranges) - - LDAP: detect non-binary attributes properly - - ftp: treat server's response 421 as CURLE_OPERATION_TIMEDOUT - - gnutls->handshake: improved timeout handling - - security: pass the right parameter to init - - krb5: use GSS_ERROR to check for error - - TFTP: resend the correct data - - configure: fix autoconf 2.68 warning: no AC_LANG_SOURCE call detected - - GnuTLS: now detects socket errors on Windows - - symbols-in-versions: updated en masse - - added a couple of examples that were missing from the tarball - - Curl_send/recv_plain: return errno on failure - - Curl_wait_for_resolv (for c-ares): correct timeout - - ossl_connect_common: detect connection re-use - - configure: prevent link errors with --librtmp - - openldap: use remote port in URL passed to ldap_init_fd() - - url: provide dead_connection flag in Curl_handler::disconnect - - lots of compiler warning fixes - - ssh: fix a download resume point calculation - - fix getinfo CURLINFO_LOCAL* for reused connections - - multi: the returned running handles counter could turn negative - - multi: only ever consider pipelining for connections doing HTTP(S) -- drop upstream patches now in tarball -- update bz650255 and disable-test1112 patches to apply against new codebase -- add workaround for false-positive glibc-detected buffer overflow in tftpd - test server with FORTIFY_SOURCE (similar to #515361) - -* Fri Nov 12 2010 Kamil Dudka 7.21.2-5 -- do not send QUIT to a dead FTP control connection (#650255) -- pull back glibc's implementation of str[n]casecmp(), #626470 appears fixed - -* Tue Nov 09 2010 Kamil Dudka 7.21.2-4 -- prevent FTP client from hanging on unrecognized ABOR response (#649347) -- return more appropriate error code in case FTP server session idle - timeout has exceeded (#650255) - -* Fri Oct 29 2010 Kamil Dudka 7.21.2-3 -- prevent FTP server from hanging on closed data connection (#643656) - -* Thu Oct 14 2010 Paul Howarth 7.21.2-2 -- enforce versioned libssh2 dependency for libcurl (#642796) - -* Wed Oct 13 2010 Kamil Dudka 7.21.2-1 -- new upstream release, drop applied patches -- make 0102-curl-7.21.2-debug.patch less intrusive - -* Wed Sep 29 2010 jkeating - 7.21.1-6 -- Rebuilt for gcc bug 634757 - -* Sat Sep 11 2010 Kamil Dudka 7.21.1-5 -- make it possible to run SCP/SFTP tests on x86_64 (#632914) - -* Tue Sep 07 2010 Kamil Dudka 7.21.1-4 -- work around glibc/valgrind problem on x86_64 (#631449) - -* Tue Aug 24 2010 Paul Howarth 7.21.1-3 -- fix up patches so there's no need to run autotools in the rpm build -- drop buildreq automake -- drop dependency on automake for devel package from F-14, where - %%{_datadir}/aclocal is included in the filesystem package -- drop dependency on pkgconfig for devel package from F-11, where - pkgconfig dependencies are auto-generated - -* Mon Aug 23 2010 Kamil Dudka 7.21.1-2 -- re-enable test575 on s390(x), already fixed (upstream commit d63bdba) -- modify system headers to work around gcc bug (#617757) -- curl -T now ignores file size of special files (#622520) -- fix kerberos proxy authentication for https (#625676) -- work around glibc/valgrind problem on x86_64 (#626470) - -* Thu Aug 12 2010 Kamil Dudka 7.21.1-1 -- new upstream release - -* Mon Jul 12 2010 Dan Horák 7.21.0-3 -- disable test 575 on s390(x) - -* Mon Jun 28 2010 Kamil Dudka 7.21.0-2 -- add support for NTLM authentication (#603783) - -* Wed Jun 16 2010 Kamil Dudka 7.21.0-1 -- new upstream release, drop applied patches -- update of %%description -- disable valgrind for certain test-cases (libssh2 problem) - -* Tue May 25 2010 Kamil Dudka 7.20.1-6 -- fix -J/--remote-header-name to strip CR-LF (upstream patch) - -* Wed Apr 28 2010 Kamil Dudka 7.20.1-5 -- CRL support now works again (#581926) -- make it possible to start a testing OpenSSH server when building with SELinux - in the enforcing mode (#521087) - -* Sat Apr 24 2010 Kamil Dudka 7.20.1-4 -- upstream patch preventing failure of test536 with threaded DNS resolver -- upstream patch preventing SSL handshake timeout underflow - -* Thu Apr 22 2010 Paul Howarth 7.20.1-3 -- replace Rawhide s390-sleep patch with a more targeted patch adding a - delay after tests 513 and 514 rather than after all tests - -* Wed Apr 21 2010 Kamil Dudka 7.20.1-2 -- experimentally enabled threaded DNS lookup -- make curl-config multilib ready again (#584107) - -* Mon Apr 19 2010 Kamil Dudka 7.20.1-1 -- new upstream release - -* Tue Mar 23 2010 Kamil Dudka 7.20.0-4 -- add missing quote in libcurl.m4 (#576252) - -* Fri Mar 19 2010 Kamil Dudka 7.20.0-3 -- throw CURLE_SSL_CERTPROBLEM in case peer rejects a certificate (#565972) -- valgrind temporarily disabled (#574889) -- kerberos installation prefix has been changed - -* Wed Feb 24 2010 Kamil Dudka 7.20.0-2 -- exclude test1112 from the test suite (#565305) - -* Thu Feb 11 2010 Kamil Dudka 7.20.0-1 -- new upstream release - added support for IMAP(S), POP3(S), SMTP(S) and RTSP -- dropped patches applied upstream -- dropped curl-7.16.0-privlibs.patch no longer useful -- a new patch forcing -lrt when linking the curl tool and test-cases - -* Fri Jan 29 2010 Kamil Dudka 7.19.7-11 -- upstream patch adding a new option -J/--remote-header-name -- dropped temporary workaround for #545779 - -* Thu Jan 14 2010 Chris Weyl 7.19.7-10 -- bump for libssh2 rebuild - -* Sun Dec 20 2009 Kamil Dudka 7.19.7-9 -- temporary workaround for #548269 - (restored behavior of 7.19.7-4) - -* Wed Dec 09 2009 Kamil Dudka 7.19.7-8 -- replace hard wired port numbers in the test suite - -* Wed Dec 09 2009 Kamil Dudka 7.19.7-7 -- use different port numbers for 32bit and 64bit builds -- temporary workaround for #545779 - -* Tue Dec 08 2009 Kamil Dudka 7.19.7-6 -- make it possible to run test241 -- re-enable SCP/SFTP tests (#539444) - -* Sat Dec 05 2009 Kamil Dudka 7.19.7-5 -- avoid use of uninitialized value in lib/nss.c -- suppress failure of test513 on s390 - -* Tue Dec 01 2009 Kamil Dudka 7.19.7-4 -- do not require valgrind on s390 and s390x -- temporarily disabled SCP/SFTP test-suite (#539444) - -* Thu Nov 12 2009 Kamil Dudka 7.19.7-3 -- fix crash on doubly closed NSPR descriptor, patch contributed - by Kevin Baughman (#534176) -- new version of patch for broken TLS servers (#525496, #527771) - -* Wed Nov 04 2009 Kamil Dudka 7.19.7-2 -- increased release number (CVS problem) - -* Wed Nov 04 2009 Kamil Dudka 7.19.7-1 -- new upstream release, dropped applied patches -- workaround for broken TLS servers (#525496, #527771) - -* Wed Oct 14 2009 Kamil Dudka 7.19.6-13 -- fix timeout issues and gcc warnings within lib/nss.c - -* Tue Oct 06 2009 Kamil Dudka 7.19.6-12 -- upstream patch for NSS support written by Guenter Knauf - -* Wed Sep 30 2009 Kamil Dudka 7.19.6-11 -- build libcurl with c-ares support (#514771) - -* Sun Sep 27 2009 Kamil Dudka 7.19.6-10 -- require libssh2>=1.2 properly (#525002) - -* Sat Sep 26 2009 Kamil Dudka 7.19.6-9 -- let curl test-suite use valgrind -- require libssh2>=1.2 (#525002) - -* Mon Sep 21 2009 Chris Weyl - 7.19.6-8 -- rebuild for libssh2 1.2 - -* Thu Sep 17 2009 Kamil Dudka 7.19.6-7 -- make curl test-suite more verbose - -* Wed Sep 16 2009 Kamil Dudka 7.19.6-6 -- update polling patch to the latest upstream version - -* Thu Sep 03 2009 Kamil Dudka 7.19.6-5 -- cover ssh and stunnel support by the test-suite - -* Wed Sep 02 2009 Kamil Dudka 7.19.6-4 -- use pkg-config to find nss and libssh2 if possible -- better patch (not only) for SCP/SFTP polling -- improve error message for not matching common name (#516056) - -* Fri Aug 21 2009 Kamil Dudka 7.19.6-3 -- avoid tight loop during a sftp upload -- http://permalink.gmane.org/gmane.comp.web.curl.library/24744 - -* Tue Aug 18 2009 Kamil Dudka 7.19.6-2 -- let curl package depend on the same version of libcurl - -* Fri Aug 14 2009 Kamil Dudka 7.19.6-1 -- new upstream release, dropped applied patches -- changed NSS code to not ignore the value of ssl.verifyhost and produce more - verbose error messages (#516056) - -* Wed Aug 12 2009 Ville Skyttä - 7.19.5-10 -- Use lzma compressed upstream tarball. - -* Fri Jul 24 2009 Fedora Release Engineering - 7.19.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Kamil Dudka 7.19.5-8 -- do not pre-login to all PKCS11 slots, it causes problems with HW tokens -- try to select client certificate automatically when not specified, thanks - to Claes Jakobsson - -* Fri Jul 10 2009 Kamil Dudka 7.19.5-7 -- fix SIGSEGV when using NSS client certificates, thanks to Claes Jakobsson - -* Sun Jul 05 2009 Kamil Dudka 7.19.5-6 -- force test suite to use the just built libcurl, thanks to Paul Howarth - -* Thu Jul 02 2009 Kamil Dudka 7.19.5-5 -- run test suite after build -- enable built-in manual - -* Wed Jun 24 2009 Kamil Dudka 7.19.5-4 -- fix bug introduced by the last build (#504857) - -* Wed Jun 24 2009 Kamil Dudka 7.19.5-3 -- exclude curlbuild.h content from spec (#504857) - -* Wed Jun 10 2009 Kamil Dudka 7.19.5-2 -- avoid unguarded comparison in the spec file, thanks to R P Herrold (#504857) - -* Tue May 19 2009 Kamil Dudka 7.19.5-1 -- update to 7.19.5, dropped applied patches - -* Mon May 11 2009 Kamil Dudka 7.19.4-11 -- fix infinite loop while loading a private key, thanks to Michael Cronenworth - (#453612) - -* Mon Apr 27 2009 Kamil Dudka 7.19.4-10 -- fix curl/nss memory leaks while using client certificate (#453612, accepted - by upstream) - -* Wed Apr 22 2009 Kamil Dudka 7.19.4-9 -- add missing BuildRequire for autoconf - -* Wed Apr 22 2009 Kamil Dudka 7.19.4-8 -- fix configure.ac to not discard -g in CFLAGS (#496778) - -* Tue Apr 21 2009 Debarshi Ray 7.19.4-7 -- Fixed configure to respect the environment's CFLAGS and CPPFLAGS settings. - -* Tue Apr 14 2009 Kamil Dudka 7.19.4-6 -- upstream patch fixing memory leak in lib/nss.c (#453612) -- remove redundant dependency of libcurl-devel on libssh2-devel - -* Wed Mar 18 2009 Kamil Dudka 7.19.4-5 -- enable 6 additional crypto algorithms by default (#436781, - accepted by upstream) - -* Thu Mar 12 2009 Kamil Dudka 7.19.4-4 -- fix memory leak in src/main.c (accepted by upstream) -- avoid using %%ifarch - -* Wed Mar 11 2009 Kamil Dudka 7.19.4-3 -- make libcurl-devel multilib-ready (bug #488922) - -* Fri Mar 06 2009 Jindrich Novy 7.19.4-2 -- drop .easy-leak patch, causes problems in pycurl (#488791) -- fix libcurl-devel dependencies (#488895) - -* Tue Mar 03 2009 Jindrich Novy 7.19.4-1 -- update to 7.19.4 (fixes CVE-2009-0037) -- fix leak in curl_easy* functions, thanks to Kamil Dudka -- drop nss-fix patch, applied upstream - -* Tue Feb 24 2009 Fedora Release Engineering - 7.19.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 17 2009 Kamil Dudka 7.19.3-1 -- update to 7.19.3, dropped applied nss patches -- add patch fixing 7.19.3 curl/nss bugs - -* Mon Dec 15 2008 Jindrich Novy 7.18.2-9 -- rebuild for f10/rawhide cvs tag clashes - -* Sat Dec 06 2008 Jindrich Novy 7.18.2-8 -- use improved NSS patch, thanks to Rob Crittenden (#472489) - -* Tue Sep 09 2008 Jindrich Novy 7.18.2-7 -- update the thread safety patch, thanks to Rob Crittenden (#462217) - -* Wed Sep 03 2008 Warren Togami 7.18.2-6 -- add thread safety to libcurl NSS cleanup() functions (#459297) - -* Fri Aug 22 2008 Tom "spot" Callaway 7.18.2-5 -- undo mini libcurl.so.3 - -* Mon Aug 11 2008 Tom "spot" Callaway 7.18.2-4 -- make miniature library for libcurl.so.3 - -* Fri Jul 4 2008 Jindrich Novy 7.18.2-3 -- enable support for libssh2 (#453958) - -* Wed Jun 18 2008 Jindrich Novy 7.18.2-2 -- fix curl_multi_perform() over a proxy (#450140), thanks to - Rob Crittenden - -* Wed Jun 4 2008 Jindrich Novy 7.18.2-1 -- update to 7.18.2 - -* Wed May 7 2008 Jindrich Novy 7.18.1-2 -- spec cleanup, thanks to Paul Howarth (#225671) - - drop BR: libtool - - convert CHANGES and README to UTF-8 - - _GNU_SOURCE in CFLAGS is no more needed - - remove bogus rpath - -* Mon Mar 31 2008 Jindrich Novy 7.18.1-1 -- update to curl 7.18.1 (fixes #397911) -- add ABI docs for libcurl -- remove --static-libs from curl-config -- drop curl-config patch, obsoleted by @SSL_ENABLED@ autoconf - substitution (#432667) - -* Fri Feb 15 2008 Jindrich Novy 7.18.0-2 -- define _GNU_SOURCE so that NI_MAXHOST gets defined from glibc - -* Mon Jan 28 2008 Jindrich Novy 7.18.0-1 -- update to curl-7.18.0 -- drop sslgen patch -> applied upstream -- fix typo in description - -* Tue Jan 22 2008 Jindrich Novy 7.17.1-6 -- fix curl-devel obsoletes so that we don't break F8->F9 upgrade - path (#429612) - -* Tue Jan 8 2008 Jindrich Novy 7.17.1-5 -- do not attempt to close a bad socket (#427966), - thanks to Caolan McNamara - -* Tue Dec 4 2007 Jindrich Novy 7.17.1-4 -- rebuild because of the openldap soname bump -- remove old nsspem patch - -* Fri Nov 30 2007 Jindrich Novy 7.17.1-3 -- drop useless ldap library detection since curl doesn't - dlopen()s it but links to it -> BR: openldap-devel -- enable LDAPS support (#225671), thanks to Paul Howarth -- BR: krb5-devel to reenable GSSAPI support -- simplify build process -- update description - -* Wed Nov 21 2007 Jindrich Novy 7.17.1-2 -- update description to contain complete supported servers list (#393861) - -* Sat Nov 17 2007 Jindrich Novy 7.17.1-1 -- update to curl 7.17.1 -- include patch to enable SSL usage in NSS when a socket is opened - nonblocking, thanks to Rob Crittenden (rcritten@redhat.com) - -* Wed Oct 24 2007 Jindrich Novy 7.16.4-10 -- correctly provide/obsolete curl-devel (#130251) - -* Wed Oct 24 2007 Jindrich Novy 7.16.4-9 -- create libcurl and libcurl-devel subpackages (#130251) - -* Thu Oct 11 2007 Jindrich Novy 7.16.4-8 -- list features correctly when curl is compiled against NSS (#316191) - -* Mon Sep 17 2007 Jindrich Novy 7.16.4-7 -- add zlib-devel BR to enable gzip compressed transfers in curl (#292211) - -* Mon Sep 10 2007 Jindrich Novy 7.16.4-6 -- provide webclient (#225671) - -* Thu Sep 6 2007 Jindrich Novy 7.16.4-5 -- add support for the NSS PKCS#11 pem reader so the command-line is the - same for both OpenSSL and NSS by Rob Crittenden (rcritten@redhat.com) -- switch to NSS again - -* Mon Sep 3 2007 Jindrich Novy 7.16.4-4 -- revert back to use OpenSSL (#266021) - -* Mon Aug 27 2007 Jindrich Novy 7.16.4-3 -- don't use openssl, use nss instead - -* Fri Aug 10 2007 Jindrich Novy 7.16.4-2 -- fix anonymous ftp login (#251570), thanks to David Cantrell - -* Wed Jul 11 2007 Jindrich Novy 7.16.4-1 -- update to 7.16.4 - -* Mon Jun 25 2007 Jindrich Novy 7.16.3-1 -- update to 7.16.3 -- drop .print patch, applied upstream -- next series of merge review fixes by Paul Howarth -- remove aclocal stuff, no more needed -- simplify makefile arguments -- don't reference standard library paths in libcurl.pc -- include docs/CONTRIBUTE - -* Mon Jun 18 2007 Jindrich Novy 7.16.2-5 -- don't print like crazy (#236981), backported from upstream CVS - -* Fri Jun 15 2007 Jindrich Novy 7.16.2-4 -- another series of review fixes (#225671), - thanks to Paul Howarth -- check version of ldap library automatically -- don't use %%makeinstall and preserve timestamps -- drop useless patches - -* Fri May 11 2007 Jindrich Novy 7.16.2-3 -- add automake BR to curl-devel to fix aclocal dir. ownership, - thanks to Patrice Dumas - -* Thu May 10 2007 Jindrich Novy 7.16.2-2 -- package libcurl.m4 in curl-devel (#239664), thanks to Quy Tonthat - -* Wed Apr 11 2007 Jindrich Novy 7.16.2-1 -- update to 7.16.2 - -* Mon Feb 19 2007 Jindrich Novy 7.16.1-3 -- don't create/ship static libraries (#225671) - -* Mon Feb 5 2007 Jindrich Novy 7.16.1-2 -- merge review related spec fixes (#225671) - -* Mon Jan 29 2007 Jindrich Novy 7.16.1-1 -- update to 7.16.1 - -* Tue Jan 16 2007 Jindrich Novy 7.16.0-5 -- don't package generated makefiles for docs/examples to avoid - multilib conflicts - -* Mon Dec 18 2006 Jindrich Novy 7.16.0-4 -- convert spec to UTF-8 -- don't delete BuildRoot in %%prep phase -- rpmlint fixes - -* Thu Nov 16 2006 Jindrich Novy -7.16.0-3 -- prevent curl from dlopen()ing missing ldap libraries so that - ldap:// requests work (#215928) - -* Tue Oct 31 2006 Jindrich Novy - 7.16.0-2 -- fix BuildRoot -- add Requires: pkgconfig for curl-devel -- move LDFLAGS and LIBS to Libs.private in libcurl.pc.in (#213278) - -* Mon Oct 30 2006 Jindrich Novy - 7.16.0-1 -- update to curl-7.16.0 - -* Thu Aug 24 2006 Jindrich Novy - 7.15.5-1.fc6 -- update to curl-7.15.5 -- use %%{?dist} - -* Fri Jun 30 2006 Ivana Varekova - 7.15.4-1 -- update to 7.15.4 - -* Mon Mar 20 2006 Ivana Varekova - 7.15.3-1 -- fix multilib problem using pkg-config -- update to 7.15.3 - -* Thu Feb 23 2006 Ivana Varekova - 7.15.1-2 -- fix multilib problem - #181290 - - curl-devel.i386 not installable together with curl-devel.x86-64 - -* Fri Feb 10 2006 Jesse Keating - 7.15.1-1.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 7.15.1-1.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Dec 8 2005 Ivana Varekova 7.15.1-1 -- update to 7.15.1 (bug 175191) - -* Wed Nov 30 2005 Ivana Varekova 7.15.0-3 -- fix curl-config bug 174556 - missing vernum value - -* Wed Nov 9 2005 Ivana Varekova 7.15.0-2 -- rebuilt - -* Tue Oct 18 2005 Ivana Varekova 7.15.0-1 -- update to 7.15.0 - -* Thu Oct 13 2005 Ivana Varekova 7.14.1-1 -- update to 7.14.1 - -* Thu Jun 16 2005 Ivana Varekova 7.14.0-1 -- rebuild new version - -* Tue May 03 2005 Ivana Varekova 7.13.1-3 -- fix bug 150768 - curl-7.12.3-2 breaks basic authentication - used Daniel Stenberg patch - -* Mon Apr 25 2005 Joe Orton 7.13.1-2 -- update to use ca-bundle in /etc/pki -- mark License as MIT not MPL - -* Wed Mar 9 2005 Ivana Varekova 7.13.1-1 -- rebuilt (7.13.1) - -* Tue Mar 1 2005 Tomas Mraz 7.13.0-2 -- rebuild with openssl-0.9.7e - -* Sun Feb 13 2005 Florian La Roche -- 7.13.0 - -* Wed Feb 9 2005 Joe Orton 7.12.3-3 -- don't pass /usr to --with-libidn to remove "-L/usr/lib" from - 'curl-config --libs' output on x86_64. - -* Fri Jan 28 2005 Adrian Havill 7.12.3-1 -- Upgrade to 7.12.3, which uses poll() for FDSETSIZE limit (#134794) -- require libidn-devel for devel subpkg (#141341) -- remove proftpd kludge; included upstream - -* Wed Oct 06 2004 Adrian Havill 7.12.1-1 -- upgrade to 7.12.1 -- enable GSSAPI auth (#129353) -- enable I18N domain names (#134595) -- workaround for broken ProFTPD SSL auth (#134133). Thanks to - Aleksandar Milivojevic - -* Wed Sep 29 2004 Adrian Havill 7.12.0-4 -- move new docs position so defattr gets applied - -* Mon Sep 27 2004 Warren Togami 7.12.0-3 -- remove INSTALL, move libcurl docs to -devel - -* Mon Jul 26 2004 Jindrich Novy -- updated to 7.12.0 -- updated nousr patch - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Wed Apr 07 2004 Adrian Havill 7.11.1-1 -- upgraded; updated nousr patch -- added COPYING (#115956) -- - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Sat Jan 31 2004 Florian La Roche -- update to 7.10.8 -- remove patch2, already upstream - -* Wed Oct 15 2003 Adrian Havill 7.10.6-7 -- aclocal before libtoolize -- move OpenLDAP license so it's present as a doc file, present in - both the source and binary as per conditions - -* Mon Oct 13 2003 Adrian Havill 7.10.6-6 -- add OpenLDAP copyright notice for usage of code, add OpenLDAP - license for this code - -* Tue Oct 07 2003 Adrian Havill 7.10.6-5 -- match serverAltName certs with SSL (#106168) - -* Tue Sep 16 2003 Adrian Havill 7.10.6-4.1 -- bump n-v-r for RHEL - -* Tue Sep 16 2003 Adrian Havill 7.10.6-4 -- restore ca cert bundle (#104400) -- require openssl, we want to use its ca-cert bundle - -* Sun Sep 7 2003 Joe Orton 7.10.6-3 -- rebuild - -* Fri Sep 5 2003 Joe Orton 7.10.6-2.2 -- fix to include libcurl.so - -* Mon Aug 25 2003 Adrian Havill 7.10.6-2.1 -- bump n-v-r for RHEL - -* Mon Aug 25 2003 Adrian Havill 7.10.6-2 -- devel subpkg needs openssl-devel as a Require (#102963) - -* Mon Jul 28 2003 Adrian Havill 7.10.6-1 -- bumped version - -* Tue Jul 01 2003 Adrian Havill 7.10.5-1 -- bumped version - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Sat Apr 12 2003 Florian La Roche -- update to 7.10.4 -- adapt nousr patch - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 21 2003 Joe Orton 7.9.8-4 -- don't add -L/usr/lib to 'curl-config --libs' output - -* Tue Jan 7 2003 Nalin Dahyabhai 7.9.8-3 -- rebuild - -* Wed Nov 6 2002 Joe Orton 7.9.8-2 -- fix `curl-config --libs` output for libdir!=/usr/lib -- remove docs/LIBCURL from docs list; remove unpackaged libcurl.la -- libtoolize and reconf - -* Mon Jul 22 2002 Trond Eivind Glomsrød 7.9.8-1 -- 7.9.8 (# 69473) - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Sun May 26 2002 Tim Powers -- automated rebuild - -* Thu May 16 2002 Trond Eivind Glomsrød 7.9.7-1 -- 7.9.7 - -* Wed Apr 24 2002 Trond Eivind Glomsrød 7.9.6-1 -- 7.9.6 - -* Thu Mar 21 2002 Trond Eivind Glomsrød 7.9.5-2 -- Stop the curl-config script from printing -I/usr/include - and -L/usr/lib (#59497) - -* Fri Mar 8 2002 Trond Eivind Glomsrød 7.9.5-1 -- 7.9.5 - -* Tue Feb 26 2002 Trond Eivind Glomsrød 7.9.3-2 -- Rebuild - -* Wed Jan 23 2002 Nalin Dahyabhai 7.9.3-1 -- update to 7.9.3 - -* Wed Jan 09 2002 Tim Powers 7.9.2-2 -- automated rebuild - -* Wed Jan 9 2002 Trond Eivind Glomsrød 7.9.2-1 -- 7.9.2 - -* Fri Aug 17 2001 Nalin Dahyabhai -- include curl-config in curl-devel -- update to 7.8 to fix memory leak and strlcat() symbol pollution from libcurl - -* Wed Jul 18 2001 Crutcher Dunnavant -- added openssl-devel build req - -* Mon May 21 2001 Tim Powers -- built for the distro - -* Tue Apr 24 2001 Jeff Johnson -- upgrade to curl-7.7.2. -- enable IPv6. - -* Fri Mar 2 2001 Tim Powers -- rebuilt against openssl-0.9.6-1 - -* Thu Jan 4 2001 Tim Powers -- fixed mising ldconfigs -- updated to 7.5.2, bug fixes - -* Mon Dec 11 2000 Tim Powers -- updated to 7.5.1 - -* Mon Nov 6 2000 Tim Powers -- update to 7.4.1 to fix bug #20337, problems with curl -c -- not using patch anymore, it's included in the new source. Keeping - for reference - -* Fri Oct 20 2000 Nalin Dahyabhai -- fix bogus req in -devel package - -* Fri Oct 20 2000 Tim Powers -- devel package needed defattr so that root owns the files - -* Mon Oct 16 2000 Nalin Dahyabhai -- update to 7.3 -- apply vsprintf/vsnprintf patch from Colin Phipps via Debian - -* Mon Aug 21 2000 Nalin Dahyabhai -- enable SSL support -- fix packager tag -- move buildroot to %%{_tmppath} - -* Tue Aug 1 2000 Tim Powers -- fixed vendor tag for bug #15028 - -* Mon Jul 24 2000 Prospector -- rebuilt - -* Tue Jul 11 2000 Tim Powers -- workaround alpha build problems with optimizations - -* Mon Jul 10 2000 Tim Powers -- rebuilt - -* Mon Jun 5 2000 Tim Powers -- put man pages in correct place -- use %%makeinstall - -* Mon Apr 24 2000 Tim Powers -- updated to 6.5.2 - -* Wed Nov 3 1999 Tim Powers -- updated sources to 6.2 -- gzip man page - -* Mon Aug 30 1999 Tim Powers -- changed group - -* Thu Aug 26 1999 Tim Powers -- changelog started -- general cleanups, changed prefix to /usr, added manpage to files section -- including in Powertools diff --git a/sources b/sources index fe0a4ce..002e494 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (curl-8.0.1.tar.xz) = 3bb777982659ed697ae90f113ff7b65d6ce8ba9fe6a8984cfd6769d2f051a72ba953c911abe234c204ec2cc5a35d68b4d033037fad7fba31bb92a52543f8d13d -SHA512 (curl-8.0.1.tar.xz.asc) = 92c6a0570e9a8a708fe2f717b8b37a68dcb9cd4520ca50c9baafec5891bda103bce2d2dcb67f1387bf11bd7e51e0e64ccd52d196e61d58b598ad3aa1960386cf +SHA512 (curl-8.18.0.tar.xz) = 50c7a7b0528e0019697b0c59b3e56abb2578c71d77e4c085b56797276094b5611718c0a9cb2b14db7f8ab502fcf8f42a364297a3387fae3870a4d281484ba21c +SHA512 (curl-8.18.0.tar.xz.asc) = 07e08d1bb3f8bf20b3d22f37fbc19c49c0d9ee4ea9d92da76fa8a9de343023e1b5d416ccc6535a4ff98b08b30eb9334fd856227e37564f6bcd542aa81bced152 diff --git a/tests/non-root-user-download/runtest.sh b/tests/non-root-user-download/runtest.sh index 4d51e62..0d72276 100755 --- a/tests/non-root-user-download/runtest.sh +++ b/tests/non-root-user-download/runtest.sh @@ -31,9 +31,9 @@ PACKAGE="curl" -FTP_URL=ftp://ftp.fi.muni.cz/pub/linux/fedora/linux/releases/38/Everything/x86_64/iso/Fedora-Everything-38-1.6-x86_64-CHECKSUM -HTTP_URL=https://archives.fedoraproject.org/pub/fedora/linux/releases/38/Everything/x86_64/iso/Fedora-Everything-38-1.6-x86_64-CHECKSUM -CONTENT=4d042dedc8886856db10bc882074b84dcce52f829ea7b3f31d8031db8d84df20 +FTP_URL=ftp://ftp.fi.muni.cz/pub/linux/fedora/linux/releases/42/Everything/x86_64/iso/Fedora-Everything-42-1.1-x86_64-CHECKSUM +HTTP_URL=https://archives.fedoraproject.org/pub/fedora/linux/releases/42/Everything/x86_64/iso/Fedora-Everything-42-1.1-x86_64-CHECKSUM +CONTENT=1bd6ab4798983c2fe4a210f9c4ca135fed453d6142ba852c1f8d5fba22e113ab PASSWORD=pAssw0rd OPTIONS="" rlIsRHEL 7 && OPTIONS="--insecure"